Ignore:
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:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/VM/CodeBlock.cpp

    r38423 r38425  
    4040namespace JSC {
    4141
    42 #if !defined(NDEBUG) || ENABLE(OPCODE_SAMPLING)
     42#if !defined(NDEBUG) || ENABLE(BYTECODE_SAMPLING)
    4343
    4444static UString escapeQuotes(const UString& str)
    … …  
    185185    unsigned instructionOffset = vPC - instructions.begin();
    186186
    187     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id)) {
     187    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id)) {
    188188        printStructureID("get_by_id", vPC, 4);
    189189        return;
    190190    }
    191     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_self)) {
     191    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_self)) {
    192192        printStructureID("get_by_id_self", vPC, 4);
    193193        return;
    194194    }
    195     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_proto)) {
     195    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_proto)) {
    196196        printf("  [%4d] %s: %s, %s\n", instructionOffset, "get_by_id_proto", pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureID).UTF8String().c_str());
    197197        return;
    198198    }
    199     if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_transition)) {
     199    if (vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id_transition)) {
    200200        printf("  [%4d] %s: %s, %s, %s\n", instructionOffset, "put_by_id_new", pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[6].u.structureIDChain).UTF8String().c_str());
    201201        return;
    202202    }
    203     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_chain)) {
     203    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_chain)) {
    204204        printf("  [%4d] %s: %s, %s\n", instructionOffset, "get_by_id_chain", pointerToSourceString(vPC[4].u.structureID).UTF8String().c_str(), pointerToSourceString(vPC[5].u.structureIDChain).UTF8String().c_str());
    205205        return;
    206206    }
    207     if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id)) {
     207    if (vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id)) {
    208208        printStructureID("put_by_id", vPC, 4);
    209209        return;
    210210    }
    211     if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_replace)) {
     211    if (vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id_replace)) {
    212212        printStructureID("put_by_id_replace", vPC, 4);
    213213        return;
    214214    }
    215     if (vPC[0].u.opcode == interpreter->getOpcode(op_resolve_global)) {
     215    if (vPC[0].u.bytecode == interpreter->getBytecode(op_resolve_global)) {
    216216        printStructureID("resolve_global", vPC, 4);
    217217        return;
    … …  
    219219
    220220    // These instructions doesn't ref StructureIDs.
    221     ASSERT(vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_generic) || vPC[0].u.opcode == interpreter->getOpcode(op_call) || vPC[0].u.opcode == interpreter->getOpcode(op_call_eval) || vPC[0].u.opcode == interpreter->getOpcode(op_construct));
     221    ASSERT(vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_generic) || vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id_generic) || vPC[0].u.bytecode == interpreter->getBytecode(op_call) || vPC[0].u.bytecode == interpreter->getBytecode(op_call_eval) || vPC[0].u.bytecode == interpreter->getBytecode(op_construct));
    222222}
    223223
    … …  
    229229    size_t instructionCount = 0;
    230230    for (Vector<Instruction>::const_iterator it = begin; it != end; ++it)
    231         if (exec->interpreter()->isOpcode(it->u.opcode))
     231        if (exec->interpreter()->isBytecode(it->u.bytecode))
    232232            ++instructionCount;
    233233
    … …  
    291291        size_t i = 0;
    292292        do {
    293              printStructureIDs(&instructions[propertyAccessInstructions[i].opcodeIndex]);
     293             printStructureIDs(&instructions[propertyAccessInstructions[i].bytecodeIndex]);
    294294             ++i;
    295295        } while (i < propertyAccessInstructions.size());
    … …  
    360360{
    361361    int location = it - begin;
    362     switch (exec->interpreter()->getOpcodeID(it->u.opcode)) {
     362    switch (exec->interpreter()->getBytecodeID(it->u.bytecode)) {
    363363        case op_enter: {
    364364            printf("[%4d] enter\n", location);
    … …  
    946946}
    947947
    948 #endif // !defined(NDEBUG) || ENABLE(OPCODE_SAMPLING)
     948#endif // !defined(NDEBUG) || ENABLE(BYTECODE_SAMPLING)
    949949
    950950CodeBlock::~CodeBlock()
    … …  
    955955
    956956    for (size_t size = propertyAccessInstructions.size(), i = 0; i < size; ++i) {
    957         derefStructureIDs(&instructions[propertyAccessInstructions[i].opcodeIndex]);
     957        derefStructureIDs(&instructions[propertyAccessInstructions[i].bytecodeIndex]);
    958958        if (propertyAccessInstructions[i].stubRoutine)
    959959            WTF::fastFreeExecutable(propertyAccessInstructions[i].stubRoutine);
    … …  
    991991    BytecodeInterpreter* interpreter = globalData->interpreter;
    992992
    993     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_self)) {
     993    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_self)) {
    994994        vPC[4].u.structureID->deref();
    995995        return;
    996996    }
    997     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_proto)) {
     997    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_proto)) {
    998998        vPC[4].u.structureID->deref();
    999999        vPC[5].u.structureID->deref();
    10001000        return;
    10011001    }
    1002     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_chain)) {
     1002    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_chain)) {
    10031003        vPC[4].u.structureID->deref();
    10041004        vPC[5].u.structureIDChain->deref();
    10051005        return;
    10061006    }
    1007     if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_transition)) {
     1007    if (vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id_transition)) {
    10081008        vPC[4].u.structureID->deref();
    10091009        vPC[5].u.structureID->deref();
    … …  
    10111011        return;
    10121012    }
    1013     if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_replace)) {
     1013    if (vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id_replace)) {
    10141014        vPC[4].u.structureID->deref();
    10151015        return;
    10161016    }
    1017     if (vPC[0].u.opcode == interpreter->getOpcode(op_resolve_global)) {
     1017    if (vPC[0].u.bytecode == interpreter->getBytecode(op_resolve_global)) {
    10181018        if(vPC[4].u.structureID)
    10191019            vPC[4].u.structureID->deref();
    … …  
    10221022   
    10231023    // These instructions don't ref their StructureIDs.
    1024     ASSERT(vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id) || vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id) || vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_generic) || vPC[0].u.opcode == interpreter->getOpcode(op_get_array_length) || vPC[0].u.opcode == interpreter->getOpcode(op_get_string_length));
     1024    ASSERT(vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id) || vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id) || vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_generic) || vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id_generic) || vPC[0].u.bytecode == interpreter->getBytecode(op_get_array_length) || vPC[0].u.bytecode == interpreter->getBytecode(op_get_string_length));
    10251025}
    10261026
    … …  
    10291029    BytecodeInterpreter* interpreter = globalData->interpreter;
    10301030
    1031     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_self)) {
     1031    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_self)) {
    10321032        vPC[4].u.structureID->ref();
    10331033        return;
    10341034    }
    1035     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_proto)) {
     1035    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_proto)) {
    10361036        vPC[4].u.structureID->ref();
    10371037        vPC[5].u.structureID->ref();
    10381038        return;
    10391039    }
    1040     if (vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_chain)) {
     1040    if (vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_chain)) {
    10411041        vPC[4].u.structureID->ref();
    10421042        vPC[5].u.structureIDChain->ref();
    10431043        return;
    10441044    }
    1045     if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_transition)) {
     1045    if (vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id_transition)) {
    10461046        vPC[4].u.structureID->ref();
    10471047        vPC[5].u.structureID->ref();
    … …  
    10491049        return;
    10501050    }
    1051     if (vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_replace)) {
     1051    if (vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id_replace)) {
    10521052        vPC[4].u.structureID->ref();
    10531053        return;
    … …  
    10551055   
    10561056    // These instructions don't ref their StructureIDs.
    1057     ASSERT(vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id) || vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id) || vPC[0].u.opcode == interpreter->getOpcode(op_get_by_id_generic) || vPC[0].u.opcode == interpreter->getOpcode(op_put_by_id_generic));
     1057    ASSERT(vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id) || vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id) || vPC[0].u.bytecode == interpreter->getBytecode(op_get_by_id_generic) || vPC[0].u.bytecode == interpreter->getBytecode(op_put_by_id_generic));
    10581058}
    10591059
Note: See TracChangeset for help on using the changeset viewer.