Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (157570 => 157571)
--- trunk/Source/_javascript_Core/ChangeLog 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-10-17 13:43:20 UTC (rev 157571)
@@ -1,3 +1,25 @@
+2013-10-17 Mark Lam <[email protected]>
+
+ Remove JITStackFrame references in JIT probes.
+ https://bugs.webkit.org/show_bug.cgi?id=122947.
+
+ Reviewed by Michael Saboff.
+
+ * assembler/MacroAssemblerARM.cpp:
+ (JSC::MacroAssemblerARM::ProbeContext::dump):
+ * assembler/MacroAssemblerARM.h:
+ * assembler/MacroAssemblerARMv7.cpp:
+ (JSC::MacroAssemblerARMv7::ProbeContext::dump):
+ * assembler/MacroAssemblerARMv7.h:
+ * assembler/MacroAssemblerX86Common.cpp:
+ (JSC::MacroAssemblerX86Common::ProbeContext::dump):
+ * assembler/MacroAssemblerX86Common.h:
+ * jit/JITStubsARM.h:
+ * jit/JITStubsARMv7.h:
+ * jit/JITStubsX86.h:
+ * jit/JITStubsX86Common.h:
+ * jit/JITStubsX86_64.h:
+
2013-10-17 Julien Brianceau <[email protected]>
Fix build when NUMBER_OF_ARGUMENT_REGISTERS == 4.
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp (157570 => 157571)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2013-10-17 13:43:20 UTC (rev 157571)
@@ -130,7 +130,6 @@
dataLogF("%s probeFunction: %p\n", indentation, probeFunction);
dataLogF("%s arg1: %p %llu\n", indentation, arg1, reinterpret_cast<int64_t>(arg1));
dataLogF("%s arg2: %p %llu\n", indentation, arg2, reinterpret_cast<int64_t>(arg2));
- dataLogF("%s jitStackFrame: %p\n", indentation, jitStackFrame);
dataLogF("%s cpu: {\n", indentation);
dumpCPURegisters(indentation);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h (157570 => 157571)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2013-10-17 13:43:20 UTC (rev 157571)
@@ -35,8 +35,6 @@
namespace JSC {
-struct JITStackFrame;
-
class MacroAssemblerARM : public AbstractMacroAssembler<ARMAssembler> {
static const int DoubleConditionMask = 0x0f;
static const int DoubleConditionBitSpecial = 0x10;
@@ -1345,7 +1343,6 @@
ProbeFunction probeFunction;
void* arg1;
void* arg2;
- JITStackFrame* jitStackFrame;
CPUState cpu;
void dump(const char* indentation = 0);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp (157570 => 157571)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp 2013-10-17 13:43:20 UTC (rev 157571)
@@ -65,7 +65,6 @@
dataLogF("%s probeFunction: %p\n", indentation, probeFunction);
dataLogF("%s arg1: %p %llu\n", indentation, arg1, reinterpret_cast<int64_t>(arg1));
dataLogF("%s arg2: %p %llu\n", indentation, arg2, reinterpret_cast<int64_t>(arg2));
- dataLogF("%s jitStackFrame: %p\n", indentation, jitStackFrame);
dataLogF("%s cpu: {\n", indentation);
dumpCPURegisters(indentation);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (157570 => 157571)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2013-10-17 13:43:20 UTC (rev 157571)
@@ -34,8 +34,6 @@
namespace JSC {
-struct JITStackFrame;
-
class MacroAssemblerARMv7 : public AbstractMacroAssembler<ARMv7Assembler> {
// FIXME: switch dataTempRegister & addressTempRegister, or possibly use r7?
// - dTR is likely used more than aTR, and we'll get better instruction
@@ -1813,7 +1811,6 @@
ProbeFunction probeFunction;
void* arg1;
void* arg2;
- JITStackFrame* jitStackFrame;
CPUState cpu;
void dump(const char* indentation = 0);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp (157570 => 157571)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp 2013-10-17 13:43:20 UTC (rev 157571)
@@ -68,7 +68,6 @@
dataLogF("%s probeFunction: %p\n", indentation, probeFunction);
dataLogF("%s arg1: %p %llu\n", indentation, arg1, reinterpret_cast<int64_t>(arg1));
dataLogF("%s arg2: %p %llu\n", indentation, arg2, reinterpret_cast<int64_t>(arg2));
- dataLogF("%s jitStackFrame: %p\n", indentation, jitStackFrame);
dataLogF("%s cpu: {\n", indentation);
dumpCPURegisters(indentation);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h (157570 => 157571)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2013-10-17 13:43:20 UTC (rev 157571)
@@ -33,8 +33,6 @@
namespace JSC {
-struct JITStackFrame;
-
class MacroAssemblerX86Common : public AbstractMacroAssembler<X86Assembler> {
protected:
#if CPU(X86_64)
@@ -1450,7 +1448,6 @@
ProbeFunction probeFunction;
void* arg1;
void* arg2;
- JITStackFrame* jitStackFrame;
CPUState cpu;
void dump(const char* indentation = 0);
Modified: trunk/Source/_javascript_Core/jit/JITStubsARM.h (157570 => 157571)
--- trunk/Source/_javascript_Core/jit/JITStubsARM.h 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/jit/JITStubsARM.h 2013-10-17 13:43:20 UTC (rev 157571)
@@ -56,7 +56,6 @@
#define PROBE_PROBE_FUNCTION_OFFSET (0 * PTR_SIZE)
#define PROBE_ARG1_OFFSET (1 * PTR_SIZE)
#define PROBE_ARG2_OFFSET (2 * PTR_SIZE)
-#define PROBE_JIT_STACK_FRAME_OFFSET (3 * PTR_SIZE)
#define PROBE_FIRST_GPREG_OFFSET (4 * PTR_SIZE)
@@ -109,7 +108,6 @@
COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
-COMPILE_ASSERT(PROBE_OFFSETOF(jitStackFrame) == PROBE_JIT_STACK_FRAME_OFFSET, ProbeContext_jitStackFrame_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r0) == PROBE_CPU_R0_OFFSET, ProbeContext_cpu_r0_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r1) == PROBE_CPU_R1_OFFSET, ProbeContext_cpu_r1_offset_matches_ctiMasmProbeTrampoline);
@@ -257,7 +255,6 @@
"str lr, [sp, #" STRINGIZE_VALUE_OF(PROBE_CPU_LR_OFFSET) "]" "\n"
"ldr lr, [ip, #6 * " STRINGIZE_VALUE_OF(PTR_SIZE) "]" "\n"
"str lr, [sp, #" STRINGIZE_VALUE_OF(PROBE_CPU_SP_OFFSET) "]" "\n"
- "str lr, [sp, #" STRINGIZE_VALUE_OF(PROBE_JIT_STACK_FRAME_OFFSET) "]" "\n"
"ldr lr, [sp, #" STRINGIZE_VALUE_OF(PROBE_CPU_PC_OFFSET) "]" "\n"
Modified: trunk/Source/_javascript_Core/jit/JITStubsARMv7.h (157570 => 157571)
--- trunk/Source/_javascript_Core/jit/JITStubsARMv7.h 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/jit/JITStubsARMv7.h 2013-10-17 13:43:20 UTC (rev 157571)
@@ -64,7 +64,6 @@
#define PROBE_PROBE_FUNCTION_OFFSET (0 * PTR_SIZE)
#define PROBE_ARG1_OFFSET (1 * PTR_SIZE)
#define PROBE_ARG2_OFFSET (2 * PTR_SIZE)
-#define PROBE_JIT_STACK_FRAME_OFFSET (3 * PTR_SIZE)
#define PROBE_FIRST_GPREG_OFFSET (4 * PTR_SIZE)
@@ -138,7 +137,6 @@
COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
-COMPILE_ASSERT(PROBE_OFFSETOF(jitStackFrame) == PROBE_JIT_STACK_FRAME_OFFSET, ProbeContext_jitStackFrame_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r0) == PROBE_CPU_R0_OFFSET, ProbeContext_cpu_r0_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.r1) == PROBE_CPU_R1_OFFSET, ProbeContext_cpu_r1_offset_matches_ctiMasmProbeTrampoline);
@@ -353,7 +351,6 @@
"str lr, [sp, #" STRINGIZE_VALUE_OF(PROBE_CPU_LR_OFFSET) "]" "\n"
"ldr lr, [ip, #6 * " STRINGIZE_VALUE_OF(PTR_SIZE) "]" "\n"
"str lr, [sp, #" STRINGIZE_VALUE_OF(PROBE_CPU_SP_OFFSET) "]" "\n"
- "str lr, [sp, #" STRINGIZE_VALUE_OF(PROBE_JIT_STACK_FRAME_OFFSET) "]" "\n"
"ldr lr, [sp, #" STRINGIZE_VALUE_OF(PROBE_CPU_PC_OFFSET) "]" "\n"
Modified: trunk/Source/_javascript_Core/jit/JITStubsX86.h (157570 => 157571)
--- trunk/Source/_javascript_Core/jit/JITStubsX86.h 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/jit/JITStubsX86.h 2013-10-17 13:43:20 UTC (rev 157571)
@@ -156,7 +156,6 @@
"movl %ecx, " STRINGIZE_VALUE_OF(PROBE_CPU_EAX_OFFSET) "(%ebp)" "\n"
"movl 6 * " STRINGIZE_VALUE_OF(PTR_SIZE) "(%eax), %ecx" "\n"
"movl %ecx, " STRINGIZE_VALUE_OF(PROBE_CPU_ESP_OFFSET) "(%ebp)" "\n"
- "movl %ecx, " STRINGIZE_VALUE_OF(PROBE_JIT_STACK_FRAME_OFFSET) "(%ebp)" "\n"
"movdqa %xmm0, " STRINGIZE_VALUE_OF(PROBE_CPU_XMM0_OFFSET) "(%ebp)" "\n"
"movdqa %xmm1, " STRINGIZE_VALUE_OF(PROBE_CPU_XMM1_OFFSET) "(%ebp)" "\n"
Modified: trunk/Source/_javascript_Core/jit/JITStubsX86Common.h (157570 => 157571)
--- trunk/Source/_javascript_Core/jit/JITStubsX86Common.h 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/jit/JITStubsX86Common.h 2013-10-17 13:43:20 UTC (rev 157571)
@@ -49,7 +49,6 @@
#define PROBE_PROBE_FUNCTION_OFFSET (0 * PTR_SIZE)
#define PROBE_ARG1_OFFSET (1 * PTR_SIZE)
#define PROBE_ARG2_OFFSET (2 * PTR_SIZE)
-#define PROBE_JIT_STACK_FRAME_OFFSET (3 * PTR_SIZE)
#define PROBE_CPU_EAX_OFFSET (4 * PTR_SIZE)
#define PROBE_CPU_EBX_OFFSET (5 * PTR_SIZE)
@@ -101,7 +100,6 @@
COMPILE_ASSERT(PROBE_OFFSETOF(probeFunction) == PROBE_PROBE_FUNCTION_OFFSET, ProbeContext_probeFunction_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg1) == PROBE_ARG1_OFFSET, ProbeContext_arg1_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(arg2) == PROBE_ARG2_OFFSET, ProbeContext_arg2_offset_matches_ctiMasmProbeTrampoline);
-COMPILE_ASSERT(PROBE_OFFSETOF(jitStackFrame) == PROBE_JIT_STACK_FRAME_OFFSET, ProbeContext_jitStackFrame_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.eax) == PROBE_CPU_EAX_OFFSET, ProbeContext_cpu_eax_offset_matches_ctiMasmProbeTrampoline);
COMPILE_ASSERT(PROBE_OFFSETOF(cpu.ecx) == PROBE_CPU_ECX_OFFSET, ProbeContext_cpu_ecx_offset_matches_ctiMasmProbeTrampoline);
Modified: trunk/Source/_javascript_Core/jit/JITStubsX86_64.h (157570 => 157571)
--- trunk/Source/_javascript_Core/jit/JITStubsX86_64.h 2013-10-17 12:58:44 UTC (rev 157570)
+++ trunk/Source/_javascript_Core/jit/JITStubsX86_64.h 2013-10-17 13:43:20 UTC (rev 157571)
@@ -171,7 +171,6 @@
"movq %rcx, " STRINGIZE_VALUE_OF(PROBE_CPU_EAX_OFFSET) "(%rbp)" "\n"
"movq 6 * " STRINGIZE_VALUE_OF(PTR_SIZE) "(%rax), %rcx" "\n"
"movq %rcx, " STRINGIZE_VALUE_OF(PROBE_CPU_ESP_OFFSET) "(%rbp)" "\n"
- "movq %rcx, " STRINGIZE_VALUE_OF(PROBE_JIT_STACK_FRAME_OFFSET) "(%rbp)" "\n"
"movq %r8, " STRINGIZE_VALUE_OF(PROBE_CPU_R8_OFFSET) "(%rbp)" "\n"
"movq %r9, " STRINGIZE_VALUE_OF(PROBE_CPU_R9_OFFSET) "(%rbp)" "\n"
