JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / llint / LLIntExceptions.cpp

diff --git a/llint/LLIntExceptions.cpp b/llint/LLIntExceptions.cpp
index d88c16e7ea05a3e5dc69c3820157eaf46a109874..039936e73fea648871c984ca4f43bb76adcc6b5f 100644 (file)
--- a/llint/LLIntExceptions.cpp
+++ b/llint/LLIntExceptions.cpp
@@ -25,74 +25,39 @@
 
 #include "config.h"
 #include "LLIntExceptions.h"
 
 #include "config.h"
 #include "LLIntExceptions.h"

-
-#if ENABLE(LLINT)
-

 #include "CallFrame.h"
 #include "CodeBlock.h"
 #include "Instruction.h"
 #include "CallFrame.h"
 #include "CodeBlock.h"
 #include "Instruction.h"

-#include "JITExceptions.h"

 #include "LLIntCommon.h"
 #include "LowLevelInterpreter.h"
 #include "LLIntCommon.h"
 #include "LowLevelInterpreter.h"

-#include "Operations.h"
+#include "JSCInlines.h"

 
 namespace JSC { namespace LLInt {
 
 
 namespace JSC { namespace LLInt {
 

-static void fixupPCforExceptionIfNeeded(ExecState* exec)
-{
-    CodeBlock* codeBlock = exec->codeBlock();
-    ASSERT(!!codeBlock);
-    Instruction* pc = exec->currentVPC();
-    exec->setCurrentVPC(codeBlock->adjustPCIfAtCallSite(pc));
-}
-
-void interpreterThrowInCaller(ExecState* exec, ReturnAddressPtr pc)
-{
-    VM* vm = &exec->vm();
-    NativeCallFrameTracer tracer(vm, exec);
-#if LLINT_SLOW_PATH_TRACING
-    dataLog("Throwing exception ", vm->exception, ".\n");
-#endif
-    fixupPCforExceptionIfNeeded(exec);
-    genericThrow(
-        vm, exec, vm->exception,
-        exec->codeBlock()->bytecodeOffset(exec, pc));
-}
-

 Instruction* returnToThrowForThrownException(ExecState* exec)
 {
     UNUSED_PARAM(exec);
     return LLInt::exceptionInstructions();
 }
 
 Instruction* returnToThrowForThrownException(ExecState* exec)
 {
     UNUSED_PARAM(exec);
     return LLInt::exceptionInstructions();
 }
 

-static void doThrow(ExecState* exec, Instruction* pc)
-{
-    VM* vm = &exec->vm();
-    NativeCallFrameTracer tracer(vm, exec);
-    fixupPCforExceptionIfNeeded(exec);
-    genericThrow(vm, exec, vm->exception, pc - exec->codeBlock()->instructions().begin());
-}
-
-Instruction* returnToThrow(ExecState* exec, Instruction* pc)
+Instruction* returnToThrow(ExecState* exec)

 {
 {

+    UNUSED_PARAM(exec);

 #if LLINT_SLOW_PATH_TRACING
     VM* vm = &exec->vm();
 #if LLINT_SLOW_PATH_TRACING
     VM* vm = &exec->vm();

-    dataLog("Throwing exception ", vm->exception, " (returnToThrow).\n");
+    dataLog("Throwing exception ", vm->exception(), " (returnToThrow).\n");

 #endif
 #endif

-    doThrow(exec, pc);

     return LLInt::exceptionInstructions();
 }
 
     return LLInt::exceptionInstructions();
 }
 

-void* callToThrow(ExecState* exec, Instruction* pc)
+void* callToThrow(ExecState* exec)

 {
 {

+    UNUSED_PARAM(exec);

 #if LLINT_SLOW_PATH_TRACING
     VM* vm = &exec->vm();
 #if LLINT_SLOW_PATH_TRACING
     VM* vm = &exec->vm();

-    dataLog("Throwing exception ", vm->exception, " (callToThrow).\n");
+    dataLog("Throwing exception ", vm->exception(), " (callToThrow).\n");

 #endif
 #endif

-    doThrow(exec, pc);

     return LLInt::getCodePtr(llint_throw_during_call_trampoline);
 }
 
 } } // namespace JSC::LLInt
     return LLInt::getCodePtr(llint_throw_during_call_trampoline);
 }
 
 } } // namespace JSC::LLInt

-
-#endif // ENABLE(LLINT)