Changeset 38428 in webkit for trunk/JavaScriptCore/masm

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:

File:

• trunk/JavaScriptCore/masm/X86Assembler.h (modified) (2 diffs)

trunk/JavaScriptCore/masm/X86Assembler.h

@@ -279 +279 @@
 
         GROUP11_MOV = 0,
-    } BytecodeID;
+    } OpcodeID;
     
     static const int MAX_INSTRUCTION_SIZE = 16;
@@ -1231 +1231 @@
     }
 
-    void emitModRm_opr(BytecodeID bytecode, RegisterID rm)
+    void emitModRm_opr(OpcodeID opcodeID, RegisterID rm)
     {
         m_buffer->ensureSpace(MAX_INSTRUCTION_SIZE);
-        emitModRm_opr_Unchecked(bytecode, rm);
-    }
-
-    void emitModRm_opr_Unchecked(BytecodeID bytecode, RegisterID rm)
-    {
-        emitModRm_rr_Unchecked(static_cast<RegisterID>(bytecode), rm);
-    }
-
-    void emitModRm_opm(BytecodeID bytecode, RegisterID base)
-    {
-        emitModRm_rm(static_cast<RegisterID>(bytecode), base);
-    }
-
-    void emitModRm_opm_Unchecked(BytecodeID bytecode, RegisterID base, int offset)
-    {
-        emitModRm_rm_Unchecked(static_cast<RegisterID>(bytecode), base, offset);
-    }
-
-    void emitModRm_opm(BytecodeID bytecode, RegisterID base, int offset)
-    {
-        emitModRm_rm(static_cast<RegisterID>(bytecode), base, offset);
-    }
-
-    void emitModRm_opm(BytecodeID bytecode, void* addr)
-    {
-        emitModRm_rm(static_cast<RegisterID>(bytecode), addr);
-    }
-
-    void emitModRm_opmsib(BytecodeID bytecode, RegisterID base, RegisterID index, int scale, int offset)
-    {
-        emitModRm_rmsib(static_cast<RegisterID>(bytecode), base, index, scale, offset);
+        emitModRm_opr_Unchecked(opcodeID, rm);
+    }
+
+    void emitModRm_opr_Unchecked(OpcodeID opcodeID, RegisterID rm)
+    {
+        emitModRm_rr_Unchecked(static_cast<RegisterID>(opcodeID), rm);
+    }
+
+    void emitModRm_opm(OpcodeID opcodeID, RegisterID base)
+    {
+        emitModRm_rm(static_cast<RegisterID>(opcodeID), base);
+    }
+
+    void emitModRm_opm_Unchecked(OpcodeID opcodeID, RegisterID base, int offset)
+    {
+        emitModRm_rm_Unchecked(static_cast<RegisterID>(opcodeID), base, offset);
+    }
+
+    void emitModRm_opm(OpcodeID opcodeID, RegisterID base, int offset)
+    {
+        emitModRm_rm(static_cast<RegisterID>(opcodeID), base, offset);
+    }
+
+    void emitModRm_opm(OpcodeID opcodeID, void* addr)
+    {
+        emitModRm_rm(static_cast<RegisterID>(opcodeID), addr);
+    }
+
+    void emitModRm_opmsib(OpcodeID opcodeID, RegisterID base, RegisterID index, int scale, int offset)
+    {
+        emitModRm_rmsib(static_cast<RegisterID>(opcodeID), base, index, scale, offset);
     }