Changeset 38425 in webkit for trunk/JavaScriptCore/parser

Timestamp:

Nov 15, 2008, 12:34:40 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-15 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.

Renamed all forms of "byte code" "opcode" "op code" "code" "bitcode"
etc. to "bytecode".

• VM/CTI.cpp: (JSC::CTI::printBytecodeOperandTypes): (JSC::CTI::emitAllocateNumber): (JSC::CTI::emitNakedCall): (JSC::CTI::emitNakedFastCall): (JSC::CTI::emitCTICall): (JSC::CTI::emitJumpSlowCaseIfNotJSCell): (JSC::CTI::emitJumpSlowCaseIfNotImmNum): (JSC::CTI::emitJumpSlowCaseIfNotImmNums): (JSC::CTI::emitFastArithIntToImmOrSlowCase): (JSC::CTI::compileOpCall): (JSC::CTI::emitSlowScriptCheck): (JSC::CTI::compileBinaryArithOp): (JSC::CTI::compileBinaryArithOpSlowCase): (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompileSlowCases): (JSC::CTI::privateCompile):
• VM/CTI.h: (JSC::CallRecord::CallRecord): (JSC::SwitchRecord::SwitchRecord):
• VM/CodeBlock.cpp: (JSC::CodeBlock::printStructureIDs): (JSC::CodeBlock::dump): (JSC::CodeBlock::~CodeBlock): (JSC::CodeBlock::derefStructureIDs): (JSC::CodeBlock::refStructureIDs):
• VM/CodeBlock.h: (JSC::StructureStubInfo::StructureStubInfo):
• VM/ExceptionHelpers.cpp: (JSC::createNotAnObjectError):
• VM/Instruction.h: (JSC::Instruction::Instruction): (JSC::Instruction::):
• VM/Machine.cpp: (JSC::BytecodeInterpreter::isBytecode): (JSC::BytecodeInterpreter::throwException): (JSC::BytecodeInterpreter::execute): (JSC::BytecodeInterpreter::tryCachePutByID): (JSC::BytecodeInterpreter::uncachePutByID): (JSC::BytecodeInterpreter::tryCacheGetByID): (JSC::BytecodeInterpreter::uncacheGetByID): (JSC::BytecodeInterpreter::privateExecute): (JSC::BytecodeInterpreter::tryCTICachePutByID): (JSC::BytecodeInterpreter::tryCTICacheGetByID): (JSC::BytecodeInterpreter::cti_op_call_JSFunction): (JSC::BytecodeInterpreter::cti_vm_dontLazyLinkCall): (JSC::BytecodeInterpreter::cti_vm_lazyLinkCall):
• VM/Machine.h: (JSC::BytecodeInterpreter::getBytecode): (JSC::BytecodeInterpreter::getBytecodeID): (JSC::BytecodeInterpreter::isCallBytecode):
• VM/Opcode.cpp: (JSC::): (JSC::BytecodeStats::BytecodeStats): (JSC::compareBytecodeIndices): (JSC::compareBytecodePairIndices): (JSC::BytecodeStats::~BytecodeStats): (JSC::BytecodeStats::recordInstruction): (JSC::BytecodeStats::resetLastInstruction):
• VM/Opcode.h: (JSC::): (JSC::padBytecodeName):
• VM/SamplingTool.cpp: (JSC::ScopeSampleRecord::sample): (JSC::SamplingTool::run): (JSC::compareBytecodeIndicesSampling): (JSC::SamplingTool::dump):
• VM/SamplingTool.h: (JSC::ScopeSampleRecord::ScopeSampleRecord): (JSC::SamplingTool::SamplingTool):
• bytecompiler/CodeGenerator.cpp: (JSC::CodeGenerator::generate): (JSC::CodeGenerator::CodeGenerator): (JSC::CodeGenerator::emitLabel): (JSC::CodeGenerator::emitBytecode): (JSC::CodeGenerator::emitJump): (JSC::CodeGenerator::emitJumpIfTrue): (JSC::CodeGenerator::emitJumpIfFalse): (JSC::CodeGenerator::emitMove): (JSC::CodeGenerator::emitUnaryOp): (JSC::CodeGenerator::emitPreInc): (JSC::CodeGenerator::emitPreDec): (JSC::CodeGenerator::emitPostInc): (JSC::CodeGenerator::emitPostDec): (JSC::CodeGenerator::emitBinaryOp): (JSC::CodeGenerator::emitEqualityOp): (JSC::CodeGenerator::emitUnexpectedLoad): (JSC::CodeGenerator::emitInstanceOf): (JSC::CodeGenerator::emitResolve): (JSC::CodeGenerator::emitGetScopedVar): (JSC::CodeGenerator::emitPutScopedVar): (JSC::CodeGenerator::emitResolveBase): (JSC::CodeGenerator::emitResolveWithBase): (JSC::CodeGenerator::emitResolveFunction): (JSC::CodeGenerator::emitGetById): (JSC::CodeGenerator::emitPutById): (JSC::CodeGenerator::emitPutGetter): (JSC::CodeGenerator::emitPutSetter): (JSC::CodeGenerator::emitDeleteById): (JSC::CodeGenerator::emitGetByVal): (JSC::CodeGenerator::emitPutByVal): (JSC::CodeGenerator::emitDeleteByVal): (JSC::CodeGenerator::emitPutByIndex): (JSC::CodeGenerator::emitNewObject): (JSC::CodeGenerator::emitNewArray): (JSC::CodeGenerator::emitNewFunction): (JSC::CodeGenerator::emitNewRegExp): (JSC::CodeGenerator::emitNewFunctionExpression): (JSC::CodeGenerator::emitCall): (JSC::CodeGenerator::emitReturn): (JSC::CodeGenerator::emitUnaryNoDstOp): (JSC::CodeGenerator::emitConstruct): (JSC::CodeGenerator::emitPopScope): (JSC::CodeGenerator::emitDebugHook): (JSC::CodeGenerator::emitComplexJumpScopes): (JSC::CodeGenerator::emitJumpScopes): (JSC::CodeGenerator::emitNextPropertyName): (JSC::CodeGenerator::emitCatch): (JSC::CodeGenerator::emitNewError): (JSC::CodeGenerator::emitJumpSubroutine): (JSC::CodeGenerator::emitSubroutineReturn): (JSC::CodeGenerator::emitPushNewScope): (JSC::CodeGenerator::beginSwitch): (JSC::CodeGenerator::endSwitch):
• bytecompiler/CodeGenerator.h: (JSC::CodeGenerator::emitNode):
• jsc.cpp: (runWithScripts):
• masm/X86Assembler.h: (JSC::X86Assembler::): (JSC::X86Assembler::emitModRm_opr): (JSC::X86Assembler::emitModRm_opr_Unchecked): (JSC::X86Assembler::emitModRm_opm): (JSC::X86Assembler::emitModRm_opm_Unchecked): (JSC::X86Assembler::emitModRm_opmsib):
• parser/Nodes.cpp: (JSC::NullNode::emitBytecode): (JSC::BooleanNode::emitBytecode): (JSC::NumberNode::emitBytecode): (JSC::StringNode::emitBytecode): (JSC::RegExpNode::emitBytecode): (JSC::ThisNode::emitBytecode): (JSC::ResolveNode::emitBytecode): (JSC::ArrayNode::emitBytecode): (JSC::ObjectLiteralNode::emitBytecode): (JSC::PropertyListNode::emitBytecode): (JSC::BracketAccessorNode::emitBytecode): (JSC::DotAccessorNode::emitBytecode): (JSC::ArgumentListNode::emitBytecode): (JSC::NewExprNode::emitBytecode): (JSC::EvalFunctionCallNode::emitBytecode): (JSC::FunctionCallValueNode::emitBytecode): (JSC::FunctionCallResolveNode::emitBytecode): (JSC::FunctionCallBracketNode::emitBytecode): (JSC::FunctionCallDotNode::emitBytecode): (JSC::PostfixResolveNode::emitBytecode): (JSC::PostfixBracketNode::emitBytecode): (JSC::PostfixDotNode::emitBytecode): (JSC::PostfixErrorNode::emitBytecode): (JSC::DeleteResolveNode::emitBytecode): (JSC::DeleteBracketNode::emitBytecode): (JSC::DeleteDotNode::emitBytecode): (JSC::DeleteValueNode::emitBytecode): (JSC::VoidNode::emitBytecode): (JSC::TypeOfResolveNode::emitBytecode): (JSC::TypeOfValueNode::emitBytecode): (JSC::PrefixResolveNode::emitBytecode): (JSC::PrefixBracketNode::emitBytecode): (JSC::PrefixDotNode::emitBytecode): (JSC::PrefixErrorNode::emitBytecode): (JSC::UnaryOpNode::emitBytecode): (JSC::BinaryOpNode::emitBytecode): (JSC::EqualNode::emitBytecode): (JSC::StrictEqualNode::emitBytecode): (JSC::ReverseBinaryOpNode::emitBytecode): (JSC::ThrowableBinaryOpNode::emitBytecode): (JSC::InstanceOfNode::emitBytecode): (JSC::LogicalOpNode::emitBytecode): (JSC::ConditionalNode::emitBytecode): (JSC::emitReadModifyAssignment): (JSC::ReadModifyResolveNode::emitBytecode): (JSC::AssignResolveNode::emitBytecode): (JSC::AssignDotNode::emitBytecode): (JSC::ReadModifyDotNode::emitBytecode): (JSC::AssignErrorNode::emitBytecode): (JSC::AssignBracketNode::emitBytecode): (JSC::ReadModifyBracketNode::emitBytecode): (JSC::CommaNode::emitBytecode): (JSC::ConstDeclNode::emitBytecode): (JSC::ConstStatementNode::emitBytecode): (JSC::BlockNode::emitBytecode): (JSC::EmptyStatementNode::emitBytecode): (JSC::DebuggerStatementNode::emitBytecode): (JSC::ExprStatementNode::emitBytecode): (JSC::VarStatementNode::emitBytecode): (JSC::IfNode::emitBytecode): (JSC::IfElseNode::emitBytecode): (JSC::DoWhileNode::emitBytecode): (JSC::WhileNode::emitBytecode): (JSC::ForNode::emitBytecode): (JSC::ForInNode::emitBytecode): (JSC::ContinueNode::emitBytecode): (JSC::BreakNode::emitBytecode): (JSC::ReturnNode::emitBytecode): (JSC::WithNode::emitBytecode): (JSC::SwitchNode::emitBytecode): (JSC::LabelNode::emitBytecode): (JSC::ThrowNode::emitBytecode): (JSC::TryNode::emitBytecode): (JSC::ScopeNode::ScopeNode): (JSC::EvalNode::emitBytecode): (JSC::FunctionBodyNode::emitBytecode): (JSC::ProgramNode::emitBytecode): (JSC::FuncDeclNode::emitBytecode): (JSC::FuncExprNode::emitBytecode):
• parser/Nodes.h: (JSC::UnaryPlusNode::): (JSC::NegateNode::): (JSC::BitwiseNotNode::): (JSC::LogicalNotNode::): (JSC::MultNode::): (JSC::DivNode::): (JSC::ModNode::): (JSC::AddNode::): (JSC::SubNode::): (JSC::LeftShiftNode::): (JSC::RightShiftNode::): (JSC::UnsignedRightShiftNode::): (JSC::LessNode::): (JSC::GreaterNode::): (JSC::LessEqNode::): (JSC::GreaterEqNode::): (JSC::InstanceOfNode::): (JSC::InNode::): (JSC::EqualNode::): (JSC::NotEqualNode::): (JSC::StrictEqualNode::): (JSC::NotStrictEqualNode::): (JSC::BitAndNode::): (JSC::BitOrNode::): (JSC::BitXOrNode::): (JSC::ProgramNode::): (JSC::EvalNode::): (JSC::FunctionBodyNode::):
• runtime/JSNotAnObject.h:
• runtime/StructureID.cpp: (JSC::StructureID::fromDictionaryTransition):
• wtf/Platform.h:

Location:

trunk/JavaScriptCore/parser

Files:

• Nodes.cpp (modified) (77 diffs)
• Nodes.h (modified) (103 diffs)

trunk/JavaScriptCore/parser/Nodes.cpp

@@ -275 +275 @@
 // ------------------------------ NullNode -------------------------------------
 
-RegisterID* NullNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* NullNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (dst == ignoredResult())
@@ -284 +284 @@
 // ------------------------------ BooleanNode ----------------------------------
 
-RegisterID* BooleanNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* BooleanNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (dst == ignoredResult())
@@ -293 +293 @@
 // ------------------------------ NumberNode -----------------------------------
 
-RegisterID* NumberNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* NumberNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (dst == ignoredResult())
@@ -302 +302 @@
 // ------------------------------ StringNode -----------------------------------
 
-RegisterID* StringNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* StringNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (dst == ignoredResult())
@@ -311 +311 @@
 // ------------------------------ RegExpNode -----------------------------------
 
-RegisterID* RegExpNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* RegExpNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegExp> regExp = RegExp::create(generator.globalData(), m_pattern, m_flags);
@@ -323 +323 @@
 // ------------------------------ ThisNode -------------------------------------
 
-RegisterID* ThisNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ThisNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (dst == ignoredResult())
@@ -337 +337 @@
 }
 
-RegisterID* ResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ResolveNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (RegisterID* local = generator.registerFor(m_ident)) {
@@ -374 +374 @@
 }
 
-RegisterID* ArrayNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ArrayNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     // FIXME: Should we put all of this code into emitNewArray?
@@ -429 +429 @@
 }
 
-RegisterID* ObjectLiteralNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ObjectLiteralNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
      if (!m_list) {
@@ -452 +452 @@
 }
 
-RegisterID* PropertyListNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* PropertyListNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> newObj = generator.tempDestination(dst);
@@ -495 +495 @@
 }
 
-RegisterID* BracketAccessorNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* BracketAccessorNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNodeForLeftHandSide(m_base.get(), m_subscriptHasAssignments, m_subscript->isPure(generator));
@@ -515 +515 @@
 }
 
-RegisterID* DotAccessorNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* DotAccessorNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RegisterID* base = generator.emitNode(m_base.get());
@@ -535 +535 @@
 }
 
-RegisterID* ArgumentListNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ArgumentListNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     ASSERT(m_expr);
@@ -566 +566 @@
 }
 
-RegisterID* NewExprNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* NewExprNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> func = generator.emitNode(m_expr.get());
@@ -584 +584 @@
 }
 
-RegisterID* EvalFunctionCallNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* EvalFunctionCallNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> func = generator.tempDestination(dst);
@@ -605 +605 @@
 }
 
-RegisterID* FunctionCallValueNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* FunctionCallValueNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> func = generator.emitNode(m_expr.get());
@@ -624 +624 @@
 }
 
-RegisterID* FunctionCallResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* FunctionCallResolveNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (RefPtr<RegisterID> local = generator.registerFor(m_ident)) {
@@ -662 +662 @@
 }
 
-RegisterID* FunctionCallBracketNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* FunctionCallBracketNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNode(m_base.get());
@@ -685 +685 @@
 }
 
-RegisterID* FunctionCallDotNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* FunctionCallDotNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNode(m_base.get());
@@ -706 +706 @@
 }
 
-RegisterID* PostfixResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* PostfixResolveNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (RegisterID* local = generator.registerFor(m_ident)) {
@@ -763 +763 @@
 }
 
-RegisterID* PostfixBracketNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* PostfixBracketNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNode(m_base.get());
@@ -797 +797 @@
 }
 
-RegisterID* PostfixDotNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* PostfixDotNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNode(m_base.get());
@@ -830 +830 @@
 }
 
-RegisterID* PostfixErrorNode::emitCode(CodeGenerator& generator, RegisterID*)
+RegisterID* PostfixErrorNode::emitBytecode(CodeGenerator& generator, RegisterID*)
 {
     return emitThrowError(generator, ReferenceError, m_operator == OpPlusPlus ? "Postfix ++ operator applied to value that is not a reference." : "Postfix -- operator applied to value that is not a reference.");
@@ -837 +837 @@
 // ------------------------------ DeleteResolveNode -----------------------------------
 
-RegisterID* DeleteResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* DeleteResolveNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (generator.registerFor(m_ident))
@@ -860 +860 @@
 }
 
-RegisterID* DeleteBracketNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* DeleteBracketNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> r0 = generator.emitNode(m_base.get());
@@ -881 +881 @@
 }
 
-RegisterID* DeleteDotNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* DeleteDotNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RegisterID* r0 = generator.emitNode(m_base.get());
@@ -901 +901 @@
 }
 
-RegisterID* DeleteValueNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* DeleteValueNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     generator.emitNode(ignoredResult(), m_expr.get());
@@ -921 +921 @@
 }
 
-RegisterID* VoidNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* VoidNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (dst == ignoredResult()) {
@@ -933 +933 @@
 // ------------------------------ TypeOfValueNode -----------------------------------
 
-RegisterID* TypeOfResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* TypeOfResolveNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (RegisterID* local = generator.registerFor(m_ident)) {
@@ -960 +960 @@
 }
 
-RegisterID* TypeOfValueNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* TypeOfValueNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (dst == ignoredResult()) {
@@ -972 +972 @@
 // ------------------------------ PrefixResolveNode ----------------------------------
 
-RegisterID* PrefixResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* PrefixResolveNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (RegisterID* local = generator.registerFor(m_ident)) {
@@ -1017 +1017 @@
 }
 
-RegisterID* PrefixBracketNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* PrefixBracketNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNode(m_base.get());
@@ -1046 +1046 @@
 }
 
-RegisterID* PrefixDotNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* PrefixDotNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNode(m_base.get());
@@ -1074 +1074 @@
 }
 
-RegisterID* PrefixErrorNode::emitCode(CodeGenerator& generator, RegisterID*)
+RegisterID* PrefixErrorNode::emitBytecode(CodeGenerator& generator, RegisterID*)
 {
     return emitThrowError(generator, ReferenceError, m_operator == OpPlusPlus ? "Prefix ++ operator applied to value that is not a reference." : "Prefix -- operator applied to value that is not a reference.");
@@ -1091 +1091 @@
 }
 
-RegisterID* UnaryOpNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* UnaryOpNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RegisterID* src = generator.emitNode(m_expr.get());
-    return generator.emitUnaryOp(opcode(), generator.finalDestination(dst), src, m_expr->resultDescriptor());
+    return generator.emitUnaryOp(bytecode(), generator.finalDestination(dst), src, m_expr->resultDescriptor());
 }
 
@@ -1110 +1110 @@
 }
 
-RegisterID* BinaryOpNode::emitCode(CodeGenerator& generator, RegisterID* dst)
-{
-    OpcodeID opcode = this->opcode();
-    if (opcode == op_neq) {
+RegisterID* BinaryOpNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
+{
+    BytecodeID bytecode = this->bytecode();
+    if (bytecode == op_neq) {
         if (m_expr1->isNull() || m_expr2->isNull()) {
             RefPtr<RegisterID> src = generator.emitNode(dst, m_expr1->isNull() ? m_expr2.get() : m_expr1.get());
@@ -1122 +1122 @@
     RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(m_expr1.get(), m_rightHasAssignments, m_expr2->isPure(generator));
     RegisterID* src2 = generator.emitNode(m_expr2.get());
-    return generator.emitBinaryOp(opcode, generator.finalDestination(dst, src1.get()), src1.get(), src2, OperandTypes(m_expr1->resultDescriptor(), m_expr2->resultDescriptor()));
-}
-
-RegisterID* EqualNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+    return generator.emitBinaryOp(bytecode, generator.finalDestination(dst, src1.get()), src1.get(), src2, OperandTypes(m_expr1->resultDescriptor(), m_expr2->resultDescriptor()));
+}
+
+RegisterID* EqualNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (m_expr1->isNull() || m_expr2->isNull()) {
@@ -1137 +1137 @@
 }
 
-RegisterID* StrictEqualNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* StrictEqualNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(m_expr1.get(), m_rightHasAssignments, m_expr2->isPure(generator));
@@ -1144 +1144 @@
 }
 
-RegisterID* ReverseBinaryOpNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ReverseBinaryOpNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(m_expr1.get(), m_rightHasAssignments, m_expr2->isPure(generator));
     RegisterID* src2 = generator.emitNode(m_expr2.get());
-    return generator.emitBinaryOp(opcode(), generator.finalDestination(dst, src1.get()), src2, src1.get(), OperandTypes(m_expr2->resultDescriptor(), m_expr1->resultDescriptor()));
-}
-
-RegisterID* ThrowableBinaryOpNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+    return generator.emitBinaryOp(bytecode(), generator.finalDestination(dst, src1.get()), src2, src1.get(), OperandTypes(m_expr2->resultDescriptor(), m_expr1->resultDescriptor()));
+}
+
+RegisterID* ThrowableBinaryOpNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(m_expr1.get(), m_rightHasAssignments, m_expr2->isPure(generator));
     RegisterID* src2 = generator.emitNode(m_expr2.get());
     generator.emitExpressionInfo(divot(), startOffset(), endOffset());
-    return generator.emitBinaryOp(opcode(), generator.finalDestination(dst, src1.get()), src1.get(), src2, OperandTypes(m_expr1->resultDescriptor(), m_expr2->resultDescriptor()));
-}
-
-RegisterID* InstanceOfNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+    return generator.emitBinaryOp(bytecode(), generator.finalDestination(dst, src1.get()), src1.get(), src2, OperandTypes(m_expr1->resultDescriptor(), m_expr2->resultDescriptor()));
+}
+
+RegisterID* InstanceOfNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> src1 = generator.emitNodeForLeftHandSide(m_expr1.get(), m_rightHasAssignments, m_expr2->isPure(generator));
@@ -1184 +1184 @@
 }
 
-RegisterID* LogicalOpNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* LogicalOpNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> temp = generator.tempDestination(dst);
@@ -1214 +1214 @@
 }
 
-RegisterID* ConditionalNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ConditionalNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> newDst = generator.finalDestination(dst);
@@ -1249 +1249 @@
 static ALWAYS_INLINE RegisterID* emitReadModifyAssignment(CodeGenerator& generator, RegisterID* dst, RegisterID* src1, RegisterID* src2, Operator oper, OperandTypes types)
 {
-    OpcodeID opcode;
+    BytecodeID bytecode;
     switch (oper) {
         case OpMultEq:
-            opcode = op_mul;
+            bytecode = op_mul;
             break;
         case OpDivEq:
-            opcode = op_div;
+            bytecode = op_div;
             break;
         case OpPlusEq:
-            opcode = op_add;
+            bytecode = op_add;
             break;
         case OpMinusEq:
-            opcode = op_sub;
+            bytecode = op_sub;
             break;
         case OpLShift:
-            opcode = op_lshift;
+            bytecode = op_lshift;
             break;
         case OpRShift:
-            opcode = op_rshift;
+            bytecode = op_rshift;
             break;
         case OpURShift:
-            opcode = op_urshift;
+            bytecode = op_urshift;
             break;
         case OpAndEq:
-            opcode = op_bitand;
+            bytecode = op_bitand;
             break;
         case OpXOrEq:
-            opcode = op_bitxor;
+            bytecode = op_bitxor;
             break;
         case OpOrEq:
-            opcode = op_bitor;
+            bytecode = op_bitor;
             break;
         case OpModEq:
-            opcode = op_mod;
+            bytecode = op_mod;
             break;
         default:
@@ -1289 +1289 @@
     }
     
-    return generator.emitBinaryOp(opcode, dst, src1, src2, types);
-}
-
-RegisterID* ReadModifyResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+    return generator.emitBinaryOp(bytecode, dst, src1, src2, types);
+}
+
+RegisterID* ReadModifyResolveNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (RegisterID* local = generator.registerFor(m_ident)) {
@@ -1346 +1346 @@
 }
 
-RegisterID* AssignResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* AssignResolveNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (RegisterID* local = generator.registerFor(m_ident)) {
@@ -1388 +1388 @@
 }
 
-RegisterID* AssignDotNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* AssignDotNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNodeForLeftHandSide(m_base.get(), m_rightHasAssignments, m_right->isPure(generator));
@@ -1411 +1411 @@
 }
 
-RegisterID* ReadModifyDotNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ReadModifyDotNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNodeForLeftHandSide(m_base.get(), m_rightHasAssignments, m_right->isPure(generator));
@@ -1437 +1437 @@
 }
 
-RegisterID* AssignErrorNode::emitCode(CodeGenerator& generator, RegisterID*)
+RegisterID* AssignErrorNode::emitBytecode(CodeGenerator& generator, RegisterID*)
 {
     return emitThrowError(generator, ReferenceError, "Left side of assignment is not a reference.");
@@ -1456 +1456 @@
 }
 
-RegisterID* AssignBracketNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* AssignBracketNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNodeForLeftHandSide(m_base.get(), m_subscriptHasAssignments || m_rightHasAssignments, m_subscript->isPure(generator) && m_right->isPure(generator));
@@ -1482 +1482 @@
 }
 
-RegisterID* ReadModifyBracketNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ReadModifyBracketNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> base = generator.emitNodeForLeftHandSide(m_base.get(), m_subscriptHasAssignments || m_rightHasAssignments, m_subscript->isPure(generator) && m_right->isPure(generator));
@@ -1511 +1511 @@
 }
 
-RegisterID* CommaNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* CommaNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     generator.emitNode(ignoredResult(), m_expr1.get());
@@ -1553 +1553 @@
 }
 
-RegisterID* ConstDeclNode::emitCode(CodeGenerator& generator, RegisterID*)
+RegisterID* ConstDeclNode::emitBytecode(CodeGenerator& generator, RegisterID*)
 {
     RegisterID* result = 0;
@@ -1574 +1574 @@
 }
 
-RegisterID* ConstStatementNode::emitCode(CodeGenerator& generator, RegisterID*)
+RegisterID* ConstStatementNode::emitBytecode(CodeGenerator& generator, RegisterID*)
 {
     return generator.emitNode(m_next.get());
@@ -1614 +1614 @@
 }
 
-RegisterID* BlockNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* BlockNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     return statementListEmitCode(m_children, generator, dst);
@@ -1621 +1621 @@
 // ------------------------------ EmptyStatementNode ---------------------------
 
-RegisterID* EmptyStatementNode::emitCode(CodeGenerator&, RegisterID* dst)
+RegisterID* EmptyStatementNode::emitBytecode(CodeGenerator&, RegisterID* dst)
 {
     return dst;
@@ -1628 +1628 @@
 // ------------------------------ DebuggerStatementNode ---------------------------
 
-RegisterID* DebuggerStatementNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* DebuggerStatementNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     generator.emitDebugHook(DidReachBreakpoint, firstLine(), lastLine());
@@ -1636 +1636 @@
 // ------------------------------ ExprStatementNode ----------------------------
 
-RegisterID* ExprStatementNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ExprStatementNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     ASSERT(m_expr);
@@ -1654 +1654 @@
 }
 
-RegisterID* VarStatementNode::emitCode(CodeGenerator& generator, RegisterID*)
+RegisterID* VarStatementNode::emitBytecode(CodeGenerator& generator, RegisterID*)
 {
     ASSERT(m_expr);
@@ -1673 +1673 @@
 }
 
-RegisterID* IfNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* IfNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<LabelID> afterThen = generator.newLabel();
@@ -1703 +1703 @@
 }
 
-RegisterID* IfElseNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* IfElseNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<LabelID> beforeElse = generator.newLabel();
@@ -1743 +1743 @@
 }
 
-RegisterID* DoWhileNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* DoWhileNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<LabelScope> scope = generator.newLabelScope(LabelScope::Loop);
@@ -1779 +1779 @@
 }
 
-RegisterID* WhileNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* WhileNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<LabelScope> scope = generator.newLabelScope(LabelScope::Loop);
@@ -1819 +1819 @@
 }
 
-RegisterID* ForNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ForNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (dst == ignoredResult())
@@ -1897 +1897 @@
 }
 
-RegisterID* ForInNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ForInNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<LabelScope> scope = generator.newLabelScope(LabelScope::Loop);
@@ -1963 +1963 @@
 
 // ECMA 12.7
-RegisterID* ContinueNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ContinueNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     LabelScope* scope = generator.continueTarget(m_ident);
@@ -1979 +1979 @@
 
 // ECMA 12.8
-RegisterID* BreakNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* BreakNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     LabelScope* scope = generator.breakTarget(m_ident);
@@ -2004 +2004 @@
 }
 
-RegisterID* ReturnNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ReturnNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (generator.codeType() != FunctionCode)
@@ -2034 +2034 @@
 }
 
-RegisterID* WithNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* WithNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<RegisterID> scope = generator.emitNode(m_expr.get()); // scope must be protected until popped
@@ -2237 +2237 @@
 }
 
-RegisterID* SwitchNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* SwitchNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<LabelScope> scope = generator.newLabelScope(LabelScope::Switch);
@@ -2260 +2260 @@
 }
 
-RegisterID* LabelNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* LabelNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (generator.breakTarget(m_name))
@@ -2284 +2284 @@
 }
 
-RegisterID* ThrowNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* ThrowNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     if (dst == ignoredResult())
@@ -2308 +2308 @@
 }
 
-RegisterID* TryNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* TryNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     RefPtr<LabelID> tryStartLabel = generator.newLabel();
@@ -2390 +2390 @@
     if (funcStack)
         m_functionStack = *funcStack;
-#if ENABLE(OPCODE_SAMPLING)
+#if ENABLE(BYTECODE_SAMPLING)
     globalData->interpreter->sampler()->notifyOfScope(this);
 #endif
@@ -2414 +2414 @@
 }
 
-RegisterID* EvalNode::emitCode(CodeGenerator& generator, RegisterID*)
+RegisterID* EvalNode::emitBytecode(CodeGenerator& generator, RegisterID*)
 {
     generator.emitDebugHook(WillExecuteProgram, firstLine(), lastLine());
@@ -2504 +2504 @@
 }
 
-RegisterID* FunctionBodyNode::emitCode(CodeGenerator& generator, RegisterID*)
+RegisterID* FunctionBodyNode::emitBytecode(CodeGenerator& generator, RegisterID*)
 {
     generator.emitDebugHook(DidEnterCallFrame, firstLine(), lastLine());
@@ -2516 +2516 @@
 }
 
-RegisterID* ProgramNode::emitCode(CodeGenerator& generator, RegisterID*)
+RegisterID* ProgramNode::emitBytecode(CodeGenerator& generator, RegisterID*)
 {
     generator.emitDebugHook(WillExecuteProgram, firstLine(), lastLine());
@@ -2577 +2577 @@
 }
 
-RegisterID* FuncDeclNode::emitCode(CodeGenerator&, RegisterID* dst)
+RegisterID* FuncDeclNode::emitBytecode(CodeGenerator&, RegisterID* dst)
 {
     return dst;
@@ -2595 +2595 @@
 }
 
-RegisterID* FuncExprNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+RegisterID* FuncExprNode::emitBytecode(CodeGenerator& generator, RegisterID* dst)
 {
     return generator.emitNewFunctionExpression(generator.finalDestination(dst), this);

trunk/JavaScriptCore/parser/Nodes.h

@@ -97 +97 @@
     struct SwitchInfo {
         enum SwitchType { SwitchNone, SwitchImmediate, SwitchCharacter, SwitchString };
-        uint32_t opcodeOffset;
+        uint32_t bytecodeOffset;
         SwitchType switchType;
     };
@@ -147 +147 @@
             node, "1".
         */
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL = 0;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL = 0;
 
         int lineNo() const { return m_line; }
@@ -209 +209 @@
         virtual bool isNull() const JSC_FAST_CALL { return true; }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     };
 
@@ -220 +220 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL { return true; }
@@ -236 +236 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isNumber() const JSC_FAST_CALL { return true; }
@@ -255 +255 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
         
         virtual bool isString() const JSC_FAST_CALL { return true; }
@@ -371 +371 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -385 +385 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     };
 
@@ -397 +397 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isPure(CodeGenerator&) const JSC_FAST_CALL;
@@ -468 +468 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -518 +518 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -541 +541 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -560 +560 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isLocation() const JSC_FAST_CALL { return true; }
@@ -585 +585 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isLocation() const JSC_FAST_CALL { return true; }
@@ -615 +615 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         RefPtr<ArgumentListNode> m_next;
@@ -658 +658 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -677 +677 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -696 +696 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -716 +716 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -739 +739 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -761 +761 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -790 +790 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -810 +810 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -832 +832 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -853 +853 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -869 +869 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -888 +888 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -908 +908 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -926 +926 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -943 +943 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -957 +957 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         const Identifier& identifier() const JSC_FAST_CALL { return m_ident; }
@@ -976 +976 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -990 +990 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1010 +1010 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1032 +1032 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1053 +1053 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1077 +1077 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
-        virtual OpcodeID opcode() const JSC_FAST_CALL = 0;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual BytecodeID bytecode() const JSC_FAST_CALL = 0;
 
     protected:
@@ -1093 +1093 @@
         virtual ExpressionNode* stripUnaryPlus() { return m_expr.get(); }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_to_jsnumber; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_to_jsnumber; }
     };
 
@@ -1103 +1103 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_negate; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_negate; }
     };
 
@@ -1113 +1113 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_bitnot; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_bitnot; }
     };
 
@@ -1123 +1123 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_not; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_not; }
     };
 
@@ -1147 +1147 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
-        virtual OpcodeID opcode() const JSC_FAST_CALL = 0;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual BytecodeID bytecode() const JSC_FAST_CALL = 0;
 
     protected:
@@ -1168 +1168 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     };
 
@@ -1178 +1178 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_mul; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_mul; }
     };
 
@@ -1188 +1188 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_div; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_div; }
     };
 
@@ -1198 +1198 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_mod; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_mod; }
     };
 
@@ -1208 +1208 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_add; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_add; }
     };
 
@@ -1218 +1218 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_sub; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_sub; }
     };
 
@@ -1228 +1228 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_lshift; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_lshift; }
     };
 
@@ -1238 +1238 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_rshift; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_rshift; }
     };
 
@@ -1248 +1248 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_urshift; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_urshift; }
     };
 
@@ -1258 +1258 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_less; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_less; }
     };
 
@@ -1268 +1268 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_less; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_less; }
     };
 
@@ -1278 +1278 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_lesseq; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_lesseq; }
     };
 
@@ -1288 +1288 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_lesseq; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_lesseq; }
     };
 
@@ -1301 +1301 @@
         {
         }
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     };
     
@@ -1311 +1311 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_instanceof; }
-
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_instanceof; }
+
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     };
 
@@ -1323 +1323 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_in; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_in; }
     };
 
@@ -1333 +1333 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_eq; }
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_eq; }
     };
 
@@ -1344 +1344 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_neq; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_neq; }
     };
 
@@ -1354 +1354 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_stricteq; }
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_stricteq; }
     };
 
@@ -1365 +1365 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_nstricteq; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_nstricteq; }
     };
 
@@ -1375 +1375 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_bitand; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_bitand; }
     };
 
@@ -1385 +1385 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_bitor; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_bitor; }
     };
 
@@ -1395 +1395 @@
         }
 
-        virtual OpcodeID opcode() const JSC_FAST_CALL { return op_bitxor; }
+        virtual BytecodeID bytecode() const JSC_FAST_CALL { return op_bitxor; }
     };
 
@@ -1414 +1414 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1438 +1438 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1461 +1461 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1484 +1484 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1510 +1510 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1537 +1537 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1562 +1562 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1587 +1587 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1611 +1611 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1631 +1631 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1657 +1657 @@
         RefPtr<ExpressionNode> m_init;
         
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
         virtual RegisterID* emitCodeSingle(CodeGenerator&) JSC_FAST_CALL;
     };
@@ -1672 +1672 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1703 +1703 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         StatementVector& children() { return m_children; }
@@ -1720 +1720 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isEmptyStatement() const JSC_FAST_CALL { return true; }
@@ -1732 +1732 @@
         }
         
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
     };
 
@@ -1743 +1743 @@
         }
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1760 +1760 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1778 +1778 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     protected:
@@ -1796 +1796 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1814 +1814 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isLoop() const JSC_FAST_CALL { return true; }
@@ -1835 +1835 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isLoop() const JSC_FAST_CALL { return true; }
@@ -1860 +1860 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isLoop() const JSC_FAST_CALL { return true; }
@@ -1880 +1880 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         virtual bool isLoop() const JSC_FAST_CALL { return true; }
@@ -1906 +1906 @@
         }
         
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1925 +1925 @@
         }
         
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1942 +1942 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
         virtual bool isReturnNode() const JSC_FAST_CALL { return true; }
 
@@ -1963 +1963 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -1984 +1984 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -2002 +2002 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private:
@@ -2022 +2022 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* dst = 0) JSC_FAST_CALL;
 
     private:
@@ -2100 +2100 @@
         static ProgramNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, const SourceCode&, CodeFeatures, int numConstants) JSC_FAST_CALL;
 
-        ProgramCodeBlock& byteCode(ScopeChainNode* scopeChain) JSC_FAST_CALL
+        ProgramCodeBlock& bytecode(ScopeChainNode* scopeChain) JSC_FAST_CALL
         {
             if (!m_code)
@@ -2111 +2111 @@
 
         void generateCode(ScopeChainNode*) JSC_FAST_CALL;
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         Vector<size_t> m_varIndexes; // Storage indexes belonging to the nodes in m_varStack. (Recorded to avoid double lookup.)
@@ -2123 +2123 @@
         static EvalNode* create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, const SourceCode&, CodeFeatures, int numConstants) JSC_FAST_CALL;
 
-        EvalCodeBlock& byteCode(ScopeChainNode* scopeChain) JSC_FAST_CALL
+        EvalCodeBlock& bytecode(ScopeChainNode* scopeChain) JSC_FAST_CALL
         {
             if (!m_code)
@@ -2134 +2134 @@
 
         void generateCode(ScopeChainNode*) JSC_FAST_CALL;
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
         
         OwnPtr<EvalCodeBlock> m_code;
@@ -2151 +2151 @@
         Identifier* copyParameters();
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
         
-        CodeBlock& byteCode(ScopeChainNode* scopeChain) JSC_FAST_CALL
+        CodeBlock& bytecode(ScopeChainNode* scopeChain) JSC_FAST_CALL
         {
             ASSERT(scopeChain);
@@ -2218 +2218 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
         JSFunction* makeFunction(ExecState*, ScopeChainNode*) JSC_FAST_CALL;
 
@@ -2243 +2243 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
         JSFunction* makeFunction(ExecState*, ScopeChainNode*) JSC_FAST_CALL;
@@ -2343 +2343 @@
         virtual void releaseNodes(NodeReleaser&);
 
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
+        virtual RegisterID* emitBytecode(CodeGenerator&, RegisterID* = 0) JSC_FAST_CALL;
 
     private: