aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2014-02-10 15:46:28 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-22 18:47:14 +0100
commit5e085f4883953ebb54ed8abba0468ad17d352682 (patch)
treeda69ca46d485b24848b45266cd9139de92cede27
parentf11561f0eb3f084cd6e10dd7984b865a548403ac (diff)
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>
-rw-r--r--src/qml/compiler/compiler.pri8
-rw-r--r--src/qml/jit/jit.pri14
-rw-r--r--src/qml/jit/qv4isel_masm.cpp (renamed from src/qml/compiler/qv4isel_masm.cpp)0
-rw-r--r--src/qml/jit/qv4isel_masm_p.h (renamed from src/qml/compiler/qv4isel_masm_p.h)0
-rw-r--r--src/qml/jit/qv4regalloc.cpp (renamed from src/qml/compiler/qv4regalloc.cpp)0
-rw-r--r--src/qml/jit/qv4regalloc_p.h (renamed from src/qml/compiler/qv4regalloc_p.h)0
-rw-r--r--src/qml/qml.pro1
7 files changed, 15 insertions, 8 deletions
diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri
index b2569f9111..24379ca5f3 100644
--- 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
index 0000000000..cf444796a9
--- /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
index 157cbd3634..157cbd3634 100644
--- a/src/qml/compiler/qv4isel_masm.cpp
+++ b/src/qml/jit/qv4isel_masm.cpp
diff --git a/src/qml/compiler/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h
index 088141a1df..088141a1df 100644
--- a/src/qml/compiler/qv4isel_masm_p.h
+++ b/src/qml/jit/qv4isel_masm_p.h
diff --git a/src/qml/compiler/qv4regalloc.cpp b/src/qml/jit/qv4regalloc.cpp
index cc9ce4fc96..cc9ce4fc96 100644
--- a/src/qml/compiler/qv4regalloc.cpp
+++ b/src/qml/jit/qv4regalloc.cpp
diff --git a/src/qml/compiler/qv4regalloc_p.h b/src/qml/jit/qv4regalloc_p.h
index c6dfa9f11a..c6dfa9f11a 100644
--- a/src/qml/compiler/qv4regalloc_p.h
+++ b/src/qml/jit/qv4regalloc_p.h
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index 79e83a1d47..17d35f8c54 100644
--- 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)