Changeset 153197 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp

Timestamp:

Jul 24, 2013, 9:01:38 PM (12 years ago)

Author:

[email protected]

Message:

fourthTier: Misc JIT probe enhacements.
​https://bugs.webkit.org/show_bug.cgi?id=116586.

Reviewed by Michael Saboff.

1. Added JIT probe support for ARMv7 and traditional ARM. Built and tested on ARMv7. ARM version not tested nor built.
2. Fix the following bugs in the X86 and X86_64 probes:
   1. Cannot assume that the stack pointer is already aligned when we push args for the probe. Instead, we ensure the stack alignment at runtime when we set up the probe call. This is now done in the ctiMasmProbeTrampoline.
   2. On return, the user probe function may have altered the stack pointer value to be restored. Previously, if the sp restore value points to some of the other register restore values in the ProbeContext record, we will fail to return from the probe having those user specified value as we're expected to do. This is now fixed.
3. Rearranged the X86/X86_64 registers order to organize them like gdb expects on X86_64.
4. We also now preserve the condition code registers.

• JavaScriptCore.xcodeproj/project.pbxproj:
• assembler/ARMAssembler.h:
• assembler/ARMv7Assembler.h:

(ARMRegisters):

• assembler/MacroAssemblerARM.cpp:

(JSC::isVFPPresent):
(JSC::MacroAssemblerARM::ProbeContext::dumpCPURegisters):
(JSC::MacroAssemblerARM::ProbeContext::dump):
(JSC::MacroAssemblerARM::probe):

• assembler/MacroAssemblerARM.h:

(MacroAssemblerARM):
(CPUState):
(ProbeContext):
(JSC::MacroAssemblerARM::trustedImm32FromPtr):

• assembler/MacroAssemblerARMv7.h:

(MacroAssemblerARMv7):
(CPUState):
(ProbeContext):
(JSC::MacroAssemblerARMv7::trustedImm32FromPtr):

• assembler/MacroAssemblerX86.h:

(MacroAssemblerX86):
(JSC::MacroAssemblerX86::probe):

• assembler/MacroAssemblerX86Common.cpp:

(JSC::MacroAssemblerX86Common::ProbeContext::dumpCPURegisters):

• assembler/MacroAssemblerX86_64.h:

(JSC::MacroAssemblerX86_64::probe):

• assembler/X86Assembler.h:
• config.h:
• jit/JITStubsARM.h:
• jit/JITStubsARMv7.h:
• jit/JITStubsX86.h:
• jit/JITStubsX86Common.h:
• jit/JITStubsX86_64.h:

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp (copied) (copied from trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp ) (5 diffs)

trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp

@@ -25 +25 @@
 
 #include "config.h"
-#include "MacroAssemblerX86Common.h"
+
+#if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
+#include "MacroAssemblerARMv7.h"
+
+#if USE(MASM_PROBE)
+#include <wtf/StdLibExtras.h>
+#endif
 
 namespace JSC {
@@ -31 +37 @@
 #if USE(MASM_PROBE)
 
-void MacroAssemblerX86Common::ProbeContext::dumpCPURegisters(const char* indentation)
+void MacroAssemblerARMv7::ProbeContext::dumpCPURegisters(const char* indentation)
 {
-#if CPU(X86)
     #define DUMP_GPREGISTER(_type, _regName) { \
         int32_t value = reinterpret_cast<int32_t>(cpu._regName); \
-        dataLogF("%s    %4s: 0x%08x   %d\n", indentation, #_regName, value, value) ; \
+        dataLogF("%s    %5s: 0x%08x   %d\n", indentation, #_regName, value, value) ; \
     }
-#elif CPU(X86_64)
-    #define DUMP_GPREGISTER(_type, _regName) { \
-        int64_t value = reinterpret_cast<int64_t>(cpu._regName); \
-        dataLogF("%s    %4s: 0x%016llx   %lld\n", indentation, #_regName, value, value) ; \
-    }
-#endif
     FOR_EACH_CPU_GPREGISTER(DUMP_GPREGISTER)
+    FOR_EACH_CPU_SPECIAL_REGISTER(DUMP_GPREGISTER)
     #undef DUMP_GPREGISTER
 
@@ -50 +50 @@
         uint32_t* u = reinterpret_cast<uint32_t*>(&cpu._regName); \
         double* d = reinterpret_cast<double*>(&cpu._regName); \
-        dataLogF("%s    %s: 0x%08x%08x 0x%08x%08x   %12g %12g\n", \
-            indentation, #_regName, u[3], u[2], u[1], u[0], d[1], d[0]); \
+        dataLogF("%s    %5s: 0x %08x %08x   %12g\n", \
+            indentation, #_regName, u[1], u[0], d[0]); \
     }
     FOR_EACH_CPU_FPREGISTER(DUMP_FPREGISTER)
@@ -57 +57 @@
 }
 
-void MacroAssemblerX86Common::ProbeContext::dump(const char* indentation)
+void MacroAssemblerARMv7::ProbeContext::dump(const char* indentation)
 {
     if (!indentation)
@@ -75 +75 @@
 }
 
+
+extern "C" void ctiMasmProbeTrampoline();
+
+// For details on "What code is emitted for the probe?" and "What values are in
+// the saved registers?", see comment for MacroAssemblerX86::probe() in
+// MacroAssemblerX86_64.h.
+
+void MacroAssemblerARMv7::probe(MacroAssemblerARMv7::ProbeFunction function, void* arg1, void* arg2)
+{
+    push(RegisterID::sp);
+    push(RegisterID::lr);
+    push(RegisterID::ip);
+    push(RegisterID::r0);
+    // The following uses RegisterID::ip. So, they must come after we push ip above.
+    push(trustedImm32FromPtr(arg2));
+    push(trustedImm32FromPtr(arg1));
+    push(trustedImm32FromPtr(function));
+
+    move(trustedImm32FromPtr(ctiMasmProbeTrampoline), RegisterID::ip);
+    m_assembler.blx(RegisterID::ip);
+}
 #endif // USE(MASM_PROBE)
 
 } // namespace JSC
+
+#endif // ENABLE(ASSEMBLER)
+