Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (176030 => 176031)
--- trunk/Source/_javascript_Core/ChangeLog 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-11-12 20:09:42 UTC (rev 176031)
@@ -1,3 +1,33 @@
+2014-11-12 Mark Lam <[email protected]>
+
+ Rename USE(MASM_PROBE) to ENABLE(MASM_PROBE).
+ <https://webkit.org/b/138661>
+
+ Reviewed by Michael Saboff.
+
+ Also move the switch for enabling the use of MASM_PROBE from _javascript_Core's
+ config.h to WTF's Platform.h. This ensures that the setting is consistently
+ applied even when building WebCore parts as well.
+
+ * assembler/ARMAssembler.h:
+ * assembler/ARMv7Assembler.h:
+ * assembler/MacroAssemblerARM.cpp:
+ * assembler/MacroAssemblerARM.h:
+ * assembler/MacroAssemblerARMv7.cpp:
+ * assembler/MacroAssemblerARMv7.h:
+ * assembler/MacroAssemblerX86.h:
+ * assembler/MacroAssemblerX86Common.cpp:
+ * assembler/MacroAssemblerX86Common.h:
+ * assembler/MacroAssemblerX86_64.h:
+ * assembler/X86Assembler.h:
+ * config.h:
+ * jit/JITStubs.h:
+ * jit/JITStubsARM.h:
+ * jit/JITStubsARMv7.h:
+ * jit/JITStubsX86.h:
+ * jit/JITStubsX86Common.h:
+ * jit/JITStubsX86_64.h:
+
2014-11-12 [email protected] <[email protected]>
[WinCairo] Incorrect names for test executables in debug mode.
Modified: trunk/Source/_javascript_Core/assembler/ARMAssembler.h (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -91,7 +91,7 @@
d31
} FPRegisterID;
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
#define FOR_EACH_CPU_REGISTER(V) \
FOR_EACH_CPU_GPREGISTER(V) \
FOR_EACH_CPU_SPECIAL_REGISTER(V) \
@@ -136,7 +136,7 @@
V(double, d13) \
V(double, d14) \
V(double, d15)
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
} // namespace ARMRegisters
class ARMAssembler {
Modified: trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -174,7 +174,7 @@
return (FPDoubleRegisterID)(reg >> 1);
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
#define FOR_EACH_CPU_REGISTER(V) \
FOR_EACH_CPU_GPREGISTER(V) \
FOR_EACH_CPU_SPECIAL_REGISTER(V) \
@@ -243,7 +243,7 @@
#define FOR_EACH_CPU_FPREGISTER_EXTENSION(V) // Nothing to add.
#endif // CPU(APPLE_ARMV7S)
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
}
class ARMv7Assembler;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.cpp 2014-11-12 20:09:42 UTC (rev 176031)
@@ -31,7 +31,7 @@
#include "MacroAssemblerARM.h"
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
#include <wtf/StdLibExtras.h>
#endif
@@ -99,7 +99,7 @@
}
#endif // CPU(ARMV5_OR_LOWER)
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
void MacroAssemblerARM::ProbeContext::dumpCPURegisters(const char* indentation)
{
@@ -160,7 +160,7 @@
m_assembler.blx(RegisterID::S0);
}
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
} // namespace JSC
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -1432,7 +1432,7 @@
UNREACHABLE_FOR_PLATFORM();
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
struct CPUState {
#define DECLARE_REGISTER(_type, _regName) \
_type _regName;
@@ -1456,7 +1456,7 @@
// For details about probe(), see comment in MacroAssemblerX86_64.h.
void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
protected:
ARMAssembler::Condition ARMCondition(RelationalCondition cond)
@@ -1513,7 +1513,7 @@
ARMAssembler::relinkCall(call.dataLocation(), destination.executableAddress());
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
inline TrustedImm32 trustedImm32FromPtr(void* ptr)
{
return TrustedImm32(TrustedImmPtr(ptr));
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.cpp 2014-11-12 20:09:42 UTC (rev 176031)
@@ -28,13 +28,13 @@
#if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
#include "MacroAssemblerARMv7.h"
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
#include <wtf/StdLibExtras.h>
#endif
namespace JSC {
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
void MacroAssemblerARMv7::ProbeContext::dumpCPURegisters(const char* indentation)
{
@@ -96,7 +96,7 @@
move(trustedImm32FromPtr(ctiMasmProbeTrampoline), RegisterID::ip);
m_assembler.blx(RegisterID::ip);
}
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
} // namespace JSC
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -1901,7 +1901,7 @@
UNREACHABLE_FOR_PLATFORM();
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
struct CPUState {
#define DECLARE_REGISTER(_type, _regName) \
_type _regName;
@@ -1925,7 +1925,7 @@
// For details about probe(), see comment in MacroAssemblerX86_64.h.
void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
protected:
ALWAYS_INLINE Jump jump()
@@ -2037,7 +2037,7 @@
ARMv7Assembler::relinkCall(call.dataLocation(), destination.executableAddress());
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
inline TrustedImm32 trustedImm32FromPtr(void* ptr)
{
return TrustedImm32(TrustedImmPtr(ptr));
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -30,7 +30,7 @@
#include "MacroAssemblerX86Common.h"
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
#include <wtf/StdLibExtras.h>
#endif
@@ -349,10 +349,10 @@
X86Assembler::revertJumpTo_cmpl_im_force32(instructionStart.executableAddress(), initialValue, 0, address.base);
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
// For details about probe(), see comment in MacroAssemblerX86_64.h.
void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
private:
friend class LinkBuffer;
@@ -373,7 +373,7 @@
X86Assembler::relinkCall(call.dataLocation(), destination.executableAddress());
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
inline TrustedImm32 trustedImm32FromPtr(void* ptr)
{
return TrustedImm32(TrustedImmPtr(ptr));
@@ -391,7 +391,7 @@
#endif
};
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
extern "C" void ctiMasmProbeTrampoline();
@@ -410,7 +410,7 @@
move(trustedImm32FromPtr(ctiMasmProbeTrampoline), RegisterID::eax);
call(RegisterID::eax);
}
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
} // namespace JSC
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.cpp 2014-11-12 20:09:42 UTC (rev 176031)
@@ -30,7 +30,7 @@
namespace JSC {
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
void MacroAssemblerX86Common::ProbeContext::dumpCPURegisters(const char* indentation)
{
@@ -76,7 +76,7 @@
dataLogF("%s}\n", indentation);
}
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
#if CPU(X86) && !OS(MAC_OS_X)
MacroAssemblerX86Common::SSE2CheckState MacroAssemblerX86Common::s_sse2CheckState = NotCheckedSSE2;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -1469,7 +1469,7 @@
return X86Assembler::maxJumpReplacementSize();
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
struct CPUState {
#define DECLARE_REGISTER(_type, _regName) \
_type _regName;
@@ -1490,7 +1490,7 @@
private:
void dumpCPURegisters(const char* indentation);
};
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
protected:
X86Assembler::Condition x86Condition(RelationalCondition cond)
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86_64.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -30,7 +30,7 @@
#include "MacroAssemblerX86Common.h"
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
#include <wtf/StdLibExtras.h>
#endif
@@ -840,7 +840,7 @@
X86Assembler::revertJumpTo_movq_i64r(instructionStart.executableAddress(), reinterpret_cast<intptr_t>(initialValue), scratchRegister);
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
// This function emits code to preserve the CPUState (e.g. registers),
// call a user supplied probe function, and restore the CPUState before
// continuing with other JIT generated code.
@@ -858,7 +858,7 @@
// of the call to the user probe function.
void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
private:
friend class LinkBuffer;
@@ -882,7 +882,7 @@
X86Assembler::repatchPointer(call.dataLabelPtrAtOffset(-REPTACH_OFFSET_CALL_R11).dataLocation(), destination.executableAddress());
}
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
inline TrustedImm64 trustedImm64FromPtr(void* ptr)
{
return TrustedImm64(TrustedImmPtr(ptr));
@@ -900,7 +900,7 @@
#endif
};
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
extern "C" void ctiMasmProbeTrampoline();
@@ -942,7 +942,7 @@
move(trustedImm64FromPtr(ctiMasmProbeTrampoline), RegisterID::eax);
call(RegisterID::eax);
}
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
} // namespace JSC
Modified: trunk/Source/_javascript_Core/assembler/X86Assembler.h (176030 => 176031)
--- trunk/Source/_javascript_Core/assembler/X86Assembler.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/assembler/X86Assembler.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -35,7 +35,7 @@
#include <wtf/Assertions.h>
#include <wtf/Vector.h>
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
#include <xmmintrin.h>
#endif
@@ -88,7 +88,7 @@
#endif
} XMMRegisterID;
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
#define FOR_EACH_CPU_REGISTER(V) \
FOR_EACH_CPU_GPREGISTER(V) \
FOR_EACH_CPU_SPECIAL_REGISTER(V) \
@@ -132,7 +132,7 @@
V(void*, r14) \
V(void*, r15)
#endif // CPU(X86_64)
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
}
class X86Assembler {
Modified: trunk/Source/_javascript_Core/config.h (176030 => 176031)
--- trunk/Source/_javascript_Core/config.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/config.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -64,7 +64,3 @@
#define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
#endif
-// Enable the following if you want to use the MacroAssembler::probe() facility
-// to do JIT debugging.
-#define WTF_USE_MASM_PROBE 0
-
Modified: trunk/Source/_javascript_Core/jit/JITStubs.h (176030 => 176031)
--- trunk/Source/_javascript_Core/jit/JITStubs.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/jit/JITStubs.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -46,7 +46,7 @@
}
#endif
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
extern "C" void ctiMasmProbeTrampoline();
#endif
Modified: trunk/Source/_javascript_Core/jit/JITStubsARM.h (176030 => 176031)
--- trunk/Source/_javascript_Core/jit/JITStubsARM.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/jit/JITStubsARM.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -43,7 +43,7 @@
#if COMPILER(GCC)
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
// The following are offsets for MacroAssembler::ProbeContext fields accessed
// by the ctiMasmProbeTrampoline stub.
@@ -143,10 +143,10 @@
COMPILE_ASSERT(sizeof(MacroAssembler::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
#undef PROBE_OFFSETOF
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
asm (
".text" "\n"
".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
@@ -291,7 +291,7 @@
"pop { pc }" "\n"
);
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
Modified: trunk/Source/_javascript_Core/jit/JITStubsARMv7.h (176030 => 176031)
--- trunk/Source/_javascript_Core/jit/JITStubsARMv7.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/jit/JITStubsARMv7.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -43,7 +43,7 @@
#if COMPILER(GCC)
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
// The following are offsets for MacroAssembler::ProbeContext fields accessed
// by the ctiMasmProbeTrampoline stub.
@@ -342,7 +342,7 @@
"pop { pc }" "\n"
);
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
#endif // COMPILER(GCC)
Modified: trunk/Source/_javascript_Core/jit/JITStubsX86.h (176030 => 176031)
--- trunk/Source/_javascript_Core/jit/JITStubsX86.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/jit/JITStubsX86.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -45,7 +45,7 @@
#if COMPILER(GCC)
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
asm (
".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
HIDE_SYMBOL(ctiMasmProbeTrampoline) "\n"
@@ -196,7 +196,7 @@
"popl %ebp" "\n"
"ret" "\n"
);
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
#endif // COMPILER(GCC)
Modified: trunk/Source/_javascript_Core/jit/JITStubsX86Common.h (176030 => 176031)
--- trunk/Source/_javascript_Core/jit/JITStubsX86Common.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/jit/JITStubsX86Common.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -36,7 +36,7 @@
#if COMPILER(GCC)
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
// The following are offsets for MacroAssembler::ProbeContext fields accessed
// by the ctiMasmProbeTrampoline stub.
@@ -139,7 +139,7 @@
COMPILE_ASSERT(!(PROBE_OFFSETOF(cpu.xmm0) % 16), ProbeContext_xmm0_offset_not_aligned_properly);
#undef PROBE_OFFSETOF
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
#endif // COMPILER(GCC)
Modified: trunk/Source/_javascript_Core/jit/JITStubsX86_64.h (176030 => 176031)
--- trunk/Source/_javascript_Core/jit/JITStubsX86_64.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/_javascript_Core/jit/JITStubsX86_64.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -45,7 +45,7 @@
#if COMPILER(GCC)
-#if USE(MASM_PROBE)
+#if ENABLE(MASM_PROBE)
asm (
".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
HIDE_SYMBOL(ctiMasmProbeTrampoline) "\n"
@@ -209,7 +209,7 @@
"popq %rbp" "\n"
"ret" "\n"
);
-#endif // USE(MASM_PROBE)
+#endif // ENABLE(MASM_PROBE)
#endif // COMPILER(GCC)
Modified: trunk/Source/WTF/ChangeLog (176030 => 176031)
--- trunk/Source/WTF/ChangeLog 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/WTF/ChangeLog 2014-11-12 20:09:42 UTC (rev 176031)
@@ -1,3 +1,16 @@
+2014-11-12 Mark Lam <[email protected]>
+
+ Rename USE(MASM_PROBE) to ENABLE(MASM_PROBE).
+ <https://webkit.org/b/138661>
+
+ Reviewed by Michael Saboff.
+
+ Also move the switch for enabling the use of MASM_PROBE from _javascript_Core's
+ config.h to WTF's Platform.h. This ensures that the setting is consistently
+ applied even when building WebCore parts as well.
+
+ * wtf/Platform.h:
+
2014-11-09 Antti Koivisto <[email protected]>
Remove BloomFilter size limit
Modified: trunk/Source/WTF/wtf/Platform.h (176030 => 176031)
--- trunk/Source/WTF/wtf/Platform.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/WTF/wtf/Platform.h 2014-11-12 20:09:42 UTC (rev 176031)
@@ -839,6 +839,12 @@
#endif
#endif
+#if ENABLE(JIT)
+/* Enable the following if you want to use the MacroAssembler::probe() facility
+ to do JIT debugging. */
+#define ENABLE_MASM_PROBE 0
+#endif
+
/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
On non-Windows x86-64, iOS, and ARM64 we use a single fixed mmap, on other platforms we mmap on demand. */
#if ENABLE(ASSEMBLER)
