Changeset 39070 in webkit for trunk/JavaScriptCore/runtime


Ignore:
Timestamp:
Dec 6, 2008, 2:01:05 PM (16 years ago)
Author:
[email protected]
Message:

2008-12-05 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=22715
Encapsulate more CodeBlock members in preparation
of moving some of them to a rare data structure.

  • bytecode/CodeBlock.cpp: (JSC::locationForOffset): (JSC::printConditionalJump): (JSC::printGetByIdOp): (JSC::printPutByIdOp): (JSC::CodeBlock::printStructure): (JSC::CodeBlock::printStructures): (JSC::CodeBlock::dump): (JSC::CodeBlock::~CodeBlock): (JSC::CodeBlock::unlinkCallers): (JSC::CodeBlock::derefStructures): (JSC::CodeBlock::refStructures): (JSC::CodeBlock::mark): (JSC::CodeBlock::getHandlerForVPC): (JSC::CodeBlock::nativeExceptionCodeForHandlerVPC): (JSC::CodeBlock::lineNumberForVPC): (JSC::CodeBlock::expressionRangeForVPC): (JSC::CodeBlock::shrinkToFit):
  • bytecode/CodeBlock.h: (JSC::CodeBlock::CodeBlock): (JSC::CodeBlock::addCaller): (JSC::CodeBlock::removeCaller): (JSC::CodeBlock::isKnownNotImmediate): (JSC::CodeBlock::isConstantRegisterIndex): (JSC::CodeBlock::getConstant): (JSC::CodeBlock::isTemporaryRegisterIndex): (JSC::CodeBlock::getStubInfo): (JSC::CodeBlock::getCallLinkInfo): (JSC::CodeBlock::instructions): (JSC::CodeBlock::setJITCode): (JSC::CodeBlock::jitCode): (JSC::CodeBlock::ownerNode): (JSC::CodeBlock::setGlobalData): (JSC::CodeBlock::setThisRegister): (JSC::CodeBlock::thisRegister): (JSC::CodeBlock::setNeedsFullScopeChain): (JSC::CodeBlock::needsFullScopeChain): (JSC::CodeBlock::setUsesEval): (JSC::CodeBlock::usesEval): (JSC::CodeBlock::setUsesArguments): (JSC::CodeBlock::usesArguments): (JSC::CodeBlock::codeType): (JSC::CodeBlock::source): (JSC::CodeBlock::sourceOffset): (JSC::CodeBlock::addGlobalResolveInstruction): (JSC::CodeBlock::numberOfPropertyAccessInstructions): (JSC::CodeBlock::addPropertyAccessInstruction): (JSC::CodeBlock::propertyAccessInstruction): (JSC::CodeBlock::numberOfCallLinkInfos): (JSC::CodeBlock::addCallLinkInfo): (JSC::CodeBlock::callLinkInfo): (JSC::CodeBlock::numberOfJumpTargets): (JSC::CodeBlock::addJumpTarget): (JSC::CodeBlock::jumpTarget): (JSC::CodeBlock::lastJumpTarget): (JSC::CodeBlock::numberOfExceptionHandlers): (JSC::CodeBlock::addExceptionHandler): (JSC::CodeBlock::exceptionHandler): (JSC::CodeBlock::addExpressionInfo): (JSC::CodeBlock::numberOfLineInfos): (JSC::CodeBlock::addLineInfo): (JSC::CodeBlock::lastLineInfo): (JSC::CodeBlock::jitReturnAddressVPCMap): (JSC::CodeBlock::numberOfIdentifiers): (JSC::CodeBlock::addIdentifier): (JSC::CodeBlock::identifier): (JSC::CodeBlock::numberOfConstantRegisters): (JSC::CodeBlock::addConstantRegister): (JSC::CodeBlock::constantRegister): (JSC::CodeBlock::addFunction): (JSC::CodeBlock::function): (JSC::CodeBlock::addFunctionExpression): (JSC::CodeBlock::functionExpression): (JSC::CodeBlock::addUnexpectedConstant): (JSC::CodeBlock::unexpectedConstant): (JSC::CodeBlock::addRegExp): (JSC::CodeBlock::regexp): (JSC::CodeBlock::symbolTable): (JSC::CodeBlock::evalCodeCache): New inline setters/getters.

(JSC::ProgramCodeBlock::ProgramCodeBlock):
(JSC::ProgramCodeBlock::~ProgramCodeBlock):
(JSC::ProgramCodeBlock::clearGlobalObject):

  • bytecode/SamplingTool.cpp: (JSC::ScopeSampleRecord::sample): (JSC::SamplingTool::dump):
  • bytecompiler/BytecodeGenerator.cpp:
  • bytecompiler/BytecodeGenerator.h:
  • bytecompiler/Label.h:
  • interpreter/CallFrame.cpp:
  • interpreter/Interpreter.cpp:
  • jit/JIT.cpp:
  • jit/JITCall.cpp:
  • jit/JITInlineMethods.h:
  • jit/JITPropertyAccess.cpp:
  • parser/Nodes.cpp:
  • runtime/Arguments.h:
  • runtime/ExceptionHelpers.cpp:
  • runtime/JSActivation.cpp:
  • runtime/JSActivation.h:
  • runtime/JSGlobalObject.cpp: Change direct access to use new getter/setters.
Location:
trunk/JavaScriptCore/runtime
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/runtime/Arguments.h

    r38825 r39070  
    108108   
    109109        CodeBlock* codeBlock = &function->body()->generatedBytecode();
    110         int numParameters = codeBlock->numParameters;
     110        int numParameters = codeBlock->m_numParameters;
    111111        argc = callFrame->argumentCount();
    112112
    … …  
    207207        ASSERT(!d()->registerArray);
    208208
    209         size_t numParametersMinusThis = d()->functionBody->generatedBytecode().numParameters - 1;
    210         size_t numVars = d()->functionBody->generatedBytecode().numVars;
     209        size_t numParametersMinusThis = d()->functionBody->generatedBytecode().m_numParameters - 1;
     210        size_t numVars = d()->functionBody->generatedBytecode().m_numVars;
    211211        size_t numLocals = numVars + numParametersMinusThis;
    212212

  • trunk/JavaScriptCore/runtime/ExceptionHelpers.cpp

    r38528 r39070  
    9696    UString message = "Can't find variable: ";
    9797    message.append(ident.ustring());
    98     JSObject* exception = Error::create(exec, ReferenceError, message, line, codeBlock->ownerNode->sourceID(), codeBlock->ownerNode->sourceURL());
     98    JSObject* exception = Error::create(exec, ReferenceError, message, line, codeBlock->ownerNode()->sourceID(), codeBlock->ownerNode()->sourceURL());
    9999    exception->putWithAttributes(exec, Identifier(exec, expressionBeginOffsetPropertyName), jsNumber(exec, divotPoint - startOffset), ReadOnly | DontDelete);
    100100    exception->putWithAttributes(exec, Identifier(exec, expressionCaretOffsetPropertyName), jsNumber(exec, divotPoint), ReadOnly | DontDelete);
    … …  
    107107static UString createErrorMessage(ExecState* exec, CodeBlock* codeBlock, int, int expressionStart, int expressionStop, JSValue* value, UString error)
    108108{
    109     if (!expressionStop || expressionStart > codeBlock->source->length()) {
     109    if (!expressionStop || expressionStart > codeBlock->source()->length()) {
    110110        UString errorText = value->toString(exec);
    111111        errorText.append(" is ");
    … …  
    118118    if (expressionStart < expressionStop) {
    119119        errorText.append('\'');
    120         errorText.append(codeBlock->source->getRange(expressionStart, expressionStop));
     120        errorText.append(codeBlock->source()->getRange(expressionStart, expressionStop));
    121121        errorText.append("' [");
    122122        errorText.append(value->toString(exec));
    … …  
    124124    } else {
    125125        // No range information, so give a few characters of context
    126         const UChar* data = codeBlock->source->data();
    127         int dataLength = codeBlock->source->length();
     126        const UChar* data = codeBlock->source()->data();
     127        int dataLength = codeBlock->source()->length();
    128128        int start = expressionStart;
    129129        int stop = expressionStart;
    … …  
    139139            stop--;
    140140        errorText.append("near '...");
    141         errorText.append(codeBlock->source->getRange(start, stop));
     141        errorText.append(codeBlock->source()->getRange(start, stop));
    142142        errorText.append("...' [");
    143143        errorText.append(value->toString(exec));
    … …  
    160160    int line = codeBlock->expressionRangeForVPC(vPC, divotPoint, startOffset, endOffset);
    161161    UString errorMessage = createErrorMessage(exec, codeBlock, line, divotPoint, divotPoint + endOffset, value, message);
    162     JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode->sourceID(), codeBlock->ownerNode->sourceURL());
     162    JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode()->sourceID(), codeBlock->ownerNode()->sourceURL());
    163163    exception->putWithAttributes(exec, Identifier(exec, expressionBeginOffsetPropertyName), jsNumber(exec, divotPoint - startOffset), ReadOnly | DontDelete);
    164164    exception->putWithAttributes(exec, Identifier(exec, expressionCaretOffsetPropertyName), jsNumber(exec, divotPoint), ReadOnly | DontDelete);
    … …  
    176176    // We're in a "new" expression, so we need to skip over the "new.." part
    177177    int startPoint = divotPoint - (startOffset ? startOffset - 4 : 0); // -4 for "new "
    178     const UChar* data = codeBlock->source->data();
     178    const UChar* data = codeBlock->source()->data();
    179179    while (startPoint < divotPoint && isStrWhiteSpace(data[startPoint]))
    180180        startPoint++;
    181181   
    182182    UString errorMessage = createErrorMessage(exec, codeBlock, line, startPoint, divotPoint, value, "not a constructor");
    183     JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode->sourceID(), codeBlock->ownerNode->sourceURL());
     183    JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode()->sourceID(), codeBlock->ownerNode()->sourceURL());
    184184    exception->putWithAttributes(exec, Identifier(exec, expressionBeginOffsetPropertyName), jsNumber(exec, divotPoint - startOffset), ReadOnly | DontDelete);
    185185    exception->putWithAttributes(exec, Identifier(exec, expressionCaretOffsetPropertyName), jsNumber(exec, divotPoint), ReadOnly | DontDelete);
    … …  
    195195    int line = codeBlock->expressionRangeForVPC(vPC, divotPoint, startOffset, endOffset);
    196196    UString errorMessage = createErrorMessage(exec, codeBlock, line, divotPoint - startOffset, divotPoint, value, "not a function");
    197     JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode->sourceID(), codeBlock->ownerNode->sourceURL());   
     197    JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode()->sourceID(), codeBlock->ownerNode()->sourceURL());   
    198198    exception->putWithAttributes(exec, Identifier(exec, expressionBeginOffsetPropertyName), jsNumber(exec, divotPoint - startOffset), ReadOnly | DontDelete);
    199199    exception->putWithAttributes(exec, Identifier(exec, expressionCaretOffsetPropertyName), jsNumber(exec, divotPoint), ReadOnly | DontDelete);
    … …  
    219219    int line = codeBlock->expressionRangeForVPC(vPC, divotPoint, startOffset, endOffset);
    220220    UString errorMessage = createErrorMessage(exec, codeBlock, line, divotPoint - startOffset, divotPoint, error->isNull() ? jsNull() : jsUndefined(), "not an object");
    221     JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode->sourceID(), codeBlock->ownerNode->sourceURL());
     221    JSObject* exception = Error::create(exec, TypeError, errorMessage, line, codeBlock->ownerNode()->sourceID(), codeBlock->ownerNode()->sourceURL());
    222222    exception->putWithAttributes(exec, Identifier(exec, expressionBeginOffsetPropertyName), jsNumber(exec, divotPoint - startOffset), ReadOnly | DontDelete);
    223223    exception->putWithAttributes(exec, Identifier(exec, expressionCaretOffsetPropertyName), jsNumber(exec, divotPoint), ReadOnly | DontDelete);

  • trunk/JavaScriptCore/runtime/JSActivation.cpp

    r38511 r39070  
    5858        return;
    5959
    60     size_t numParametersMinusThis = d()->functionBody->generatedBytecode().numParameters - 1;
     60    size_t numParametersMinusThis = d()->functionBody->generatedBytecode().m_numParameters - 1;
    6161
    6262    size_t i = 0;
    … …  
    6868    }
    6969
    70     size_t numVars = d()->functionBody->generatedBytecode().numVars;
     70    size_t numVars = d()->functionBody->generatedBytecode().m_numVars;
    7171
    7272    // Skip the call frame, which sits between the parameters and vars.

  • trunk/JavaScriptCore/runtime/JSActivation.h

    r38440 r39070  
    7070        struct JSActivationData : public JSVariableObjectData {
    7171            JSActivationData(PassRefPtr<FunctionBodyNode> functionBody, Register* registers)
    72                 : JSVariableObjectData(&functionBody->generatedBytecode().symbolTable, registers)
     72                : JSVariableObjectData(&functionBody->generatedBytecode().symbolTable(), registers)
    7373                , functionBody(functionBody)
    7474            {

  • trunk/JavaScriptCore/runtime/JSGlobalObject.cpp

    r38511 r39070  
    113113    HashSet<ProgramCodeBlock*>::const_iterator end = codeBlocks().end();
    114114    for (HashSet<ProgramCodeBlock*>::const_iterator it = codeBlocks().begin(); it != end; ++it)
    115         (*it)->globalObject = 0;
     115        (*it)->clearGlobalObject();
    116116       
    117117    RegisterFile& registerFile = globalData()->interpreter->registerFile();
Note: See TracChangeset for help on using the changeset viewer.