Changeset 38428 in webkit for trunk/JavaScriptCore/bytecompiler

Timestamp:

Nov 15, 2008, 1:37:49 PM (17 years ago)

Author:

[email protected]

Message:

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

Suggested by Maciej Stachowiak.

Reverted most "opcode" => "bytecode" renames. We use "bytecode" as a
mass noun to refer to a stream of instructions. Each instruction may be
an opcode or an operand.

• VM/CTI.cpp: (JSC::CTI::emitCTICall): (JSC::CTI::compileOpCall): (JSC::CTI::compileBinaryArithOp): (JSC::CTI::compileBinaryArithOpSlowCase): (JSC::CTI::privateCompileMainPass): (JSC::CTI::privateCompileSlowCases): (JSC::CTI::privateCompile):
• VM/CTI.h:
• VM/CodeBlock.cpp: (JSC::CodeBlock::printStructureIDs): (JSC::CodeBlock::dump): (JSC::CodeBlock::derefStructureIDs): (JSC::CodeBlock::refStructureIDs):
• VM/CodeBlock.h:
• VM/ExceptionHelpers.cpp: (JSC::createNotAnObjectError):
• VM/Instruction.h: (JSC::Instruction::Instruction): (JSC::Instruction::):
• VM/Machine.cpp: (JSC::BytecodeInterpreter::isOpcode): (JSC::BytecodeInterpreter::throwException): (JSC::BytecodeInterpreter::tryCachePutByID): (JSC::BytecodeInterpreter::uncachePutByID): (JSC::BytecodeInterpreter::tryCacheGetByID): (JSC::BytecodeInterpreter::uncacheGetByID): (JSC::BytecodeInterpreter::privateExecute): (JSC::BytecodeInterpreter::tryCTICachePutByID): (JSC::BytecodeInterpreter::tryCTICacheGetByID):
• VM/Machine.h: (JSC::BytecodeInterpreter::getOpcode): (JSC::BytecodeInterpreter::getOpcodeID): (JSC::BytecodeInterpreter::isCallBytecode):
• VM/Opcode.cpp: (JSC::): (JSC::OpcodeStats::OpcodeStats): (JSC::compareOpcodeIndices): (JSC::compareOpcodePairIndices): (JSC::OpcodeStats::~OpcodeStats): (JSC::OpcodeStats::recordInstruction): (JSC::OpcodeStats::resetLastInstruction):
• VM/Opcode.h: (JSC::): (JSC::padOpcodeName):
• VM/SamplingTool.cpp: (JSC::ScopeSampleRecord::sample): (JSC::SamplingTool::run): (JSC::compareOpcodeIndicesSampling): (JSC::SamplingTool::dump):
• VM/SamplingTool.h: (JSC::ScopeSampleRecord::ScopeSampleRecord): (JSC::SamplingTool::SamplingTool):
• bytecompiler/CodeGenerator.cpp: (JSC::BytecodeGenerator::BytecodeGenerator): (JSC::BytecodeGenerator::emitLabel): (JSC::BytecodeGenerator::emitOpcode): (JSC::BytecodeGenerator::emitJump): (JSC::BytecodeGenerator::emitJumpIfTrue): (JSC::BytecodeGenerator::emitJumpIfFalse): (JSC::BytecodeGenerator::emitMove): (JSC::BytecodeGenerator::emitUnaryOp): (JSC::BytecodeGenerator::emitPreInc): (JSC::BytecodeGenerator::emitPreDec): (JSC::BytecodeGenerator::emitPostInc): (JSC::BytecodeGenerator::emitPostDec): (JSC::BytecodeGenerator::emitBinaryOp): (JSC::BytecodeGenerator::emitEqualityOp): (JSC::BytecodeGenerator::emitUnexpectedLoad): (JSC::BytecodeGenerator::emitInstanceOf): (JSC::BytecodeGenerator::emitResolve): (JSC::BytecodeGenerator::emitGetScopedVar): (JSC::BytecodeGenerator::emitPutScopedVar): (JSC::BytecodeGenerator::emitResolveBase): (JSC::BytecodeGenerator::emitResolveWithBase): (JSC::BytecodeGenerator::emitResolveFunction): (JSC::BytecodeGenerator::emitGetById): (JSC::BytecodeGenerator::emitPutById): (JSC::BytecodeGenerator::emitPutGetter): (JSC::BytecodeGenerator::emitPutSetter): (JSC::BytecodeGenerator::emitDeleteById): (JSC::BytecodeGenerator::emitGetByVal): (JSC::BytecodeGenerator::emitPutByVal): (JSC::BytecodeGenerator::emitDeleteByVal): (JSC::BytecodeGenerator::emitPutByIndex): (JSC::BytecodeGenerator::emitNewObject): (JSC::BytecodeGenerator::emitNewArray): (JSC::BytecodeGenerator::emitNewFunction): (JSC::BytecodeGenerator::emitNewRegExp): (JSC::BytecodeGenerator::emitNewFunctionExpression): (JSC::BytecodeGenerator::emitCall): (JSC::BytecodeGenerator::emitReturn): (JSC::BytecodeGenerator::emitUnaryNoDstOp): (JSC::BytecodeGenerator::emitConstruct): (JSC::BytecodeGenerator::emitPopScope): (JSC::BytecodeGenerator::emitDebugHook): (JSC::BytecodeGenerator::emitComplexJumpScopes): (JSC::BytecodeGenerator::emitJumpScopes): (JSC::BytecodeGenerator::emitNextPropertyName): (JSC::BytecodeGenerator::emitCatch): (JSC::BytecodeGenerator::emitNewError): (JSC::BytecodeGenerator::emitJumpSubroutine): (JSC::BytecodeGenerator::emitSubroutineReturn): (JSC::BytecodeGenerator::emitPushNewScope): (JSC::BytecodeGenerator::beginSwitch):
• bytecompiler/CodeGenerator.h:
• 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::UnaryOpNode::emitBytecode): (JSC::BinaryOpNode::emitBytecode): (JSC::ReverseBinaryOpNode::emitBytecode): (JSC::ThrowableBinaryOpNode::emitBytecode): (JSC::emitReadModifyAssignment): (JSC::ScopeNode::ScopeNode):
• 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::):
• runtime/StructureID.cpp: (JSC::StructureID::fromDictionaryTransition):
• wtf/Platform.h:

Location:

trunk/JavaScriptCore/bytecompiler

Files:

• CodeGenerator.cpp (modified) (85 diffs)
• CodeGenerator.h (modified) (4 diffs)

trunk/JavaScriptCore/bytecompiler/CodeGenerator.cpp

@@ -228 +228 @@
     , m_nextGlobalIndex(-1)
     , m_globalData(&scopeChain.globalObject()->globalExec()->globalData())
-    , m_lastBytecodeID(op_end)
+    , m_lastOpcodeID(op_end)
     , m_emitNodeDepth(0)
 {
@@ -234 +234 @@
         m_codeBlock->needsFullScopeChain = true;
 
-    emitBytecode(op_enter);
+    emitOpcode(op_enter);
     codeBlock->globalData = m_globalData;
 
@@ -305 +305 @@
     , m_codeType(FunctionCode)
     , m_globalData(&scopeChain.globalObject()->globalExec()->globalData())
-    , m_lastBytecodeID(op_end)
+    , m_lastOpcodeID(op_end)
     , m_emitNodeDepth(0)
 {
@@ -323 +323 @@
         ++m_codeBlock->numVars;
         m_activationRegisterIndex = newRegister()->index();
-        emitBytecode(op_enter_with_activation);
+        emitOpcode(op_enter_with_activation);
         instructions().append(m_activationRegisterIndex);
     } else
-        emitBytecode(op_enter);
+        emitOpcode(op_enter);
 
     if (usesArguments)
-        emitBytecode(op_create_arguments);
+        emitOpcode(op_create_arguments);
 
     const DeclarationStacks::FunctionStack& functionStack = functionBody->functionStack();
@@ -354 +354 @@
 
     if (functionBody->usesThis()) {
-        emitBytecode(op_convert_this);
+        emitOpcode(op_convert_this);
         instructions().append(m_thisRegister.index());
     }
@@ -376 +376 @@
     , m_codeType(EvalCode)
     , m_globalData(&scopeChain.globalObject()->globalExec()->globalData())
-    , m_lastBytecodeID(op_end)
+    , m_lastOpcodeID(op_end)
     , m_emitNodeDepth(0)
 {
@@ -382 +382 @@
         m_codeBlock->needsFullScopeChain = true;
 
-    emitBytecode(op_enter);
+    emitOpcode(op_enter);
     codeBlock->globalData = m_globalData;
     m_codeBlock->numParameters = 1; // Allocate space for "this"
@@ -513 +513 @@
 
     // This disables peephole optimizations when an instruction is a jump target
-    m_lastBytecodeID = op_end;
+    m_lastOpcodeID = op_end;
     return l0;
 }
 
-void BytecodeGenerator::emitBytecode(BytecodeID bytecodeID)
-{
-    instructions().append(globalData()->interpreter->getBytecode(bytecodeID));
-    m_lastBytecodeID = bytecodeID;
+void BytecodeGenerator::emitOpcode(OpcodeID opcodeID)
+{
+    instructions().append(globalData()->interpreter->getOpcode(opcodeID));
+    m_lastOpcodeID = opcodeID;
 }
 
@@ -554 +554 @@
 PassRefPtr<LabelID> BytecodeGenerator::emitJump(LabelID* target)
 {
-    emitBytecode(target->isForwardLabel() ? op_jmp : op_loop);
+    emitOpcode(target->isForwardLabel() ? op_jmp : op_loop);
     instructions().append(target->offsetFrom(instructions().size()));
     return target;
@@ -561 +561 @@
 PassRefPtr<LabelID> BytecodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
 {
-    if (m_lastBytecodeID == op_less && !target->isForwardLabel()) {
+    if (m_lastOpcodeID == op_less && !target->isForwardLabel()) {
         int dstIndex;
         int src1Index;
@@ -570 +570 @@
         if (cond->index() == dstIndex && cond->isTemporary() && !cond->refCount()) {
             rewindBinaryOp();
-            emitBytecode(op_loop_if_less);
+            emitOpcode(op_loop_if_less);
             instructions().append(src1Index);
             instructions().append(src2Index);
@@ -576 +576 @@
             return target;
         }
-    } else if (m_lastBytecodeID == op_lesseq && !target->isForwardLabel()) {
+    } else if (m_lastOpcodeID == op_lesseq && !target->isForwardLabel()) {
         int dstIndex;
         int src1Index;
@@ -585 +585 @@
         if (cond->index() == dstIndex && cond->isTemporary() && !cond->refCount()) {
             rewindBinaryOp();
-            emitBytecode(op_loop_if_lesseq);
+            emitOpcode(op_loop_if_lesseq);
             instructions().append(src1Index);
             instructions().append(src2Index);
@@ -591 +591 @@
             return target;
         }
-    } else if (m_lastBytecodeID == op_eq_null && target->isForwardLabel()) {
+    } else if (m_lastOpcodeID == op_eq_null && target->isForwardLabel()) {
         int dstIndex;
         int srcIndex;
@@ -599 +599 @@
         if (cond->index() == dstIndex && cond->isTemporary() && !cond->refCount()) {
             rewindUnaryOp();
-            emitBytecode(op_jeq_null);
+            emitOpcode(op_jeq_null);
             instructions().append(srcIndex);
             instructions().append(target->offsetFrom(instructions().size()));
             return target;
         }
-    } else if (m_lastBytecodeID == op_neq_null && target->isForwardLabel()) {
+    } else if (m_lastOpcodeID == op_neq_null && target->isForwardLabel()) {
         int dstIndex;
         int srcIndex;
@@ -612 +612 @@
         if (cond->index() == dstIndex && cond->isTemporary() && !cond->refCount()) {
             rewindUnaryOp();
-            emitBytecode(op_jneq_null);
+            emitOpcode(op_jneq_null);
             instructions().append(srcIndex);
             instructions().append(target->offsetFrom(instructions().size()));
@@ -619 +619 @@
     }
 
-    emitBytecode(target->isForwardLabel() ? op_jtrue : op_loop_if_true);
+    emitOpcode(target->isForwardLabel() ? op_jtrue : op_loop_if_true);
     instructions().append(cond->index());
     instructions().append(target->offsetFrom(instructions().size()));
@@ -629 +629 @@
     ASSERT(target->isForwardLabel());
 
-    if (m_lastBytecodeID == op_less) {
+    if (m_lastOpcodeID == op_less) {
         int dstIndex;
         int src1Index;
@@ -638 +638 @@
         if (cond->index() == dstIndex && cond->isTemporary() && !cond->refCount()) {
             rewindBinaryOp();
-            emitBytecode(op_jnless);
+            emitOpcode(op_jnless);
             instructions().append(src1Index);
             instructions().append(src2Index);
@@ -644 +644 @@
             return target;
         }
-    } else if (m_lastBytecodeID == op_not) {
+    } else if (m_lastOpcodeID == op_not) {
         int dstIndex;
         int srcIndex;
@@ -652 +652 @@
         if (cond->index() == dstIndex && cond->isTemporary() && !cond->refCount()) {
             rewindUnaryOp();
-            emitBytecode(op_jtrue);
+            emitOpcode(op_jtrue);
             instructions().append(srcIndex);
             instructions().append(target->offsetFrom(instructions().size()));
             return target;
         }
-    } else if (m_lastBytecodeID == op_eq_null) {
+    } else if (m_lastOpcodeID == op_eq_null) {
         int dstIndex;
         int srcIndex;
@@ -665 +665 @@
         if (cond->index() == dstIndex && cond->isTemporary() && !cond->refCount()) {
             rewindUnaryOp();
-            emitBytecode(op_jneq_null);
+            emitOpcode(op_jneq_null);
             instructions().append(srcIndex);
             instructions().append(target->offsetFrom(instructions().size()));
             return target;
         }
-    } else if (m_lastBytecodeID == op_neq_null) {
+    } else if (m_lastOpcodeID == op_neq_null) {
         int dstIndex;
         int srcIndex;
@@ -678 +678 @@
         if (cond->index() == dstIndex && cond->isTemporary() && !cond->refCount()) {
             rewindUnaryOp();
-            emitBytecode(op_jeq_null);
+            emitOpcode(op_jeq_null);
             instructions().append(srcIndex);
             instructions().append(target->offsetFrom(instructions().size()));
@@ -685 +685 @@
     }
 
-    emitBytecode(op_jfalse);
+    emitOpcode(op_jfalse);
     instructions().append(cond->index());
     instructions().append(target->offsetFrom(instructions().size()));
@@ -748 +748 @@
 RegisterID* BytecodeGenerator::emitMove(RegisterID* dst, RegisterID* src)
 {
-    emitBytecode(op_mov);
+    emitOpcode(op_mov);
     instructions().append(dst->index());
     instructions().append(src->index());
@@ -754 +754 @@
 }
 
-RegisterID* BytecodeGenerator::emitUnaryOp(BytecodeID bytecode, RegisterID* dst, RegisterID* src, ResultType type)
-{
-    emitBytecode(bytecode);
+RegisterID* BytecodeGenerator::emitUnaryOp(OpcodeID opcodeID, RegisterID* dst, RegisterID* src, ResultType type)
+{
+    emitOpcode(opcodeID);
     instructions().append(dst->index());
     instructions().append(src->index());
-    if (bytecode == op_negate)
+    if (opcodeID == op_negate)
         instructions().append(type.toInt());
     return dst;
@@ -766 +766 @@
 RegisterID* BytecodeGenerator::emitPreInc(RegisterID* srcDst)
 {
-    emitBytecode(op_pre_inc);
+    emitOpcode(op_pre_inc);
     instructions().append(srcDst->index());
     return srcDst;
@@ -773 +773 @@
 RegisterID* BytecodeGenerator::emitPreDec(RegisterID* srcDst)
 {
-    emitBytecode(op_pre_dec);
+    emitOpcode(op_pre_dec);
     instructions().append(srcDst->index());
     return srcDst;
@@ -780 +780 @@
 RegisterID* BytecodeGenerator::emitPostInc(RegisterID* dst, RegisterID* srcDst)
 {
-    emitBytecode(op_post_inc);
+    emitOpcode(op_post_inc);
     instructions().append(dst->index());
     instructions().append(srcDst->index());
@@ -788 +788 @@
 RegisterID* BytecodeGenerator::emitPostDec(RegisterID* dst, RegisterID* srcDst)
 {
-    emitBytecode(op_post_dec);
+    emitOpcode(op_post_dec);
     instructions().append(dst->index());
     instructions().append(srcDst->index());
@@ -794 +794 @@
 }
 
-RegisterID* BytecodeGenerator::emitBinaryOp(BytecodeID bytecode, RegisterID* dst, RegisterID* src1, RegisterID* src2, OperandTypes types)
-{
-    emitBytecode(bytecode);
+RegisterID* BytecodeGenerator::emitBinaryOp(OpcodeID opcodeID, RegisterID* dst, RegisterID* src1, RegisterID* src2, OperandTypes types)
+{
+    emitOpcode(opcodeID);
     instructions().append(dst->index());
     instructions().append(src1->index());
     instructions().append(src2->index());
 
-    if (bytecode == op_bitor || bytecode == op_bitand || bytecode == op_bitxor ||
-        bytecode == op_add || bytecode == op_mul || bytecode == op_sub) {
+    if (opcodeID == op_bitor || opcodeID == op_bitand || opcodeID == op_bitxor ||
+        opcodeID == op_add || opcodeID == op_mul || opcodeID == op_sub) {
         instructions().append(types.toInt());
     }
@@ -809 +809 @@
 }
 
-RegisterID* BytecodeGenerator::emitEqualityOp(BytecodeID bytecode, RegisterID* dst, RegisterID* src1, RegisterID* src2)
-{
-    if (m_lastBytecodeID == op_typeof) {
+RegisterID* BytecodeGenerator::emitEqualityOp(OpcodeID opcodeID, RegisterID* dst, RegisterID* src1, RegisterID* src2)
+{
+    if (m_lastOpcodeID == op_typeof) {
         int dstIndex;
         int srcIndex;
@@ -824 +824 @@
             if (value == "undefined") {
                 rewindUnaryOp();
-                emitBytecode(op_is_undefined);
+                emitOpcode(op_is_undefined);
                 instructions().append(dst->index());
                 instructions().append(srcIndex);
@@ -831 +831 @@
             if (value == "boolean") {
                 rewindUnaryOp();
-                emitBytecode(op_is_boolean);
+                emitOpcode(op_is_boolean);
                 instructions().append(dst->index());
                 instructions().append(srcIndex);
@@ -838 +838 @@
             if (value == "number") {
                 rewindUnaryOp();
-                emitBytecode(op_is_number);
+                emitOpcode(op_is_number);
                 instructions().append(dst->index());
                 instructions().append(srcIndex);
@@ -845 +845 @@
             if (value == "string") {
                 rewindUnaryOp();
-                emitBytecode(op_is_string);
+                emitOpcode(op_is_string);
                 instructions().append(dst->index());
                 instructions().append(srcIndex);
@@ -852 +852 @@
             if (value == "object") {
                 rewindUnaryOp();
-                emitBytecode(op_is_object);
+                emitOpcode(op_is_object);
                 instructions().append(dst->index());
                 instructions().append(srcIndex);
@@ -859 +859 @@
             if (value == "function") {
                 rewindUnaryOp();
-                emitBytecode(op_is_function);
+                emitOpcode(op_is_function);
                 instructions().append(dst->index());
                 instructions().append(srcIndex);
@@ -867 +867 @@
     }
 
-    emitBytecode(bytecode);
+    emitOpcode(opcodeID);
     instructions().append(dst->index());
     instructions().append(src1->index());
@@ -915 +915 @@
 RegisterID* BytecodeGenerator::emitUnexpectedLoad(RegisterID* dst, bool b)
 {
-    emitBytecode(op_unexpected_load);
+    emitOpcode(op_unexpected_load);
     instructions().append(dst->index());
     instructions().append(addUnexpectedConstant(jsBoolean(b)));
@@ -923 +923 @@
 RegisterID* BytecodeGenerator::emitUnexpectedLoad(RegisterID* dst, double d)
 {
-    emitBytecode(op_unexpected_load);
+    emitOpcode(op_unexpected_load);
     instructions().append(dst->index());
     instructions().append(addUnexpectedConstant(jsNumber(globalData(), d)));
@@ -985 +985 @@
 RegisterID* BytecodeGenerator::emitInstanceOf(RegisterID* dst, RegisterID* value, RegisterID* base, RegisterID* basePrototype)
 { 
-    emitBytecode(op_instanceof);
+    emitOpcode(op_instanceof);
     instructions().append(dst->index());
     instructions().append(value->index());
@@ -1000 +1000 @@
     if (!findScopedProperty(property, index, depth, false, globalObject) && !globalObject) {
         // We can't optimise at all :-(
-        emitBytecode(op_resolve);
+        emitOpcode(op_resolve);
         instructions().append(dst->index());
         instructions().append(addConstant(property));
@@ -1013 +1013 @@
     if (globalObject) {
         m_codeBlock->globalResolveInstructions.append(instructions().size());
-        emitBytecode(op_resolve_global);
+        emitOpcode(op_resolve_global);
         instructions().append(dst->index());
         instructions().append(globalObject);
@@ -1024 +1024 @@
     // In this case we are at least able to drop a few scope chains from the
     // lookup chain, although we still need to hash from then on.
-    emitBytecode(op_resolve_skip);
+    emitOpcode(op_resolve_skip);
     instructions().append(dst->index());
     instructions().append(addConstant(property));
@@ -1034 +1034 @@
 {
     if (globalObject) {
-        emitBytecode(op_get_global_var);
+        emitOpcode(op_get_global_var);
         instructions().append(dst->index());
         instructions().append(asCell(globalObject));
@@ -1041 +1041 @@
     }
 
-    emitBytecode(op_get_scoped_var);
+    emitOpcode(op_get_scoped_var);
     instructions().append(dst->index());
     instructions().append(index);
@@ -1051 +1051 @@
 {
     if (globalObject) {
-        emitBytecode(op_put_global_var);
+        emitOpcode(op_put_global_var);
         instructions().append(asCell(globalObject));
         instructions().append(index);
@@ -1057 +1057 @@
         return value;
     }
-    emitBytecode(op_put_scoped_var);
+    emitOpcode(op_put_scoped_var);
     instructions().append(index);
     instructions().append(depth);
@@ -1066 +1066 @@
 RegisterID* BytecodeGenerator::emitResolveBase(RegisterID* dst, const Identifier& property)
 {
-    emitBytecode(op_resolve_base);
+    emitOpcode(op_resolve_base);
     instructions().append(dst->index());
     instructions().append(addConstant(property));
@@ -1074 +1074 @@
 RegisterID* BytecodeGenerator::emitResolveWithBase(RegisterID* baseDst, RegisterID* propDst, const Identifier& property)
 {
-    emitBytecode(op_resolve_with_base);
+    emitOpcode(op_resolve_with_base);
     instructions().append(baseDst->index());
     instructions().append(propDst->index());
@@ -1083 +1083 @@
 RegisterID* BytecodeGenerator::emitResolveFunction(RegisterID* baseDst, RegisterID* funcDst, const Identifier& property)
 {
-    emitBytecode(op_resolve_func);
+    emitOpcode(op_resolve_func);
     instructions().append(baseDst->index());
     instructions().append(funcDst->index());
@@ -1094 +1094 @@
     m_codeBlock->propertyAccessInstructions.append(instructions().size());
 
-    emitBytecode(op_get_by_id);
+    emitOpcode(op_get_by_id);
     instructions().append(dst->index());
     instructions().append(base->index());
@@ -1109 +1109 @@
     m_codeBlock->propertyAccessInstructions.append(instructions().size());
 
-    emitBytecode(op_put_by_id);
+    emitOpcode(op_put_by_id);
     instructions().append(base->index());
     instructions().append(addConstant(property));
@@ -1122 +1122 @@
 RegisterID* BytecodeGenerator::emitPutGetter(RegisterID* base, const Identifier& property, RegisterID* value)
 {
-    emitBytecode(op_put_getter);
+    emitOpcode(op_put_getter);
     instructions().append(base->index());
     instructions().append(addConstant(property));
@@ -1131 +1131 @@
 RegisterID* BytecodeGenerator::emitPutSetter(RegisterID* base, const Identifier& property, RegisterID* value)
 {
-    emitBytecode(op_put_setter);
+    emitOpcode(op_put_setter);
     instructions().append(base->index());
     instructions().append(addConstant(property));
@@ -1140 +1140 @@
 RegisterID* BytecodeGenerator::emitDeleteById(RegisterID* dst, RegisterID* base, const Identifier& property)
 {
-    emitBytecode(op_del_by_id);
+    emitOpcode(op_del_by_id);
     instructions().append(dst->index());
     instructions().append(base->index());
@@ -1149 +1149 @@
 RegisterID* BytecodeGenerator::emitGetByVal(RegisterID* dst, RegisterID* base, RegisterID* property)
 {
-    emitBytecode(op_get_by_val);
+    emitOpcode(op_get_by_val);
     instructions().append(dst->index());
     instructions().append(base->index());
@@ -1158 +1158 @@
 RegisterID* BytecodeGenerator::emitPutByVal(RegisterID* base, RegisterID* property, RegisterID* value)
 {
-    emitBytecode(op_put_by_val);
+    emitOpcode(op_put_by_val);
     instructions().append(base->index());
     instructions().append(property->index());
@@ -1167 +1167 @@
 RegisterID* BytecodeGenerator::emitDeleteByVal(RegisterID* dst, RegisterID* base, RegisterID* property)
 {
-    emitBytecode(op_del_by_val);
+    emitOpcode(op_del_by_val);
     instructions().append(dst->index());
     instructions().append(base->index());
@@ -1176 +1176 @@
 RegisterID* BytecodeGenerator::emitPutByIndex(RegisterID* base, unsigned index, RegisterID* value)
 {
-    emitBytecode(op_put_by_index);
+    emitOpcode(op_put_by_index);
     instructions().append(base->index());
     instructions().append(index);
@@ -1185 +1185 @@
 RegisterID* BytecodeGenerator::emitNewObject(RegisterID* dst)
 {
-    emitBytecode(op_new_object);
+    emitOpcode(op_new_object);
     instructions().append(dst->index());
     return dst;
@@ -1199 +1199 @@
         emitNode(argv.last().get(), n->value());
     }
-    emitBytecode(op_new_array);
+    emitOpcode(op_new_array);
     instructions().append(dst->index());
     instructions().append(argv.size() ? argv[0]->index() : 0); // argv
@@ -1208 +1208 @@
 RegisterID* BytecodeGenerator::emitNewFunction(RegisterID* dst, FuncDeclNode* n)
 {
-    emitBytecode(op_new_func);
+    emitOpcode(op_new_func);
     instructions().append(dst->index());
     instructions().append(addConstant(n));
@@ -1216 +1216 @@
 RegisterID* BytecodeGenerator::emitNewRegExp(RegisterID* dst, RegExp* regExp)
 {
-    emitBytecode(op_new_regexp);
+    emitOpcode(op_new_regexp);
     instructions().append(dst->index());
     instructions().append(addRegExp(regExp));
@@ -1225 +1225 @@
 RegisterID* BytecodeGenerator::emitNewFunctionExpression(RegisterID* r0, FuncExprNode* n)
 {
-    emitBytecode(op_new_func_exp);
+    emitOpcode(op_new_func_exp);
     instructions().append(r0->index());
     instructions().append(addConstant(n));
@@ -1241 +1241 @@
 }
 
-RegisterID* BytecodeGenerator::emitCall(BytecodeID bytecodeID, RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode* argumentsNode, unsigned divot, unsigned startOffset, unsigned endOffset)
-{
-    ASSERT(bytecodeID == op_call || bytecodeID == op_call_eval);
+RegisterID* BytecodeGenerator::emitCall(OpcodeID opcodeID, RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode* argumentsNode, unsigned divot, unsigned startOffset, unsigned endOffset)
+{
+    ASSERT(opcodeID == op_call || opcodeID == op_call_eval);
     ASSERT(func->refCount());
 
@@ -1274 +1274 @@
 
     if (m_shouldEmitProfileHooks) {
-        emitBytecode(op_profile_will_call);
+        emitOpcode(op_profile_will_call);
         instructions().append(func->index());
     }
@@ -1282 +1282 @@
 
     // Emit call.
-    emitBytecode(bytecodeID);
+    emitOpcode(opcodeID);
     instructions().append(dst->index()); // dst
     instructions().append(func->index()); // func
@@ -1289 +1289 @@
 
     if (m_shouldEmitProfileHooks) {
-        emitBytecode(op_profile_did_call);
+        emitOpcode(op_profile_did_call);
         instructions().append(func->index());
 
@@ -1304 +1304 @@
 {
     if (m_codeBlock->needsFullScopeChain) {
-        emitBytecode(op_tear_off_activation);
+        emitOpcode(op_tear_off_activation);
         instructions().append(m_activationRegisterIndex);
     } else if (m_codeBlock->usesArguments && m_codeBlock->numParameters > 1)
-        emitBytecode(op_tear_off_arguments);
+        emitOpcode(op_tear_off_arguments);
 
     return emitUnaryNoDstOp(op_ret, src);
 }
 
-RegisterID* BytecodeGenerator::emitUnaryNoDstOp(BytecodeID bytecode, RegisterID* src)
-{
-    emitBytecode(bytecode);
+RegisterID* BytecodeGenerator::emitUnaryNoDstOp(OpcodeID opcodeID, RegisterID* src)
+{
+    emitOpcode(opcodeID);
     instructions().append(src->index());
     return src;
@@ -1344 +1344 @@
 
     if (m_shouldEmitProfileHooks) {
-        emitBytecode(op_profile_will_call);
+        emitOpcode(op_profile_will_call);
         instructions().append(func->index());
     }
@@ -1360 +1360 @@
     m_codeBlock->callLinkInfos.append(CallLinkInfo());
 
-    emitBytecode(op_construct);
+    emitOpcode(op_construct);
     instructions().append(dst->index()); // dst
     instructions().append(func->index()); // func
@@ -1368 +1368 @@
     instructions().append(argv[0]->index()); // thisRegister
 
-    emitBytecode(op_construct_verify);
+    emitOpcode(op_construct_verify);
     instructions().append(dst->index());
     instructions().append(argv[0]->index());
 
     if (m_shouldEmitProfileHooks) {
-        emitBytecode(op_profile_did_call);
+        emitOpcode(op_profile_did_call);
         instructions().append(func->index());
         
@@ -1398 +1398 @@
     ASSERT(!m_scopeContextStack.last().isFinallyBlock);
 
-    emitBytecode(op_pop_scope);
+    emitOpcode(op_pop_scope);
 
     m_scopeContextStack.removeLast();
@@ -1408 +1408 @@
     if (!m_shouldEmitDebugHooks)
         return;
-    emitBytecode(op_debug);
+    emitOpcode(op_debug);
     instructions().append(debugHookID);
     instructions().append(firstLine);
@@ -1517 +1517 @@
             // We need to remove a number of dynamic scopes to get to the next
             // finally block
-            emitBytecode(op_jmp_scopes);
+            emitOpcode(op_jmp_scopes);
             instructions().append(nNormalScopes);
 
@@ -1559 +1559 @@
         return emitComplexJumpScopes(target, &m_scopeContextStack.last(), &m_scopeContextStack.last() - scopeDelta);
 
-    emitBytecode(op_jmp_scopes);
+    emitOpcode(op_jmp_scopes);
     instructions().append(scopeDelta);
     instructions().append(target->offsetFrom(instructions().size()));
@@ -1567 +1567 @@
 RegisterID* BytecodeGenerator::emitNextPropertyName(RegisterID* dst, RegisterID* iter, LabelID* target)
 {
-    emitBytecode(op_next_pname);
+    emitOpcode(op_next_pname);
     instructions().append(dst->index());
     instructions().append(iter->index());
@@ -1578 +1578 @@
     HandlerInfo info = { start->offsetFrom(0), end->offsetFrom(0), instructions().size(), m_dynamicScopeDepth, 0 };
     exceptionHandlers().append(info);
-    emitBytecode(op_catch);
+    emitOpcode(op_catch);
     instructions().append(targetRegister->index());
     return targetRegister;
@@ -1585 +1585 @@
 RegisterID* BytecodeGenerator::emitNewError(RegisterID* dst, ErrorType type, JSValue* message)
 {
-    emitBytecode(op_new_error);
+    emitOpcode(op_new_error);
     instructions().append(dst->index());
     instructions().append(static_cast<int>(type));
@@ -1594 +1594 @@
 PassRefPtr<LabelID> BytecodeGenerator::emitJumpSubroutine(RegisterID* retAddrDst, LabelID* finally)
 {
-    emitBytecode(op_jsr);
+    emitOpcode(op_jsr);
     instructions().append(retAddrDst->index());
     instructions().append(finally->offsetFrom(instructions().size()));
@@ -1602 +1602 @@
 void BytecodeGenerator::emitSubroutineReturn(RegisterID* retAddrSrc)
 {
-    emitBytecode(op_sret);
+    emitOpcode(op_sret);
     instructions().append(retAddrSrc->index());
 }
@@ -1613 +1613 @@
     m_dynamicScopeDepth++;
     
-    emitBytecode(op_push_new_scope);
+    emitOpcode(op_push_new_scope);
     instructions().append(dst->index());
     instructions().append(addConstant(property));
@@ -1624 +1624 @@
     switch (type) {
         case SwitchInfo::SwitchImmediate:
-            emitBytecode(op_switch_imm);
+            emitOpcode(op_switch_imm);
             break;
         case SwitchInfo::SwitchCharacter:
-            emitBytecode(op_switch_char);
+            emitOpcode(op_switch_char);
             break;
         case SwitchInfo::SwitchString:
-            emitBytecode(op_switch_string);
+            emitOpcode(op_switch_string);
             break;
         default:

trunk/JavaScriptCore/bytecompiler/CodeGenerator.h

@@ -232 +232 @@
         RegisterID* emitUnexpectedLoad(RegisterID* dst, double);
 
-        RegisterID* emitUnaryOp(BytecodeID, RegisterID* dst, RegisterID* src, ResultType);
-        RegisterID* emitBinaryOp(BytecodeID, RegisterID* dst, RegisterID* src1, RegisterID* src2, OperandTypes);
-        RegisterID* emitEqualityOp(BytecodeID, RegisterID* dst, RegisterID* src1, RegisterID* src2);
-        RegisterID* emitUnaryNoDstOp(BytecodeID, RegisterID* src);
+        RegisterID* emitUnaryOp(OpcodeID, RegisterID* dst, RegisterID* src, ResultType);
+        RegisterID* emitBinaryOp(OpcodeID, RegisterID* dst, RegisterID* src1, RegisterID* src2, OperandTypes);
+        RegisterID* emitEqualityOp(OpcodeID, RegisterID* dst, RegisterID* src1, RegisterID* src2);
+        RegisterID* emitUnaryNoDstOp(OpcodeID, RegisterID* src);
 
         RegisterID* emitNewObject(RegisterID* dst);
@@ -318 +318 @@
 
     private:
-        void emitBytecode(BytecodeID);
+        void emitOpcode(OpcodeID);
         void retrieveLastBinaryOp(int& dstIndex, int& src1Index, int& src2Index);
         void retrieveLastUnaryOp(int& dstIndex, int& srcIndex);
@@ -346 +346 @@
         typedef HashMap<UString::Rep*, JSString*, IdentifierRepHash> IdentifierStringMap;
 
-        RegisterID* emitCall(BytecodeID, RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
+        RegisterID* emitCall(OpcodeID, RegisterID* dst, RegisterID* func, RegisterID* thisRegister, ArgumentsNode*, unsigned divot, unsigned startOffset, unsigned endOffset);
         
         RegisterID* newRegister();
@@ -447 +447 @@
         JSGlobalData* m_globalData;
 
-        BytecodeID m_lastBytecodeID;
+        OpcodeID m_lastOpcodeID;
 
 #ifndef NDEBUG