<!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>[191700] trunk/Source/JavaScriptCore</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/191700">191700</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-10-28 15:59:03 -0700 (Wed, 28 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename MacroAssembler::callProbe() to probe().
https://bugs.webkit.org/show_bug.cgi?id=150641
Reviewed by Saam Barati.
To do this, I needed to disambiguate between the low-level probe() from the
high-level version that takes a std::function. I did this by changing the low-
level version to not take default args anymore.
* assembler/AbstractMacroAssembler.h:
* assembler/MacroAssembler.cpp:
(JSC::stdFunctionCallback):
(JSC::MacroAssembler::probe):
(JSC::MacroAssembler::callProbe): Deleted.
* assembler/MacroAssembler.h:
(JSC::MacroAssembler::urshift32):
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::repatchCall):
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::repatchCall):
* assembler/MacroAssemblerARMv7.h:
(JSC::MacroAssemblerARMv7::repatchCall):
* assembler/MacroAssemblerPrinter.h:
(JSC::MacroAssemblerPrinter::print):
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::maxJumpReplacementSize):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblercpp">trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerh">trunk/Source/JavaScriptCore/assembler/MacroAssembler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerPrinterh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191699 => 191700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-28 22:53:29 UTC (rev 191699)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-28 22:59:03 UTC (rev 191700)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-10-28 Mark Lam <mark.lam@apple.com>
+
+ Rename MacroAssembler::callProbe() to probe().
+ https://bugs.webkit.org/show_bug.cgi?id=150641
+
+ Reviewed by Saam Barati.
+
+ To do this, I needed to disambiguate between the low-level probe() from the
+ high-level version that takes a std::function. I did this by changing the low-
+ level version to not take default args anymore.
+
+ * assembler/AbstractMacroAssembler.h:
+ * assembler/MacroAssembler.cpp:
+ (JSC::stdFunctionCallback):
+ (JSC::MacroAssembler::probe):
+ (JSC::MacroAssembler::callProbe): Deleted.
+ * assembler/MacroAssembler.h:
+ (JSC::MacroAssembler::urshift32):
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::repatchCall):
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::repatchCall):
+ * assembler/MacroAssemblerARMv7.h:
+ (JSC::MacroAssemblerARMv7::repatchCall):
+ * assembler/MacroAssemblerPrinter.h:
+ (JSC::MacroAssemblerPrinter::print):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::maxJumpReplacementSize):
+
</ins><span class="cx"> 2015-10-28 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: jsmin.py mistakenly removes whitespace from template literal strings
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h (191699 => 191700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2015-10-28 22:53:29 UTC (rev 191699)
+++ trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2015-10-28 22:59:03 UTC (rev 191700)
</span><span class="lines">@@ -940,7 +940,7 @@
</span><span class="cx"> // Note: probe() should be implemented by the target specific MacroAssembler.
</span><span class="cx"> // This prototype is only provided here to document the interface.
</span><span class="cx">
</span><del>- void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
</del><ins>+ void probe(ProbeFunction, void* arg1, void* arg2);
</ins><span class="cx">
</span><span class="cx"> #endif // ENABLE(MASM_PROBE)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp (191699 => 191700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp 2015-10-28 22:53:29 UTC (rev 191699)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp 2015-10-28 22:59:03 UTC (rev 191700)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx"> (*func)(context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MacroAssembler::callProbe(std::function<void (MacroAssembler::ProbeContext*)> func)
</del><ins>+void MacroAssembler::probe(std::function<void (MacroAssembler::ProbeContext*)> func)
</ins><span class="cx"> {
</span><del>- probe(stdFunctionCallback, new std::function<void (MacroAssembler::ProbeContext*)>(func));
</del><ins>+ probe(stdFunctionCallback, new std::function<void (MacroAssembler::ProbeContext*)>(func), 0);
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(MASM_PROBE)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.h (191699 => 191700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2015-10-28 22:53:29 UTC (rev 191699)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2015-10-28 22:59:03 UTC (rev 191700)
</span><span class="lines">@@ -1585,12 +1585,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MASM_PROBE)
</span><ins>+ using MacroAssemblerBase::probe;
+
</ins><span class="cx"> // Let's you print from your JIT generated code.
</span><span class="cx"> // See comments in MacroAssemblerPrinter.h for examples of how to use this.
</span><span class="cx"> template<typename... Arguments>
</span><span class="cx"> void print(Arguments... args);
</span><span class="cx">
</span><del>- void callProbe(std::function<void (ProbeContext*)>);
</del><ins>+ void probe(std::function<void (ProbeContext*)>);
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (191699 => 191700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2015-10-28 22:53:29 UTC (rev 191699)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2015-10-28 22:59:03 UTC (rev 191700)
</span><span class="lines">@@ -1448,7 +1448,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MASM_PROBE)
</span><del>- void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
</del><ins>+ void probe(ProbeFunction, void* arg1, void* arg2);
</ins><span class="cx"> #endif // ENABLE(MASM_PROBE)
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (191699 => 191700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2015-10-28 22:53:29 UTC (rev 191699)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2015-10-28 22:59:03 UTC (rev 191700)
</span><span class="lines">@@ -2533,7 +2533,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MASM_PROBE)
</span><del>- void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
</del><ins>+ void probe(ProbeFunction, void* arg1, void* arg2);
</ins><span class="cx"> #endif // ENABLE(MASM_PROBE)
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (191699 => 191700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2015-10-28 22:53:29 UTC (rev 191699)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2015-10-28 22:59:03 UTC (rev 191700)
</span><span class="lines">@@ -1918,7 +1918,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MASM_PROBE)
</span><del>- void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
</del><ins>+ void probe(ProbeFunction, void* arg1, void* arg2);
</ins><span class="cx"> #endif // ENABLE(MASM_PROBE)
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerPrinterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h (191699 => 191700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h 2015-10-28 22:53:29 UTC (rev 191699)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerPrinter.h 2015-10-28 22:59:03 UTC (rev 191700)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto argsList = std::make_unique<PrintArgsList>();
</span><span class="cx"> appendPrintArg(argsList.get(), args...);
</span><del>- masm->probe(printCallback, argsList.release());
</del><ins>+ masm->probe(printCallback, argsList.release(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (191699 => 191700)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2015-10-28 22:53:29 UTC (rev 191699)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2015-10-28 22:59:03 UTC (rev 191700)
</span><span class="lines">@@ -1496,7 +1496,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MASM_PROBE)
</span><del>- void probe(ProbeFunction, void* arg1 = 0, void* arg2 = 0);
</del><ins>+ void probe(ProbeFunction, void* arg1, void* arg2);
</ins><span class="cx"> #endif // ENABLE(MASM_PROBE)
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre>
</div>
</div>
</body>
</html>