Changeset 127554 in webkit

Timestamp:

Sep 4, 2012 10:12:26 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Allow the YarrJIT to use the assembler even when useJIT() is false.
Introduce the useYarrJIT() option.
​https://bugs.webkit.org/show_bug.cgi?id=95809.

Patch by Mark Lam <​mark.lam@apple.com> on 2012-09-04
Reviewed by Geoffrey Garen.

• runtime/JSGlobalData.cpp:

(JSC::enableAssembler):

• runtime/Options.cpp:

(JSC::Options::initialize):

• runtime/Options.h:

(JSC):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSGlobalData.cpp (modified) (1 diff)
• runtime/Options.cpp (modified) (1 diff)
• runtime/Options.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-09-04  Mark Lam  <mark.lam@apple.com>
+
+        Allow the YarrJIT to use the assembler even when useJIT() is false.
+        Introduce the useYarrJIT() option.
+        https://bugs.webkit.org/show_bug.cgi?id=95809.
+
+        Reviewed by Geoffrey Garen.
+
+        * runtime/JSGlobalData.cpp:
+        (JSC::enableAssembler):
+        * runtime/Options.cpp:
+        (JSC::Options::initialize):
+        * runtime/Options.h:
+        (JSC):
+
 2012-09-04  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -101 +101 @@
 static bool enableAssembler(ExecutableAllocator& executableAllocator)
 {
-    if (!executableAllocator.isValid() || !Options::useJIT())
+    if (!executableAllocator.isValid() || (!Options::useJIT() && !Options::useYarrJIT()))
         return false;
 

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -139 +139 @@
 #endif
     
-#if ENABLE(LLINT_C_LOOP)
+#if !ENABLE(JIT)
     useJIT() = false;
     useDFGJIT() = false;
+#endif
+#if !ENABLE(YARR_JIT)
+    useYarrJIT() = false;
 #endif
 

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -66 +66 @@
     v(bool, useJIT,    true) \
     v(bool, useDFGJIT, true) \
+    v(bool, useYarrJIT, true) \
     \
     /* showDisassembly implies showDFGDisassembly. */ \