Add flag to the engine to enable/disable RegExp JITting.

Change-Id: I4b632e6f8ab7cf20576f94764ed506de8be63efb
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri
index a75de9f..8265bba 100644 (file)
--- a/src/3rdparty/masm/masm-defs.pri
+++ b/src/3rdparty/masm/masm-defs.pri
@@ -1,3 +1,4 @@
+DEFINES += V4_ENABLE_JIT
 
 DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
 

diff --git a/src/qml/qml/v4/moth/qv4isel_moth_p.h b/src/qml/qml/v4/moth/qv4isel_moth_p.h
index 23ca930..58f8eec 100644 (file)
--- a/src/qml/qml/v4/moth/qv4isel_moth_p.h
+++ b/src/qml/qml/v4/moth/qv4isel_moth_p.h
@@ -3,6 +3,7 @@
 
 #include <private/qv4global_p.h>
 #include <private/qv4isel_p.h>
+#include <private/qv4isel_util_p.h>
 #include <private/qv4jsir_p.h>
 #include <private/qv4object_p.h>
 #include "qv4instr_moth_p.h"
@@ -154,6 +155,8 @@ public:
     virtual ~ISelFactory() {}
     virtual EvalInstructionSelection *create(QV4::ExecutionEngine *engine, V4IR::Module *module)
     { return new InstructionSelection(engine, module); }
+    virtual bool jitCompileRegexps() const
+    { return false; }
 };
 
 template<int InstrT>

diff --git a/src/qml/qml/v4/qv4engine.cpp b/src/qml/qml/v4/qv4engine.cpp
index f26e616..e702a06 100644 (file)
--- a/src/qml/qml/v4/qv4engine.cpp
+++ b/src/qml/qml/v4/qv4engine.cpp
@@ -58,10 +58,15 @@
 #include <qv4stringobject_p.h>
 #include <qv4identifier_p.h>
 #include <qv4unwindhelper_p.h>
-#include "qv4isel_masm_p.h"
 #include "qv4debugging_p.h"
 #include "qv4executableallocator_p.h"
 
+#ifdef V4_ENABLE_JIT
+#  include "qv4isel_masm_p.h"
+#else // !V4_ENABLE_JIT
+#  include "qv4isel_moth_p.h"
+#endif // V4_ENABLE_JIT
+
 using namespace QV4;
 
 ExecutionEngine::ExecutionEngine(QQmlJS::EvalISelFactory *factory)
@@ -76,8 +81,13 @@ ExecutionEngine::ExecutionEngine(QQmlJS::EvalISelFactory *factory)
 {
     MemoryManager::GCBlocker gcBlocker(memoryManager);
 
-    if (!factory)
+    if (!factory) {
+#ifdef V4_ENABLE_JIT
         factory = new QQmlJS::MASM::ISelFactory;
+#else // !V4_ENABLE_JIT
+        factory = new QQmlJS::Moth::ISelFactory;
+#endif // V4_ENABLE_JIT
+    }
     iselFactory.reset(factory);
 
     memoryManager->setExecutionEngine(this);

diff --git a/src/qml/qml/v4/qv4isel_masm_p.h b/src/qml/qml/v4/qv4isel_masm_p.h
index 396801b..437c250 100644 (file)
--- a/src/qml/qml/v4/qv4isel_masm_p.h
+++ b/src/qml/qml/v4/qv4isel_masm_p.h
@@ -891,6 +891,8 @@ public:
     virtual ~ISelFactory() {}
     virtual EvalInstructionSelection *create(QV4::ExecutionEngine *engine, V4IR::Module *module)
     { return new InstructionSelection(engine, module); }
+    virtual bool jitCompileRegexps() const
+    { return true; }
 };
 
 } // end of namespace MASM

diff --git a/src/qml/qml/v4/qv4isel_p.h b/src/qml/qml/v4/qv4isel_p.h
index b3efacc..6739ff1 100644 (file)
--- a/src/qml/qml/v4/qv4isel_p.h
+++ b/src/qml/qml/v4/qv4isel_p.h
@@ -82,6 +82,7 @@ class Q_QML_EXPORT EvalISelFactory
 public:
     virtual ~EvalISelFactory() = 0;
     virtual EvalInstructionSelection *create(QV4::ExecutionEngine *engine, V4IR::Module *module) = 0;
+    virtual bool jitCompileRegexps() const = 0;
 };
 
 namespace V4IR {

diff --git a/src/qml/qml/v4/qv4regexp.cpp b/src/qml/qml/v4/qv4regexp.cpp
index 6ea9841..053a32d 100644 (file)
--- a/src/qml/qml/v4/qv4regexp.cpp
+++ b/src/qml/qml/v4/qv4regexp.cpp
@@ -111,7 +111,7 @@ RegExp::RegExp(ExecutionEngine* engine, const QString &pattern, bool ignoreCase,
     m_subPatternCount = yarrPattern.m_numSubpatterns;
     m_byteCode = JSC::Yarr::byteCompile(yarrPattern, engine->bumperPointerAllocator);
 #if ENABLE(YARR_JIT)
-    if (!yarrPattern.m_containsBackreferences) {
+    if (!yarrPattern.m_containsBackreferences && engine->iselFactory->jitCompileRegexps()) {
         JSC::JSGlobalData dummy(engine->executableAllocator);
         JSC::Yarr::jitCompile(yarrPattern, JSC::Yarr::Char16, &dummy, m_jitCode);
     }

diff --git a/tools/v4/main.cpp b/tools/v4/main.cpp
index 525649f..5529930 100644 (file)
--- a/tools/v4/main.cpp
+++ b/tools/v4/main.cpp
@@ -50,7 +50,6 @@
 #include "private/qv4errorobject_p.h"
 #include "private/qv4globalobject_p.h"
 #include "private/qv4codegen_p.h"
-#include "private/qv4isel_masm_p.h"
 #include "private/qv4isel_moth_p.h"
 #include "private/qv4vme_moth_p.h"
 #include "private/qv4syntaxchecker_p.h"
@@ -59,6 +58,10 @@
 #include "private/qv4mm_p.h"
 #include "private/qv4context_p.h"
 
+#ifdef V4_ENABLE_JIT
+#  include "private/qv4isel_masm_p.h"
+#endif // V4_ENABLE_JIT
+
 #include <QtCore>
 #include <private/qqmljsengine_p.h>
 #include <private/qqmljslexer_p.h>
@@ -345,8 +348,10 @@ int main(int argc, char *argv[])
         QQmlJS::EvalISelFactory* iSelFactory = 0;
         if (mode == use_moth) {
             iSelFactory = new QQmlJS::Moth::ISelFactory;
+#ifdef V4_ENABLE_JIT
         } else {
             iSelFactory = new QQmlJS::MASM::ISelFactory;
+#endif // V4_ENABLE_JIT
         }
 
         QV4::ExecutionEngine vm(iSelFactory);