Changeset 159276 in webkit for trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

Timestamp:

Nov 13, 2013, 11:39:30 PM (12 years ago)

Author:

[email protected]

Message:

Change callToJavaScript thunk into an offline assembled stub
​https://bugs.webkit.org/show_bug.cgi?id=124251

Reviewed by Geoffrey Garen.

Changed callToJavaScript and throwNotCaught into stubs generated by the offline assembler.
Added popCalleeSaves and pushCalleeSaves pseudo ops to the offline assembler to handle
the saving and restoring of callee save registers. Fixed callFrameRegister differences
between arm traditional (r11) and arm Thumb2 (r7) in GPRInfo.h. Also fixed implementation
of pop & push in arm.rb.

Since the offline assembler and therefore the LLInt don't work on Windows, the Windows stubs
are handled as inline assembly in JITStubsX86.h and JITStubsMSVC64.asm.

• dfg/DFGDriver.cpp:

(JSC::DFG::compileImpl):

• jit/GPRInfo.h:

(JSC::GPRInfo::toIndex):
(JSC::GPRInfo::debugName):

• jit/JITCode.cpp:

(JSC::JITCode::execute):

• jit/JITExceptions.cpp:

(JSC::genericUnwind):

• jit/JITStubs.h:
• jit/JITStubsMSVC64.asm:
• jit/JITStubsX86.h:
• jit/ThunkGenerators.cpp:
• jit/ThunkGenerators.h:
• llint/LLIntThunks.h:
• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• offlineasm/arm.rb:
• offlineasm/arm64.rb:
• offlineasm/instructions.rb:
• offlineasm/mips.rb:
• offlineasm/registers.rb:
• offlineasm/sh4.rb:
• offlineasm/x86.rb:
• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

File:

• trunk/Source/JavaScriptCore/jit/JITExceptions.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -31 +31 @@
 #include "CodeBlock.h"
 #include "Interpreter.h"
+#include "JITStubs.h"
 #include "JSCJSValue.h"
+#include "LLIntThunks.h"
 #include "VM.h"
 #include "Operations.h"
@@ -50 +52 @@
         catchRoutine = ExecutableBase::catchRoutineFor(handler, catchPCForInterpreter);
     } else
-        catchRoutine = vm->getCTIStub(throwNotCaught).code().executableAddress();
+        catchRoutine = FunctionPtr(LLInt::getCodePtr(returnFromJavaScript)).value();
     
     vm->callFrameForThrow = callFrame;