diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-10-03 13:03:18 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-10 21:50:45 +0200 |
| commit | 36a5530cc9e04ed0ea381ebd1e2b1517eaa50a9f (patch) | |
| tree | 08b9c85c4629a94e22cad1f887d43777a27290b3 /src/3rdparty/masm/masm-defs.pri | |
| parent | b7ff0575be4c5a1b8a4561bb827ebe7f782f9ac8 (diff) | |
Add support for showing disassembled ARM JIT code
Ported the ARM disassembler from upstream trunk. QtQml needs to be configured
with qmake CONFIG+=disassembler and QV4_SHOW_ASM=1 enables the dump at
run-time.
Change-Id: Ia13a98835829fde0d3c5a795cb8f6ef9de951807
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/3rdparty/masm/masm-defs.pri')
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index ef9f79a42f..aa6acc9094 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -35,8 +35,12 @@ INCLUDEPATH += $$PWD/stubs INCLUDEPATH += $$PWD/stubs/wtf INCLUDEPATH += $$PWD -disassembler:if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")):!win*: DEFINES += WTF_USE_UDIS86=1 -else: DEFINES += WTF_USE_UDIS86=0 +disassembler { + if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")):!win*: DEFINES += WTF_USE_UDIS86=1 + if(isEqual(QT_ARCH, "arm")):contains(DEFINES, V4_ENABLE_JIT): DEFINES += WTF_USE_ARMV7_DISASSEMBLER=1 +} else { + DEFINES += WTF_USE_UDIS86=0 +} INCLUDEPATH += $$PWD/disassembler INCLUDEPATH += $$PWD/disassembler/udis86 |