2008-11-15 Geoffrey Garen <ggaren@apple.com>
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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@38425 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/VM/CTI.h b/JavaScriptCore/VM/CTI.h
index 113d421..3e3e0dd 100644
--- a/JavaScriptCore/VM/CTI.h
+++ b/JavaScriptCore/VM/CTI.h
@@ -119,7 +119,7 @@
struct CallRecord {
X86Assembler::JmpSrc from;
void* to;
- unsigned opcodeIndex;
+ unsigned bytecodeIndex;
CallRecord()
{
@@ -128,56 +128,56 @@
CallRecord(X86Assembler::JmpSrc f, CTIHelper_j t, unsigned i)
: from(f)
, to(reinterpret_cast<void*>(t))
- , opcodeIndex(i)
+ , bytecodeIndex(i)
{
}
CallRecord(X86Assembler::JmpSrc f, CTIHelper_o t, unsigned i)
: from(f)
, to(reinterpret_cast<void*>(t))
- , opcodeIndex(i)
+ , bytecodeIndex(i)
{
}
CallRecord(X86Assembler::JmpSrc f, CTIHelper_p t, unsigned i)
: from(f)
, to(reinterpret_cast<void*>(t))
- , opcodeIndex(i)
+ , bytecodeIndex(i)
{
}
CallRecord(X86Assembler::JmpSrc f, CTIHelper_v t, unsigned i)
: from(f)
, to(reinterpret_cast<void*>(t))
- , opcodeIndex(i)
+ , bytecodeIndex(i)
{
}
CallRecord(X86Assembler::JmpSrc f, CTIHelper_s t, unsigned i)
: from(f)
, to(reinterpret_cast<void*>(t))
- , opcodeIndex(i)
+ , bytecodeIndex(i)
{
}
CallRecord(X86Assembler::JmpSrc f, CTIHelper_b t, unsigned i)
: from(f)
, to(reinterpret_cast<void*>(t))
- , opcodeIndex(i)
+ , bytecodeIndex(i)
{
}
CallRecord(X86Assembler::JmpSrc f, CTIHelper_2 t, unsigned i)
: from(f)
, to(reinterpret_cast<void*>(t))
- , opcodeIndex(i)
+ , bytecodeIndex(i)
{
}
CallRecord(X86Assembler::JmpSrc f, unsigned i)
: from(f)
, to(0)
- , opcodeIndex(i)
+ , bytecodeIndex(i)
{
}
};
@@ -220,20 +220,20 @@
StringJumpTable* stringJumpTable;
} jumpTable;
- unsigned opcodeIndex;
+ unsigned bytecodeIndex;
unsigned defaultOffset;
- SwitchRecord(SimpleJumpTable* jumpTable, unsigned opcodeIndex, unsigned defaultOffset, Type type)
+ SwitchRecord(SimpleJumpTable* jumpTable, unsigned bytecodeIndex, unsigned defaultOffset, Type type)
: type(type)
- , opcodeIndex(opcodeIndex)
+ , bytecodeIndex(bytecodeIndex)
, defaultOffset(defaultOffset)
{
this->jumpTable.simpleJumpTable = jumpTable;
}
- SwitchRecord(StringJumpTable* jumpTable, unsigned opcodeIndex, unsigned defaultOffset)
+ SwitchRecord(StringJumpTable* jumpTable, unsigned bytecodeIndex, unsigned defaultOffset)
: type(String)
- , opcodeIndex(opcodeIndex)
+ , bytecodeIndex(bytecodeIndex)
, defaultOffset(defaultOffset)
{
this->jumpTable.stringJumpTable = jumpTable;
@@ -275,7 +275,7 @@
static const int repatchOffsetGetByIdStructureID = 7;
static const int repatchOffsetGetByIdBranchToSlowCase = 13;
static const int repatchOffsetGetByIdPropertyMapOffset = 22;
-#if ENABLE(OPCODE_SAMPLING)
+#if ENABLE(BYTECODE_SAMPLING)
static const int repatchOffsetGetByIdSlowCaseCall = 27 + 4 + ctiArgumentInitSize;
#else
static const int repatchOffsetGetByIdSlowCaseCall = 17 + 4 + ctiArgumentInitSize;
@@ -363,7 +363,7 @@
void privateCompileCTIMachineTrampolines();
void privateCompilePatchGetArrayLength(void* returnAddress);
- void compileOpCall(OpcodeID, Instruction* instruction, unsigned i, unsigned callLinkInfoIndex);
+ void compileOpCall(BytecodeID, Instruction* instruction, unsigned i, unsigned callLinkInfoIndex);
void compileOpCallInitializeCallFrame();
void compileOpCallSetupArgs(Instruction*);
void compileOpCallEvalSetupArgs(Instruction*);
@@ -371,8 +371,8 @@
enum CompileOpStrictEqType { OpStrictEq, OpNStrictEq };
void compileOpStrictEq(Instruction* instruction, unsigned i, CompileOpStrictEqType type);
void putDoubleResultToJSNumberCellOrJSImmediate(X86::XMMRegisterID xmmSource, X86::RegisterID jsNumberCell, unsigned dst, X86Assembler::JmpSrc* wroteJSNumberCell, X86::XMMRegisterID tempXmm, X86::RegisterID tempReg1, X86::RegisterID tempReg2);
- void compileBinaryArithOp(OpcodeID, unsigned dst, unsigned src1, unsigned src2, OperandTypes opi, unsigned i);
- void compileBinaryArithOpSlowCase(Instruction*, OpcodeID, Vector<SlowCaseEntry>::iterator& iter, unsigned dst, unsigned src1, unsigned src2, OperandTypes opi, unsigned i);
+ void compileBinaryArithOp(BytecodeID, unsigned dst, unsigned src1, unsigned src2, OperandTypes opi, unsigned i);
+ void compileBinaryArithOpSlowCase(Instruction*, BytecodeID, Vector<SlowCaseEntry>::iterator& iter, unsigned dst, unsigned src1, unsigned src2, OperandTypes opi, unsigned i);
void emitGetVirtualRegister(int src, X86Assembler::RegisterID dst, unsigned i);
void emitGetVirtualRegisters(int src1, X86Assembler::RegisterID dst1, int src2, X86Assembler::RegisterID dst2, unsigned i);
@@ -396,18 +396,18 @@
unsigned getDeTaggedConstantImmediate(JSValue* imm);
bool linkSlowCaseIfNotJSCell(const Vector<SlowCaseEntry>::iterator&, int vReg);
- void emitJumpSlowCaseIfNotJSCell(X86Assembler::RegisterID, unsigned opcodeIndex);
- void emitJumpSlowCaseIfNotJSCell(X86Assembler::RegisterID, unsigned opcodeIndex, int VReg);
+ void emitJumpSlowCaseIfNotJSCell(X86Assembler::RegisterID, unsigned bytecodeIndex);
+ void emitJumpSlowCaseIfNotJSCell(X86Assembler::RegisterID, unsigned bytecodeIndex, int VReg);
- void emitJumpSlowCaseIfNotImmNum(X86Assembler::RegisterID, unsigned opcodeIndex);
- void emitJumpSlowCaseIfNotImmNums(X86Assembler::RegisterID, X86Assembler::RegisterID, unsigned opcodeIndex);
+ void emitJumpSlowCaseIfNotImmNum(X86Assembler::RegisterID, unsigned bytecodeIndex);
+ void emitJumpSlowCaseIfNotImmNums(X86Assembler::RegisterID, X86Assembler::RegisterID, unsigned bytecodeIndex);
void emitFastArithDeTagImmediate(X86Assembler::RegisterID);
X86Assembler::JmpSrc emitFastArithDeTagImmediateJumpIfZero(X86Assembler::RegisterID);
void emitFastArithReTagImmediate(X86Assembler::RegisterID);
void emitFastArithPotentiallyReTagImmediate(X86Assembler::RegisterID);
void emitFastArithImmToInt(X86Assembler::RegisterID);
- void emitFastArithIntToImmOrSlowCase(X86Assembler::RegisterID, unsigned opcodeIndex);
+ void emitFastArithIntToImmOrSlowCase(X86Assembler::RegisterID, unsigned bytecodeIndex);
void emitFastArithIntToImmNoCheck(X86Assembler::RegisterID);
X86Assembler::JmpSrc emitArithIntToImmWithJump(X86Assembler::RegisterID reg);
@@ -415,23 +415,23 @@
void emitAllocateNumber(JSGlobalData*, unsigned);
- X86Assembler::JmpSrc emitNakedCall(unsigned opcodeIndex, X86::RegisterID);
- X86Assembler::JmpSrc emitNakedCall(unsigned opcodeIndex, void* function);
- X86Assembler::JmpSrc emitNakedFastCall(unsigned opcodeIndex, void*);
- X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned opcodeIndex, CTIHelper_j);
- X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned opcodeIndex, CTIHelper_o);
- X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned opcodeIndex, CTIHelper_p);
- X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned opcodeIndex, CTIHelper_v);
- X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned opcodeIndex, CTIHelper_s);
- X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned opcodeIndex, CTIHelper_b);
- X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned opcodeIndex, CTIHelper_2);
+ X86Assembler::JmpSrc emitNakedCall(unsigned bytecodeIndex, X86::RegisterID);
+ X86Assembler::JmpSrc emitNakedCall(unsigned bytecodeIndex, void* function);
+ X86Assembler::JmpSrc emitNakedFastCall(unsigned bytecodeIndex, void*);
+ X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned bytecodeIndex, CTIHelper_j);
+ X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned bytecodeIndex, CTIHelper_o);
+ X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned bytecodeIndex, CTIHelper_p);
+ X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned bytecodeIndex, CTIHelper_v);
+ X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned bytecodeIndex, CTIHelper_s);
+ X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned bytecodeIndex, CTIHelper_b);
+ X86Assembler::JmpSrc emitCTICall(Instruction*, unsigned bytecodeIndex, CTIHelper_2);
void emitGetVariableObjectRegister(X86Assembler::RegisterID variableObject, int index, X86Assembler::RegisterID dst);
void emitPutVariableObjectRegister(X86Assembler::RegisterID src, X86Assembler::RegisterID variableObject, int index);
- void emitSlowScriptCheck(Instruction*, unsigned opcodeIndex);
+ void emitSlowScriptCheck(Instruction*, unsigned bytecodeIndex);
#ifndef NDEBUG
- void printOpcodeOperandTypes(unsigned src1, unsigned src2);
+ void printBytecodeOperandTypes(unsigned src1, unsigned src2);
#endif
void killLastResultRegister();
