Changeset 220579 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp

Timestamp:

Aug 10, 2017, 10:31:32 PM (8 years ago)

Author:

[email protected]

Message:

Make the MASM_PROBE mechanism mandatory for DFG and FTL builds.
​https://bugs.webkit.org/show_bug.cgi?id=175446
<rdar://problem/33836545>

Reviewed by Saam Barati.

Source/JavaScriptCore:

• assembler/AbstractMacroAssembler.h:
• assembler/MacroAssembler.cpp:

(JSC::MacroAssembler::probe):

• assembler/MacroAssembler.h:
• assembler/MacroAssemblerARM.cpp:

(JSC::MacroAssembler::probe):

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::trustedImm32FromPtr):

• assembler/MacroAssemblerARM64.cpp:

(JSC::MacroAssembler::probe):

• assembler/MacroAssemblerARMv7.cpp:

(JSC::MacroAssembler::probe):

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::trustedImm32FromPtr):

• assembler/MacroAssemblerPrinter.cpp:
• assembler/MacroAssemblerPrinter.h:
• assembler/MacroAssemblerX86Common.cpp:
• assembler/testmasm.cpp:

(JSC::isSpecialGPR):
(JSC::testProbeModifiesProgramCounter):
(JSC::run):

• b3/B3LowerToAir.cpp:

(JSC::B3::Air::LowerToAir::print):

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

Source/WTF:

This is needed in order to support ​https://bugs.webkit.org/show_bug.cgi?id=174645.
One consequence of this is that the DFG will now be disabled for the MIPS and
Windows ports. See:

​https://bugs.webkit.org/show_bug.cgi?id=175447
​https://bugs.webkit.org/show_bug.cgi?id=175449

Also, we should only ENABLE_SIGNAL_BASED_VM_TRAPS if the DFG is enabled. It was
never meaningful to use SIGNAL_BASED_VM_TRAPS with the baseline JIT anyway. This
is a mis-configuration error that is now fixed.

• wtf/Platform.h:

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.cpp

@@ -27 +27 @@
 #include "MacroAssemblerPrinter.h"
 
-#if ENABLE(MASM_PROBE)
-
 #include "MacroAssembler.h"
+#include <inttypes.h>
 
 namespace JSC {
@@ -54 +53 @@
 
 #if USE(JSVALUE32_64)
-    #define INTPTR_HEX_VALUE_FORMAT "0x%08lx"
+    #define INTPTR_HEX_VALUE_FORMAT "0x%08" PRIxPTR
 #else
-    #define INTPTR_HEX_VALUE_FORMAT "0x%016lx"
+    #define INTPTR_HEX_VALUE_FORMAT "0x%016" PRIxPTR
 #endif
 
     for (auto id = MacroAssembler::firstRegister(); id <= MacroAssembler::lastRegister(); id = nextID(id)) {
         intptr_t value = static_cast<intptr_t>(cpu.gpr(id));
-        INDENT, out.printf("    %6s: " INTPTR_HEX_VALUE_FORMAT "  %ld\n", cpu.gprName(id), value, value);
+        INDENT, out.printf("    %6s: " INTPTR_HEX_VALUE_FORMAT "  %" PRIdPTR "\n", cpu.gprName(id), value, value);
     }
     for (auto id = MacroAssembler::firstSPRegister(); id <= MacroAssembler::lastSPRegister(); id = nextID(id)) {
         intptr_t value = static_cast<intptr_t>(cpu.spr(id));
-        INDENT, out.printf("    %6s: " INTPTR_HEX_VALUE_FORMAT "  %ld\n", cpu.sprName(id), value, value);
+        INDENT, out.printf("    %6s: " INTPTR_HEX_VALUE_FORMAT "  %" PRIdPTR "\n", cpu.sprName(id), value, value);
     }
     #undef INTPTR_HEX_VALUE_FORMAT
@@ -72 +71 @@
         uint64_t u = bitwise_cast<uint64_t>(cpu.fpr(id));
         double d = cpu.fpr(id);
-        INDENT, out.printf("    %6s: 0x%016llx  %.13g\n", cpu.fprName(id), u, d);
+        INDENT, out.printf("    %6s: 0x%016" PRIx64 "  %.13g\n", cpu.fprName(id), u, d);
     }
 
@@ -100 +99 @@
     const char* name = CPUState::fprName(regID);
     double value = context.probeContext.fpr(regID);
-    out.printf("%s:<0x%016llx %.13g>", name, bitwise_cast<uint64_t>(value), value);
+    out.printf("%s:<0x%016" PRIx64 " %.13g>", name, bitwise_cast<uint64_t>(value), value);
 }
 
@@ -147 +146 @@
         if (memory.numBytes == sizeof(int64_t)) {
             auto p = reinterpret_cast<int64_t*>(ptr);
-            out.printf("%p:<0x%016llx %lld>", p, *p, *p);
+            out.printf("%p:<0x%016" PRIx64 " %" PRId64 ">", p, *p, *p);
             return;
         }
@@ -184 +183 @@
 } // namespace JSC
 
-#endif // ENABLE(MASM_PROBE)