<!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>[191202] 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/191202">191202</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-10-16 13:36:44 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add MacroAssembler::callProbe() for supporting lambda JIT probes.
https://bugs.webkit.org/show_bug.cgi?id=150186
Reviewed by Geoffrey Garen.
With callProbe(), we can now make probes that are lambdas. For example, we can
now conveniently add probes like so:
// When you know exactly which register you want to inspect:
jit.callProbe([] (MacroAssembler::ProbeContext* context) {
intptr_t value = reinterpret_cast<intptr_t>(context->cpu.eax);
dataLogF("eax %p\n", context->cpu.eax); // Inspect the register.
ASSERT(value > 10); // Add test code for debugging.
});
// When you want to inspect whichever register the JIT allocated:
auto reg = op1.gpr();
jit.callProbe([reg] (MacroAssembler::ProbeContext* context) {
intptr_t value = reinterpret_cast<intptr_t>(context->gpr(reg));
dataLogF("reg %s: %ld\n", context->gprName(reg), value);
ASSERT(value > 10);
});
callProbe() is only meant to be used for debugging sessions. It is not
appropriate to use it in permanent code (even for debug builds).
This is because:
1. The probe mechanism saves and restores all (and I really mean "all")
registers, and is inherently slow.
2. callProbe() currently works by allocating (via new) a std::function to
guarantee that it is persisted for the duration that the JIT generated code is
live. We don't currently delete it ever i.e. it leaks a bit of memory each
time the JIT generates code that contains such a lambda probe.
These limitations are acceptable for a debugging session (assuming you're not
debugging a memory leak), but not for deployment code. If there's a need, we can
plug that leak in another patch.
* assembler/AbstractMacroAssembler.h:
(JSC::AbstractMacroAssembler::CPUState::fpr):
- Removed an unnecessary empty line.
(JSC::AbstractMacroAssembler::ProbeContext::gpr):
(JSC::AbstractMacroAssembler::ProbeContext::fpr):
(JSC::AbstractMacroAssembler::ProbeContext::gprName):
(JSC::AbstractMacroAssembler::ProbeContext::fprName):
- Added some convenience functions that will make using the probe mechanism
easier.
* assembler/MacroAssembler.cpp:
(JSC::StdFunctionData::StdFunctionData):
(JSC::stdFunctionCallback):
(JSC::MacroAssembler::callProbe):
* assembler/MacroAssembler.h:</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191201 => 191202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-16 20:29:41 UTC (rev 191201)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-16 20:36:44 UTC (rev 191202)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2015-10-16 Mark Lam <mark.lam@apple.com>
+
+ Add MacroAssembler::callProbe() for supporting lambda JIT probes.
+ https://bugs.webkit.org/show_bug.cgi?id=150186
+
+ Reviewed by Geoffrey Garen.
+
+ With callProbe(), we can now make probes that are lambdas. For example, we can
+ now conveniently add probes like so:
+
+ // When you know exactly which register you want to inspect:
+ jit.callProbe([] (MacroAssembler::ProbeContext* context) {
+ intptr_t value = reinterpret_cast<intptr_t>(context->cpu.eax);
+ dataLogF("eax %p\n", context->cpu.eax); // Inspect the register.
+ ASSERT(value > 10); // Add test code for debugging.
+ });
+
+ // When you want to inspect whichever register the JIT allocated:
+ auto reg = op1.gpr();
+ jit.callProbe([reg] (MacroAssembler::ProbeContext* context) {
+ intptr_t value = reinterpret_cast<intptr_t>(context->gpr(reg));
+ dataLogF("reg %s: %ld\n", context->gprName(reg), value);
+ ASSERT(value > 10);
+ });
+
+ callProbe() is only meant to be used for debugging sessions. It is not
+ appropriate to use it in permanent code (even for debug builds).
+ This is because:
+ 1. The probe mechanism saves and restores all (and I really mean "all")
+ registers, and is inherently slow.
+ 2. callProbe() currently works by allocating (via new) a std::function to
+ guarantee that it is persisted for the duration that the JIT generated code is
+ live. We don't currently delete it ever i.e. it leaks a bit of memory each
+ time the JIT generates code that contains such a lambda probe.
+
+ These limitations are acceptable for a debugging session (assuming you're not
+ debugging a memory leak), but not for deployment code. If there's a need, we can
+ plug that leak in another patch.
+
+ * assembler/AbstractMacroAssembler.h:
+ (JSC::AbstractMacroAssembler::CPUState::fpr):
+ - Removed an unnecessary empty line.
+ (JSC::AbstractMacroAssembler::ProbeContext::gpr):
+ (JSC::AbstractMacroAssembler::ProbeContext::fpr):
+ (JSC::AbstractMacroAssembler::ProbeContext::gprName):
+ (JSC::AbstractMacroAssembler::ProbeContext::fprName):
+ - Added some convenience functions that will make using the probe mechanism
+ easier.
+
+ * assembler/MacroAssembler.cpp:
+ (JSC::StdFunctionData::StdFunctionData):
+ (JSC::stdFunctionCallback):
+ (JSC::MacroAssembler::callProbe):
+ * assembler/MacroAssembler.h:
+
</ins><span class="cx"> 2015-10-16 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unused StructureRareData::m_cachedGenericPropertyNameEnumerator.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerAbstractMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h (191201 => 191202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2015-10-16 20:29:41 UTC (rev 191201)
+++ trunk/Source/JavaScriptCore/assembler/AbstractMacroAssembler.h 2015-10-16 20:36:44 UTC (rev 191202)
</span><span class="lines">@@ -903,7 +903,6 @@
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct ProbeContext;
</span><span class="lines">@@ -914,6 +913,12 @@
</span><span class="cx"> void* arg1;
</span><span class="cx"> void* arg2;
</span><span class="cx"> CPUState cpu;
</span><ins>+
+ // Convenience methods:
+ void* gpr(RegisterID regID) { return cpu.gpr(regID); }
+ double fpr(FPRegisterID regID) { return cpu.gpr(regID); }
+ const char* gprName(RegisterID regID) { return cpu.gprName(regID); }
+ const char* fprName(FPRegisterID regID) { return cpu.fprName(regID); }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // This function emits code to preserve the CPUState (e.g. registers),
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp (191201 => 191202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp 2015-10-16 20:29:41 UTC (rev 191201)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.cpp 2015-10-16 20:36:44 UTC (rev 191202)
</span><span class="lines">@@ -32,6 +32,19 @@
</span><span class="cx">
</span><span class="cx"> const double MacroAssembler::twoToThe32 = (double)0x100000000ull;
</span><span class="cx">
</span><ins>+#if ENABLE(MASM_PROBE)
+static void stdFunctionCallback(MacroAssembler::ProbeContext* context)
+{
+ auto func = static_cast<const std::function<void (MacroAssembler::ProbeContext*)>*>(context->arg1);
+ (*func)(context);
+}
+
+void MacroAssembler::callProbe(std::function<void (MacroAssembler::ProbeContext*)> func)
+{
+ probe(stdFunctionCallback, new std::function<void (MacroAssembler::ProbeContext*)>(func));
+}
+#endif // ENABLE(MASM_PROBE)
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(ASSEMBLER)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssembler.h (191201 => 191202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2015-10-16 20:29:41 UTC (rev 191201)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssembler.h 2015-10-16 20:36:44 UTC (rev 191202)
</span><span class="lines">@@ -1589,6 +1589,8 @@
</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><ins>+
+ void callProbe(std::function<void (ProbeContext*)>);
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>