<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[176031] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/176031">176031</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2014-11-12 12:09:42 -0800 (Wed, 12 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 JavaScriptCore's
config.h to WTF's Platform.h. This ensures that the setting is consistently
applied even when building WebCore parts as well.
Source/JavaScriptCore:
* 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:
Source/WTF:
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMAssemblerh">trunk/Source/JavaScriptCore/assembler/ARMAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerARMv7Assemblerh">trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMcpp">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7cpp">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commoncpp">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerX86Assemblerh">trunk/Source/JavaScriptCore/assembler/X86Assembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreconfigh">trunk/Source/JavaScriptCore/config.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITStubsh">trunk/Source/JavaScriptCore/jit/JITStubs.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITStubsARMh">trunk/Source/JavaScriptCore/jit/JITStubsARM.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITStubsARMv7h">trunk/Source/JavaScriptCore/jit/JITStubsARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITStubsX86h">trunk/Source/JavaScriptCore/jit/JITStubsX86.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITStubsX86Commonh">trunk/Source/JavaScriptCore/jit/JITStubsX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITStubsX86_64h">trunk/Source/JavaScriptCore/jit/JITStubsX86_64.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-11-12 Mark Lam <mark.lam@apple.com>
+
+ 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 JavaScriptCore'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:
+
</ins><span class="cx"> 2014-11-12 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Incorrect names for test executables in debug mode.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMAssembler.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/ARMAssembler.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> d31
</span><span class="cx"> } FPRegisterID;
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> #define FOR_EACH_CPU_REGISTER(V) \
</span><span class="cx"> FOR_EACH_CPU_GPREGISTER(V) \
</span><span class="cx"> FOR_EACH_CPU_SPECIAL_REGISTER(V) \
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> V(double, d13) \
</span><span class="cx"> V(double, d14) \
</span><span class="cx"> V(double, d15)
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx"> } // namespace ARMRegisters
</span><span class="cx">
</span><span class="cx"> class ARMAssembler {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerARMv7Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/ARMv7Assembler.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> return (FPDoubleRegisterID)(reg >> 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> #define FOR_EACH_CPU_REGISTER(V) \
</span><span class="cx"> FOR_EACH_CPU_GPREGISTER(V) \
</span><span class="cx"> FOR_EACH_CPU_SPECIAL_REGISTER(V) \
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> #define FOR_EACH_CPU_FPREGISTER_EXTENSION(V) // Nothing to add.
</span><span class="cx"> #endif // CPU(APPLE_ARMV7S)
</span><span class="cx">
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class ARMv7Assembler;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MacroAssemblerARM.h"
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // CPU(ARMV5_OR_LOWER)
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> void MacroAssemblerARM::ProbeContext::dumpCPURegisters(const char* indentation)
</span><span class="cx"> {
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> m_assembler.blx(RegisterID::S0);
</span><span class="cx">
</span><span class="cx"> }
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -1432,7 +1432,7 @@
</span><span class="cx"> UNREACHABLE_FOR_PLATFORM();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> struct CPUState {
</span><span class="cx"> #define DECLARE_REGISTER(_type, _regName) \
</span><span class="cx"> _type _regName;
</span><span class="lines">@@ -1456,7 +1456,7 @@
</span><span class="cx">
</span><span class="cx"> // For details about probe(), see comment in MacroAssemblerX86_64.h.
</span><span class="cx"> void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> ARMAssembler::Condition ARMCondition(RelationalCondition cond)
</span><span class="lines">@@ -1513,7 +1513,7 @@
</span><span class="cx"> ARMAssembler::relinkCall(call.dataLocation(), destination.executableAddress());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> inline TrustedImm32 trustedImm32FromPtr(void* ptr)
</span><span class="cx"> {
</span><span class="cx"> return TrustedImm32(TrustedImmPtr(ptr));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.cpp 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -28,13 +28,13 @@
</span><span class="cx"> #if ENABLE(ASSEMBLER) && CPU(ARM_THUMB2)
</span><span class="cx"> #include "MacroAssemblerARMv7.h"
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> void MacroAssemblerARMv7::ProbeContext::dumpCPURegisters(const char* indentation)
</span><span class="cx"> {
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> move(trustedImm32FromPtr(ctiMasmProbeTrampoline), RegisterID::ip);
</span><span class="cx"> m_assembler.blx(RegisterID::ip);
</span><span class="cx"> }
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -1901,7 +1901,7 @@
</span><span class="cx"> UNREACHABLE_FOR_PLATFORM();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> struct CPUState {
</span><span class="cx"> #define DECLARE_REGISTER(_type, _regName) \
</span><span class="cx"> _type _regName;
</span><span class="lines">@@ -1925,7 +1925,7 @@
</span><span class="cx">
</span><span class="cx"> // For details about probe(), see comment in MacroAssemblerX86_64.h.
</span><span class="cx"> void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> ALWAYS_INLINE Jump jump()
</span><span class="lines">@@ -2037,7 +2037,7 @@
</span><span class="cx"> ARMv7Assembler::relinkCall(call.dataLocation(), destination.executableAddress());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> inline TrustedImm32 trustedImm32FromPtr(void* ptr)
</span><span class="cx"> {
</span><span class="cx"> return TrustedImm32(TrustedImmPtr(ptr));
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MacroAssemblerX86Common.h"
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -349,10 +349,10 @@
</span><span class="cx"> X86Assembler::revertJumpTo_cmpl_im_force32(instructionStart.executableAddress(), initialValue, 0, address.base);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> // For details about probe(), see comment in MacroAssemblerX86_64.h.
</span><span class="cx"> void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class LinkBuffer;
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> X86Assembler::relinkCall(call.dataLocation(), destination.executableAddress());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> inline TrustedImm32 trustedImm32FromPtr(void* ptr)
</span><span class="cx"> {
</span><span class="cx"> return TrustedImm32(TrustedImmPtr(ptr));
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> extern "C" void ctiMasmProbeTrampoline();
</span><span class="cx">
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> move(trustedImm32FromPtr(ctiMasmProbeTrampoline), RegisterID::eax);
</span><span class="cx"> call(RegisterID::eax);
</span><span class="cx"> }
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.cpp 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> void MacroAssemblerX86Common::ProbeContext::dumpCPURegisters(const char* indentation)
</span><span class="cx"> {
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> dataLogF("%s}\n", indentation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> #if CPU(X86) && !OS(MAC_OS_X)
</span><span class="cx"> MacroAssemblerX86Common::SSE2CheckState MacroAssemblerX86Common::s_sse2CheckState = NotCheckedSSE2;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -1469,7 +1469,7 @@
</span><span class="cx"> return X86Assembler::maxJumpReplacementSize();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> struct CPUState {
</span><span class="cx"> #define DECLARE_REGISTER(_type, _regName) \
</span><span class="cx"> _type _regName;
</span><span class="lines">@@ -1490,7 +1490,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void dumpCPURegisters(const char* indentation);
</span><span class="cx"> };
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> X86Assembler::Condition x86Condition(RelationalCondition cond)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86_64.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "MacroAssemblerX86Common.h"
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -840,7 +840,7 @@
</span><span class="cx"> X86Assembler::revertJumpTo_movq_i64r(instructionStart.executableAddress(), reinterpret_cast<intptr_t>(initialValue), scratchRegister);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> // This function emits code to preserve the CPUState (e.g. registers),
</span><span class="cx"> // call a user supplied probe function, and restore the CPUState before
</span><span class="cx"> // continuing with other JIT generated code.
</span><span class="lines">@@ -858,7 +858,7 @@
</span><span class="cx"> // of the call to the user probe function.
</span><span class="cx">
</span><span class="cx"> void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class LinkBuffer;
</span><span class="lines">@@ -882,7 +882,7 @@
</span><span class="cx"> X86Assembler::repatchPointer(call.dataLabelPtrAtOffset(-REPTACH_OFFSET_CALL_R11).dataLocation(), destination.executableAddress());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> inline TrustedImm64 trustedImm64FromPtr(void* ptr)
</span><span class="cx"> {
</span><span class="cx"> return TrustedImm64(TrustedImmPtr(ptr));
</span><span class="lines">@@ -900,7 +900,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> extern "C" void ctiMasmProbeTrampoline();
</span><span class="cx">
</span><span class="lines">@@ -942,7 +942,7 @@
</span><span class="cx"> move(trustedImm64FromPtr(ctiMasmProbeTrampoline), RegisterID::eax);
</span><span class="cx"> call(RegisterID::eax);
</span><span class="cx"> }
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerX86Assemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/X86Assembler.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/assembler/X86Assembler.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> #include <xmmintrin.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> } XMMRegisterID;
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> #define FOR_EACH_CPU_REGISTER(V) \
</span><span class="cx"> FOR_EACH_CPU_GPREGISTER(V) \
</span><span class="cx"> FOR_EACH_CPU_SPECIAL_REGISTER(V) \
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> V(void*, r14) \
</span><span class="cx"> V(void*, r15)
</span><span class="cx"> #endif // CPU(X86_64)
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class X86Assembler {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/config.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/config.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/config.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -64,7 +64,3 @@
</span><span class="cx"> #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// Enable the following if you want to use the MacroAssembler::probe() facility
-// to do JIT debugging.
-#define WTF_USE_MASM_PROBE 0
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITStubsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITStubs.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITStubs.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/jit/JITStubs.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> extern "C" void ctiMasmProbeTrampoline();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITStubsARMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITStubsARM.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITStubsARM.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/jit/JITStubsARM.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC)
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> // The following are offsets for MacroAssembler::ProbeContext fields accessed
</span><span class="cx"> // by the ctiMasmProbeTrampoline stub.
</span><span class="cx">
</span><span class="lines">@@ -143,10 +143,10 @@
</span><span class="cx"> COMPILE_ASSERT(sizeof(MacroAssembler::ProbeContext) == PROBE_SIZE, ProbeContext_size_matches_ctiMasmProbeTrampoline);
</span><span class="cx"> #undef PROBE_OFFSETOF
</span><span class="cx">
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> asm (
</span><span class="cx"> ".text" "\n"
</span><span class="cx"> ".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx">
</span><span class="cx"> "pop { pc }" "\n"
</span><span class="cx"> );
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITStubsARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITStubsARMv7.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITStubsARMv7.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/jit/JITStubsARMv7.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC)
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> // The following are offsets for MacroAssembler::ProbeContext fields accessed
</span><span class="cx"> // by the ctiMasmProbeTrampoline stub.
</span><span class="cx">
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> "pop { pc }" "\n"
</span><span class="cx"> );
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> #endif // COMPILER(GCC)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITStubsX86h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITStubsX86.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITStubsX86.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/jit/JITStubsX86.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC)
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> asm (
</span><span class="cx"> ".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
</span><span class="cx"> HIDE_SYMBOL(ctiMasmProbeTrampoline) "\n"
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx"> "popl %ebp" "\n"
</span><span class="cx"> "ret" "\n"
</span><span class="cx"> );
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> #endif // COMPILER(GCC)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITStubsX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITStubsX86Common.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITStubsX86Common.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/jit/JITStubsX86Common.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC)
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> // The following are offsets for MacroAssembler::ProbeContext fields accessed
</span><span class="cx"> // by the ctiMasmProbeTrampoline stub.
</span><span class="cx">
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> COMPILE_ASSERT(!(PROBE_OFFSETOF(cpu.xmm0) % 16), ProbeContext_xmm0_offset_not_aligned_properly);
</span><span class="cx"> #undef PROBE_OFFSETOF
</span><span class="cx">
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> #endif // COMPILER(GCC)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITStubsX86_64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITStubsX86_64.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITStubsX86_64.h 2014-11-12 20:07:54 UTC (rev 176030)
+++ trunk/Source/JavaScriptCore/jit/JITStubsX86_64.h 2014-11-12 20:09:42 UTC (rev 176031)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> #if COMPILER(GCC)
</span><span class="cx">
</span><del>-#if USE(MASM_PROBE)
</del><ins>+#if ENABLE(MASM_PROBE)
</ins><span class="cx"> asm (
</span><span class="cx"> ".globl " SYMBOL_STRING(ctiMasmProbeTrampoline) "\n"
</span><span class="cx"> HIDE_SYMBOL(ctiMasmProbeTrampoline) "\n"
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> "popq %rbp" "\n"
</span><span class="cx"> "ret" "\n"
</span><span class="cx"> );
</span><del>-#endif // USE(MASM_PROBE)
</del><ins>+#endif // ENABLE(MASM_PROBE)
</ins><span class="cx">
</span><span class="cx"> #endif // COMPILER(GCC)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-11-12 Mark Lam <mark.lam@apple.com>
+
+ 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 JavaScriptCore'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:
+
</ins><span class="cx"> 2014-11-09 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove BloomFilter size limit
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (176030 => 176031)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -839,6 +839,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#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
+
</ins><span class="cx"> /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in.
</span><span class="cx"> On non-Windows x86-64, iOS, and ARM64 we use a single fixed mmap, on other platforms we mmap on demand. */
</span><span class="cx"> #if ENABLE(ASSEMBLER)
</span></span></pre>
</div>
</div>
</body>
</html>