Move JIT infrastructure into it's own directory

This is a starting point to clean up some of the
code base for the JIT.

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

diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri
index b2569f9..24379ca 100644 (file)
--- a/src/qml/compiler/compiler.pri
+++ b/src/qml/compiler/compiler.pri
@@ -1,5 +1,3 @@
-include(../../3rdparty/masm/masm-defs.pri)
-
 INCLUDEPATH += $$PWD
 INCLUDEPATH += $$OUT_PWD
 
@@ -13,9 +11,7 @@ HEADERS += \
     $$PWD/qv4isel_moth_p.h \
     $$PWD/qv4isel_util_p.h \
     $$PWD/qv4ssa_p.h \
-    $$PWD/qv4regalloc_p.h \
     $$PWD/qqmlcodegenerator_p.h \
-    $$PWD/qv4isel_masm_p.h \
     $$PWD/qqmltypecompiler_p.h
 
 SOURCES += \
@@ -27,9 +23,5 @@ SOURCES += \
     $$PWD/qv4isel_p.cpp \
     $$PWD/qv4jsir.cpp \
     $$PWD/qv4ssa.cpp \
-    $$PWD/qv4regalloc.cpp \
     $$PWD/qqmlcodegenerator.cpp \
-    $$PWD/qv4isel_masm.cpp \
     $$PWD/qqmltypecompiler.cpp
-
-include(../../3rdparty/masm/masm.pri)

diff --git a/src/qml/jit/jit.pri b/src/qml/jit/jit.pri
new file mode 100644 (file)
index 0000000..cf44479
--- /dev/null
+++ b/src/qml/jit/jit.pri
@@ -0,0 +1,14 @@
+include(../../3rdparty/masm/masm-defs.pri)
+
+INCLUDEPATH += $$PWD
+INCLUDEPATH += $$OUT_PWD
+
+HEADERS += \
+    $$PWD/qv4regalloc_p.h \
+    $$PWD/qv4isel_masm_p.h \
+
+SOURCES += \
+    $$PWD/qv4regalloc.cpp \
+    $$PWD/qv4isel_masm.cpp \
+
+include(../../3rdparty/masm/masm.pri)

diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/jit/qv4isel_masm.cpp
similarity index 100%
rename from src/qml/compiler/qv4isel_masm.cpp
rename to src/qml/jit/qv4isel_masm.cpp

diff --git a/src/qml/compiler/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h
similarity index 100%
rename from src/qml/compiler/qv4isel_masm_p.h
rename to src/qml/jit/qv4isel_masm_p.h

diff --git a/src/qml/compiler/qv4regalloc.cpp b/src/qml/jit/qv4regalloc.cpp
similarity index 100%
rename from src/qml/compiler/qv4regalloc.cpp
rename to src/qml/jit/qv4regalloc.cpp

diff --git a/src/qml/compiler/qv4regalloc_p.h b/src/qml/jit/qv4regalloc_p.h
similarity index 100%
rename from src/qml/compiler/qv4regalloc_p.h
rename to src/qml/jit/qv4regalloc_p.h

diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index 79e83a1..17d35f8 100644 (file)
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -34,6 +34,7 @@ include(util/util.pri)
 include(parser/parser.pri)
 include(compiler/compiler.pri)
 include(jsapi/jsapi.pri)
+include(jit/jit.pri)
 include(jsruntime/jsruntime.pri)
 include(qml/qml.pri)
 include(debugger/debugger.pri)