Changeset 160497 in webkit


Ignore:
Timestamp:
Dec 12, 2013, 11:21:09 AM (11 years ago)
Author:
mark.lam@apple.com
Message:

Rename returnFromJavaScript to handleUncaughtException.
​https://bugs.webkit.org/show_bug.cgi?id=125613.

Reviewed by Filip Pizlo.

Also did a few minor fixes to get the C Loop LLINT offline asm stage
to build properly, and also some trivial changes to minimize the
compile errors for LowLevelInterpreter.cpp. It doesn't build completely
and run yet since we'll need to update it for CStack changes that have
not been implemented for the C Loop LLINT yet.

  • interpreter/Interpreter.cpp:

(JSC::unwindCallFrame):

  • jit/JITExceptions.cpp:

(JSC::genericUnwind):

  • jit/JITStubs.h:
  • jit/JITStubsMSVC64.asm:
  • jit/JITStubsX86.h:
  • llint/LLIntOpcode.h:
  • llint/LLIntThunks.h:
  • llint/LowLevelInterpreter.cpp:

(JSC::CLoop::execute):

  • llint/LowLevelInterpreter32_64.asm:
  • llint/LowLevelInterpreter64.asm:
  • offlineasm/cloop.rb:
Location:
branches/jsCStack/Source/JavaScriptCore
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/jsCStack/Source/JavaScriptCore/ChangeLog

    r160477 r160497  
     12013-12-12  Mark Lam  <mark.lam@apple.com>
     2
     3        Rename returnFromJavaScript to handleUncaughtException.
     4        https://bugs.webkit.org/show_bug.cgi?id=125613.
     5
     6        Reviewed by Filip Pizlo.
     7
     8        Also did a few minor fixes to get the C Loop LLINT offline asm stage
     9        to build properly, and also some trivial changes to minimize the
     10        compile errors for LowLevelInterpreter.cpp. It doesn't build completely
     11        and run yet since we'll need to update it for CStack changes that have
     12        not been implemented for the C Loop LLINT yet.
     13
     14        * interpreter/Interpreter.cpp:
     15        (JSC::unwindCallFrame):
     16        * jit/JITExceptions.cpp:
     17        (JSC::genericUnwind):
     18        * jit/JITStubs.h:
     19        * jit/JITStubsMSVC64.asm:
     20        * jit/JITStubsX86.h:
     21        * llint/LLIntOpcode.h:
     22        * llint/LLIntThunks.h:
     23        * llint/LowLevelInterpreter.cpp:
     24        (JSC::CLoop::execute):
     25        * llint/LowLevelInterpreter32_64.asm:
     26        * llint/LowLevelInterpreter64.asm:
     27        * offlineasm/cloop.rb:
     28
    1292013-12-11  Michael Saboff  <msaboff@apple.com>
    230

  • branches/jsCStack/Source/JavaScriptCore/interpreter/Interpreter.cpp

    r160267 r160497  
    460460            callFrame->vm().topCallFrame = callerFrame->vmEntrySentinelCallerFrame();
    461461        else
    462             callFrame->vm().topCallFrame = callFrame; // _returnFromJavaScript will pop the frame off.
     462            callFrame->vm().topCallFrame = callFrame; // _handleUncaughtException will pop the frame off.
    463463        return false;
    464464    }

  • branches/jsCStack/Source/JavaScriptCore/jit/JITExceptions.cpp

    r160186 r160497  
    5757#endif
    5858    } else
    59         catchRoutine = LLInt::getCodePtr(returnFromJavaScript);
     59        catchRoutine = LLInt::getCodePtr(handleUncaughtException);
    6060   
    6161    vm->callFrameForThrow = callFrame;

  • branches/jsCStack/Source/JavaScriptCore/jit/JITStubs.h

    r160094 r160497  
    4444extern "C" {
    4545    EncodedJSValue callToJavaScript(void*, ExecState**, ProtoCallFrame*, Register*);
    46     void returnFromJavaScript();
     46    void handleUncaughtException();
    4747    EncodedJSValue callToNativeFunction(void*, ExecState**, ProtoCallFrame*, Register*);
    4848}

  • branches/jsCStack/Source/JavaScriptCore/jit/JITStubsMSVC64.asm

    r160094 r160497  
    2727
    2828PUBLIC callToJavaScript
    29 PUBLIC returnFromJavaScript
     29PUBLIC handleUncaughtException
    3030PUBLIC getHostCallReturnValue
    3131
    … …  
    236236callToNativeFunction ENDP
    237237
    238 returnFromJavaScript PROC
     238handleUncaughtException PROC
    239239    add rsp, 28h
    240240    pop rdi
    … …  
    247247    pop rbp
    248248    ret
    249 returnFromJavaScript ENDP
     249handleUncaughtException ENDP
    250250       
    251251getHostCallReturnValue PROC

  • branches/jsCStack/Source/JavaScriptCore/jit/JITStubsX86.h

    r160094 r160497  
    307307    }
    308308
    309     __declspec(naked) void returnFromJavaScript()
     309    __declspec(naked) void handleUncaughtException()
    310310    {
    311311        __asm {

  • branches/jsCStack/Source/JavaScriptCore/llint/LLIntOpcode.h

    r160186 r160497  
    3535#define FOR_EACH_LLINT_NOJIT_NATIVE_HELPER(macro) \
    3636    macro(getHostCallReturnValue, 1) \
    37     macro(returnFromJavaScript, 1)
     37    macro(handleUncaughtException, 1)
    3838
    3939#else // !ENABLE(LLINT_C_LOOP)

  • branches/jsCStack/Source/JavaScriptCore/llint/LLIntThunks.h

    r160186 r160497  
    4444    EncodedJSValue callToNativeFunction(void*, ExecState**, ProtoCallFrame*, Register*);
    4545#if ENABLE(JIT)
    46     void returnFromJavaScript();
     46    void handleUncaughtException();
    4747#endif
    4848}

  • branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp

    r160186 r160497  
    309309    // 3. 64 bit result values will be in t0.
    310310
    311     CLoopRegister t0, t1, t2, t3;
     311    CLoopRegister t0, t1, t2, t3, t5, sp;
    312312#if USE(JSVALUE64)
    313313    CLoopRegister rBasePC, tagTypeNumber, tagMask;
    … …  
    432432        }
    433433
    434         OFFLINE_ASM_GLUE_LABEL(returnFromJavaScript)
     434        OFFLINE_ASM_GLUE_LABEL(handleUncaughtException)
    435435        {
    436436            return vm->exception();

  • branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

    r160253 r160497  
    344344end
    345345
    346 macro doReturnFromJavaScript(extraStackSpace)
    347 _returnFromJavaScript:
     346macro doHandleUncaughtException(extraStackSpace)
     347_handleUncaughtException:
    348348    functionEpilogue(extraStackSpace)
    349349    ret

  • branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

    r160468 r160497  
    291291
    292292
    293 _returnFromJavaScript:
     293_handleUncaughtException:
    294294    subp 16, sp
    295295

  • branches/jsCStack/Source/JavaScriptCore/offlineasm/cloop.rb

    r160091 r160497  
    9595        when "t4"
    9696            "rPC"
     97        when "t5"
     98            "t5"
    9799        when "t6"
    98100            "rBasePC"
    … …  
    10981100           
    10991101        when "memfence"
     1102        when "pop"
     1103            $asm.putc "#error FIXME: Need implementation for pop"
    11001104        when "pushCalleeSaves"
    11011105        when "popCalleeSaves"
Note: See TracChangeset for help on using the changeset viewer.