V4: changed environment variable SHOW_CODE.

Use QV4_SHOW_ASM for the generated assembly from the JIT, and use
QV4_SHOW_IR to get dumps of the IR.

Change-Id: Id85d3d6c87b47088c312475a7c737d54c58c7791
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/3rdparty/masm/stubs/Options.cpp b/src/3rdparty/masm/stubs/Options.cpp
index 24e4f3a..7b64b68 100644 (file)
--- a/src/3rdparty/masm/stubs/Options.cpp
+++ b/src/3rdparty/masm/stubs/Options.cpp
@@ -48,7 +48,7 @@ namespace JSC {
 
 bool Options::showDisassembly()
 {
-    static bool showCode = !qgetenv("SHOW_CODE").isNull();
+    static bool showCode = !qgetenv("QV4_SHOW_ASM").isNull();
     return showCode;
 }
 

diff --git a/src/qml/compiler/qv4isel_masm.cpp b/src/qml/compiler/qv4isel_masm.cpp
index 3f3c47d..0a5b94f 100644 (file)
--- a/src/qml/compiler/qv4isel_masm.cpp
+++ b/src/qml/compiler/qv4isel_masm.cpp
@@ -542,7 +542,7 @@ JSC::MacroAssemblerCodeRef Assembler::link(int *codeSize)
 
     JSC::MacroAssemblerCodeRef codeRef;
 
-    static bool showCode = !qgetenv("SHOW_CODE").isNull();
+    static bool showCode = !qgetenv("QV4_SHOW_ASM").isNull();
     if (showCode) {
 #if OS(LINUX) && !defined(Q_OS_ANDROID)
         char* disasmOutput = 0;

diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp
index 1382085..7054d51 100644 (file)
--- a/src/qml/compiler/qv4ssa.cpp
+++ b/src/qml/compiler/qv4ssa.cpp
@@ -75,7 +75,7 @@ QTextStream qout(stdout, QIODevice::WriteOnly);
 
 void showMeTheCode(Function *function)
 {
-    static bool showCode = !qgetenv("SHOW_CODE").isNull();
+    static bool showCode = !qgetenv("QV4_SHOW_IR").isNull();
     if (showCode) {
         QVector<Stmt *> code;
         QHash<Stmt *, BasicBlock *> leader;