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

Timestamp:

Nov 14, 2013, 4:12:51 PM (12 years ago)

Author:

[email protected]

Message:

Make CLoop easier to build, and make it work
​https://bugs.webkit.org/show_bug.cgi?id=124359

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Add --cloop to build-jsc, build-webkit and friends.

Also make CLoop build and work again - This meant adding a
couple of missing ENABLE(DFG_JIT) blocks, and fixing a few
other references.

• Configurations/FeatureDefines.xcconfig:
• bytecode/BytecodeLivenessAnalysis.cpp:

(JSC::computeUsesForBytecodeOffset):
(JSC::computeDefsForBytecodeOffset):

• bytecode/DFGExitProfile.cpp:
• dfg/DFGCapabilities.cpp:
• dfg/DFGCompilationKey.cpp:
• dfg/DFGCompilationMode.cpp:
• jit/JITExceptions.cpp:

(JSC::genericUnwind):

Source/WebCore:

Add cloop configuration info to WebCore FeatureDefines
so that it's consistent with JSC

• Configurations/FeatureDefines.xcconfig:

Source/WTF:

Make building with the CLoop forcibly enabled manually
disable the JITs

• wtf/Platform.h:

Tools:

Add --cloop support to forcibly enable to CLoop build

• Scripts/build-jsc:
• Scripts/build-webkit:

File:

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

trunk/Source/JavaScriptCore/jit/JITExceptions.cpp

@@ -33 +33 @@
 #include "JITStubs.h"
 #include "JSCJSValue.h"
+#include "LLIntData.h"
+#include "LLIntOpcode.h"
 #include "LLIntThunks.h"
+#include "Opcode.h"
+#include "Operations.h"
 #include "VM.h"
-#include "Operations.h"
 
 #if ENABLE(JIT) || ENABLE(LLINT)
@@ -51 +54 @@
         catchPCForInterpreter = &callFrame->codeBlock()->instructions()[handler->target];
         catchRoutine = ExecutableBase::catchRoutineFor(handler, catchPCForInterpreter);
-    } else
+    } else {
+#if ENABLE(LLINT_C_LOOP)
+        catchRoutine = LLInt::getCodePtr(ctiOpThrowNotCaught);
+#else
         catchRoutine = FunctionPtr(LLInt::getCodePtr(returnFromJavaScript)).value();
+#endif
+    }
     
     vm->callFrameForThrow = callFrame;