aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@me.com>2013-05-07 11:54:45 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-05-08 13:15:38 +0200
commit056f1ba351e233e5c3ac7b43d1e7e561dcc93ffb (patch)
tree24c89819c6b553e1c350b19edbf158e877b75446 /tools
parentd0148d8fc18e75c0d3d7a484112cd37d215d7799 (diff)
Add flag to the engine to enable/disable RegExp JITting.
Change-Id: I4b632e6f8ab7cf20576f94764ed506de8be63efb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/v4/main.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/v4/main.cpp b/tools/v4/main.cpp
index 525649f9a4..5529930a99 100644
--- 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);