Changeset 220823 in webkit for trunk/Source/JavaScriptCore/assembler/testmasm.cpp

Timestamp:

Aug 16, 2017, 10:09:06 PM (8 years ago)

Author:

[email protected]

Message:

Add back the ability to disable MASM_PROBE from the build.
​https://bugs.webkit.org/show_bug.cgi?id=175656
<rdar://problem/33933720>

Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

This is needed for ports that the existing MASM_PROBE implementation doesn't work
well with e.g. GTK with ARM_THUMB2. Note that if the DFG_JIT will be disabled by
default if !ENABLE(MASM_PROBE).

• assembler/AbstractMacroAssembler.h:
• assembler/MacroAssembler.cpp:
• assembler/MacroAssembler.h:
• assembler/MacroAssemblerARM.cpp:
• assembler/MacroAssemblerARM64.cpp:
• assembler/MacroAssemblerARMv7.cpp:
• assembler/MacroAssemblerPrinter.cpp:
• assembler/MacroAssemblerPrinter.h:
• assembler/MacroAssemblerX86Common.cpp:
• assembler/testmasm.cpp:

(JSC::run):

• b3/B3LowerToAir.cpp:
• b3/air/AirPrintSpecial.cpp:
• b3/air/AirPrintSpecial.h:

Source/WTF:

• wtf/Platform.h:

File:

• trunk/Source/JavaScriptCore/assembler/testmasm.cpp (modified) (9 diffs)

trunk/Source/JavaScriptCore/assembler/testmasm.cpp

@@ -51 +51 @@
 #if ENABLE(JIT)
 
+#if ENABLE(MASM_PROBE)
 namespace WTF {
 
@@ -59 +60 @@
 
 } // namespace WTF
+#endif // ENABLE(MASM_PROBE)
 
 using namespace JSC;
@@ -64 +66 @@
 namespace {
 
+#if ENABLE(MASM_PROBE)
 using CPUState = MacroAssembler::CPUState;
+#endif
 
 StaticLock crashLock;
@@ -94 +98 @@
     } while (false)
 
+#if ENABLE(MASM_PROBE)
 bool isPC(MacroAssembler::RegisterID id)
 {
@@ -124 +129 @@
     return false;
 }
+#endif // ENABLE(MASM_PROBE)
 
 MacroAssemblerCodeRef compile(Generator&& generate)
@@ -156 +162 @@
 }
 
+#if ENABLE(MASM_PROBE)
 void testProbeReadsArgumentRegisters()
 {
@@ -662 +669 @@
     CHECK_EQ(probeCallCount, 3);
 }
+#endif // ENABLE(MASM_PROBE)
 
 #define RUN(test) do {                          \
@@ -689 +697 @@
     RUN(testSimple());
 
+#if ENABLE(MASM_PROBE)
     RUN(testProbeReadsArgumentRegisters());
     RUN(testProbeWritesArgumentRegisters());
@@ -696 +705 @@
     RUN(testProbeModifiesProgramCounter());
     RUN(testProbeModifiesStackWithCallback());
+#endif // ENABLE(MASM_PROBE)
 
     if (tasks.isEmpty())