Ignore:
Timestamp:
Oct 4, 2008, 2:12:54 PM (17 years ago)
Author:
Darin Adler
Message:

JavaScriptCore:

2008-10-04 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

10% faster on Richards; other v8 benchmarks faster too.
A wash on SunSpider.

This does the minimum necessary to get the speedup. Next step in
cleaning this up is to replace ExecState with a CallFrame class,
and be more judicious about when to pass a call frame and when
to pass a global data pointer, global object pointer, or perhaps
something else entirely.

  • VM/CTI.cpp: Remove the debug-only check of the exception in ctiVMThrowTrampoline -- already checked in the code the trampoline jumps to, so not all that useful. Removed the exec argument from ctiTrampoline. Removed emitDebugExceptionCheck -- no longer needed. (JSC::CTI::emitCall): Removed code to set ExecState::m_callFrame. (JSC::CTI::privateCompileMainPass): Removed code in catch to extract the exception from ExecState::m_exception; instead, the code that jumps into catch will make sure the exception is already in eax.
  • VM/CTI.h: Removed exec from the ctiTrampoline. Also removed the non-helpful "volatile". Temporarily left ARG_exec in as a synonym for ARG_r; I'll change that on a future cleanup pass when introducing more use of the CallFrame type. (JSC::CTI::execute): Removed the ExecState* argument.
  • VM/ExceptionHelpers.cpp: (JSC::InterruptedExecutionError::InterruptedExecutionError): Take JSGlobalData* instead of ExecState*. (JSC::createInterruptedExecutionException): Ditto.
  • VM/ExceptionHelpers.h: Ditto. Also removed an unneeded include.
  • VM/Machine.cpp: (JSC::slideRegisterWindowForCall): Removed the exec and exceptionValue arguments. Changed to return 0 when there's a stack overflow rather than using a separate exception argument to cut down on memory accesses in the calling convention. (JSC::Machine::unwindCallFrame): Removed the exec argument when constructing a DebuggerCallFrame. Also removed code to set ExecState::m_callFrame. (JSC::Machine::throwException): Removed the exec argument when construction a DebuggerCallFrame. (JSC::Machine::execute): Updated to use the register instead of ExecState and also removed various uses of ExecState. (JSC::Machine::debug): (JSC::Machine::privateExecute): Put globalData into a local variable so it can be used throughout the interpreter. Changed the VM_CHECK_EXCEPTION to get the exception in globalData instead of through ExecState. (JSC::Machine::retrieveLastCaller): Turn exec into a registers pointer by calling registers() instead of by getting m_callFrame. (JSC::Machine::callFrame): Ditto. Tweaked exception macros. Made new versions for when you know you have an exception. Get at global exception with ARG_globalData. Got rid of the need to pass in the return value type. (JSC::Machine::cti_op_add): Update to use new version of exception macros. (JSC::Machine::cti_op_pre_inc): Ditto. (JSC::Machine::cti_timeout_check): Ditto. (JSC::Machine::cti_op_instanceof): Ditto. (JSC::Machine::cti_op_new_func): Ditto. (JSC::Machine::cti_op_call_JSFunction): Optimized by using the ARG values directly instead of through local variables -- this gets rid of code that just shuffles things around in the stack frame. Also get rid of ExecState and update for the new way exceptions are handled in slideRegisterWindowForCall. (JSC::Machine::cti_vm_compile): Update to make exec out of r since they are both the same thing now. (JSC::Machine::cti_op_call_NotJSFunction): Ditto. (JSC::Machine::cti_op_init_arguments): Ditto. (JSC::Machine::cti_op_resolve): Ditto. (JSC::Machine::cti_op_construct_JSConstruct): Ditto. (JSC::Machine::cti_op_construct_NotJSConstruct): Ditto. (JSC::Machine::cti_op_resolve_func): Ditto. (JSC::Machine::cti_op_put_by_val): Ditto. (JSC::Machine::cti_op_put_by_val_array): Ditto. (JSC::Machine::cti_op_resolve_skip): Ditto. (JSC::Machine::cti_op_resolve_global): Ditto. (JSC::Machine::cti_op_post_inc): Ditto. (JSC::Machine::cti_op_resolve_with_base): Ditto. (JSC::Machine::cti_op_post_dec): Ditto. (JSC::Machine::cti_op_call_eval): Ditto. (JSC::Machine::cti_op_throw): Ditto. Also rearranged to return the exception value as the return value so it can be used by op_catch. (JSC::Machine::cti_op_push_scope): Ditto. (JSC::Machine::cti_op_in): Ditto. (JSC::Machine::cti_op_del_by_val): Ditto. (JSC::Machine::cti_vm_throw): Ditto. Also rearranged to return the exception value as the return value so it can be used by op_catch.
  • kjs/DebuggerCallFrame.cpp: (JSC::DebuggerCallFrame::functionName): Pass globalData. (JSC::DebuggerCallFrame::evaluate): Eliminated code to make a new ExecState.
  • kjs/DebuggerCallFrame.h: Removed ExecState argument from constructor.
  • kjs/ExecState.h: Eliminated all data members and made ExecState inherit privately from Register instead. Also added a typedef to the future name for this class, which is CallFrame. It's just a Register* that knows it's a pointer at a call frame. The new class can't be constructed or copied. Changed all functions to use the this pointer instead of m_callFrame. Changed exception-related functions to access an exception in JSGlobalData. Removed functions used by CTI to pass the return address to the throw machinery -- this is now done directly with a global in the global data.
  • kjs/FunctionPrototype.cpp: (JSC::functionProtoFuncToString): Pass globalData instead of exec.
  • kjs/InternalFunction.cpp: (JSC::InternalFunction::name): Take globalData instead of exec.
  • kjs/InternalFunction.h: Ditto.
  • kjs/JSGlobalData.cpp: Initialize the new exception global to 0.
  • kjs/JSGlobalData.h: Declare two new globals. One for the current exception and another for the return address used by CTI to implement the throw operation.
  • kjs/JSGlobalObject.cpp: (JSC::JSGlobalObject::init): Removed code to set up globalExec, which is now the same thing as globalCallFrame. (JSC::JSGlobalObject::reset): Get globalExec from our globalExec function so we don't have to repeat the logic twice. (JSC::JSGlobalObject::mark): Removed code to mark the exception; the exception is now stored in JSGlobalData and marked there. (JSC::JSGlobalObject::globalExec): Return a pointer to the end of the global call frame.
  • kjs/JSGlobalObject.h: Removed the globalExec data member.
  • kjs/JSObject.cpp: (JSC::JSObject::putDirectFunction): Pass globalData instead of exec.
  • kjs/collector.cpp: (JSC::Heap::collect): Mark the global exception.
  • profiler/ProfileGenerator.cpp: (JSC::ProfileGenerator::addParentForConsoleStart): Pass globalData instead of exec to createCallIdentifier.
  • profiler/Profiler.cpp: (JSC::Profiler::willExecute): Pass globalData instead of exec to createCallIdentifier. (JSC::Profiler::didExecute): Ditto. (JSC::Profiler::createCallIdentifier): Take globalData instead of exec. (JSC::createCallIdentifierFromFunctionImp): Ditto.
  • profiler/Profiler.h: Change interface to take a JSGlobalData instead of an ExecState.

WebKit/mac:

2008-10-04 Darin Adler <Darin Adler>

Reviewed by Cameron Zwarich.

  • WebView/WebScriptDebugger.mm: (WebScriptDebugger::WebScriptDebugger): Remove 0 passed for ExecState.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/kjs/ExecState.h

    r37257 r37297  
    3030namespace JSC  {
    3131
     32    class ExecState;
    3233    class JSValue;
    3334    class Register;
    3435
     36    typedef ExecState CallFrame;
     37
    3538    // Represents the current state of script execution.
    3639    // Passed as the first argument to most functions.
    37     class ExecState : Noncopyable {
    38 #if ENABLE(CTI)
    39         friend class CTI;
    40 #endif
    41         friend class Machine;
    42         friend class DebuggerCallFrame;
     40    class ExecState : private Register, Noncopyable {
    4341    public:
    44         explicit ExecState(Register* callFrame)
    45             : m_exception(0)
    46             , m_callFrame(callFrame)
     42        static CallFrame* create(Register* callFrameBase) { return static_cast<CallFrame*>(callFrameBase); }
     43        Register* registers() { return this; }
     44
     45        // Global object in which execution began.
     46        JSGlobalObject* dynamicGlobalObject()
    4747        {
     48            return Machine::scopeChain(Machine::firstCallFrame(this))->globalObject();
    4849        }
    4950
    50         // Global object in which execution began.
    51         JSGlobalObject* dynamicGlobalObject() const
     51        // Global object in which the currently executing code was defined.
     52        // Differs from dynamicGlobalObject() during function calls across web browser frames.
     53        JSGlobalObject* lexicalGlobalObject()
    5254        {
    53             return Machine::scopeChain(Machine::firstCallFrame(m_callFrame))->globalObject();
     55            return Machine::scopeChain(this)->globalObject();
    5456        }
    5557
    56         // Global object in which the current script was defined. (Can differ
    57         // from dynamicGlobalObject() during function calls across frames.)
    58         JSGlobalObject* lexicalGlobalObject() const
     58        // Differs from lexicalGlobalObject because this will have DOM window shell rather than
     59        // the actual DOM window.
     60        JSObject* globalThisValue()
    5961        {
    60             return Machine::scopeChain(m_callFrame)->globalObject();
     62            return Machine::scopeChain(this)->globalThisObject();
    6163        }
    6264
    63         JSObject* globalThisValue() const
     65        JSGlobalData& globalData()
    6466        {
    65             return Machine::scopeChain(m_callFrame)->globalThisObject();
     67            return *Machine::scopeChain(this)->globalData;
    6668        }
    6769
    68         // Exception propogation.
    69         void setException(JSValue* exception) { m_exception = exception; }
    70         void clearException() { m_exception = 0; }
    71         JSValue* exception() const { return m_exception; }
    72         JSValue** exceptionSlot() { return &m_exception; }
    73         bool hadException() const { return !!m_exception; }
    74 #if ENABLE(CTI)
    75         void setCTIReturnAddress(void* ctiRA) { m_ctiReturnAddress = ctiRA; }
    76         void* ctiReturnAddress() const { return m_ctiReturnAddress; }
    77 #endif
     70        // Convenience functions for access to global data.
    7871
    79         JSGlobalData& globalData() const
    80         {
    81             return *Machine::scopeChain(m_callFrame)->globalData;
    82         }
     72        void setException(JSValue* exception) { globalData().exception = exception; }
     73        void clearException() { globalData().exception = 0; }
     74        JSValue* exception() { return globalData().exception; }
     75        JSValue** exceptionSlot() { return &globalData().exception; }
     76        bool hadException() { return !!globalData().exception; }
    8377
    8478        IdentifierTable* identifierTable() { return globalData().identifierTable; }
    85         const CommonIdentifiers& propertyNames() const { return *globalData().propertyNames; }
    86         const ArgList& emptyList() const { return *globalData().emptyList; }
     79        const CommonIdentifiers& propertyNames() { return *globalData().propertyNames; }
     80        const ArgList& emptyList() { return *globalData().emptyList; }
    8781        Lexer* lexer() { return globalData().lexer; }
    8882        Parser* parser() { return globalData().parser; }
    89         Machine* machine() const { return globalData().machine; }
    90         static const HashTable* arrayTable(ExecState* exec) { return exec->globalData().arrayTable; }
    91         static const HashTable* dateTable(ExecState* exec) { return exec->globalData().dateTable; }
    92         static const HashTable* mathTable(ExecState* exec) { return exec->globalData().mathTable; }
    93         static const HashTable* numberTable(ExecState* exec) { return exec->globalData().numberTable; }
    94         static const HashTable* regExpTable(ExecState* exec) { return exec->globalData().regExpTable; }
    95         static const HashTable* regExpConstructorTable(ExecState* exec) { return exec->globalData().regExpConstructorTable; }
    96         static const HashTable* stringTable(ExecState* exec) { return exec->globalData().stringTable; }
     83        Machine* machine() { return globalData().machine; }
     84        Heap* heap() { return &globalData().heap; }
    9785
    98         Heap* heap() const { return &globalData().heap; }
     86        static const HashTable* arrayTable(CallFrame* callFrame) { return callFrame->globalData().arrayTable; }
     87        static const HashTable* dateTable(CallFrame* callFrame) { return callFrame->globalData().dateTable; }
     88        static const HashTable* mathTable(CallFrame* callFrame) { return callFrame->globalData().mathTable; }
     89        static const HashTable* numberTable(CallFrame* callFrame) { return callFrame->globalData().numberTable; }
     90        static const HashTable* regExpTable(CallFrame* callFrame) { return callFrame->globalData().regExpTable; }
     91        static const HashTable* regExpConstructorTable(CallFrame* callFrame) { return callFrame->globalData().regExpConstructorTable; }
     92        static const HashTable* stringTable(CallFrame* callFrame) { return callFrame->globalData().stringTable; }
    9993
    10094    private:
    101         // Default constructor required for gcc 3.
    102         ExecState() { }
    103 
    104         bool isGlobalObject(JSObject*) const;
    105 
    106         JSValue* m_exception;
    107 #if ENABLE(CTI)
    108         void* m_ctiReturnAddress;
    109 #endif
    110         Register* m_callFrame; // The most recent call frame.
     95        ExecState();
     96        ~ExecState();
    11197    };
    11298
Note: See TracChangeset for help on using the changeset viewer.