<!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>[160688] 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/160688">160688</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 18:43:26 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid indirect function calls for custom getters
https://bugs.webkit.org/show_bug.cgi?id=125821
Reviewed by Mark Hahnenberg.
Rather than invoking a helper function to perform an indirect call
through a function pointer, just have the JIT call the function directly.
Unfortunately this only works in JSVALUE64 at the moment as there
is not an obvious way to pass two EncodedJSValues uniformly over
the various effected JITs.
* jit/CCallHelpers.h:
(JSC::CCallHelpers::setupArguments):
* jit/Repatch.cpp:
(JSC::generateProtoChainAccessStub):
(JSC::tryBuildGetByIDList):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitCCallHelpersh">trunk/Source/JavaScriptCore/jit/CCallHelpers.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitRepatchcpp">trunk/Source/JavaScriptCore/jit/Repatch.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160687 => 160688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-17 02:27:01 UTC (rev 160687)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-17 02:43:26 UTC (rev 160688)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-12-16 Oliver Hunt <oliver@apple.com>
+
+ Avoid indirect function calls for custom getters
+ https://bugs.webkit.org/show_bug.cgi?id=125821
+
+ Reviewed by Mark Hahnenberg.
+
+ Rather than invoking a helper function to perform an indirect call
+ through a function pointer, just have the JIT call the function directly.
+
+ Unfortunately this only works in JSVALUE64 at the moment as there
+ is not an obvious way to pass two EncodedJSValues uniformly over
+ the various effected JITs.
+
+ * jit/CCallHelpers.h:
+ (JSC::CCallHelpers::setupArguments):
+ * jit/Repatch.cpp:
+ (JSC::generateProtoChainAccessStub):
+ (JSC::tryBuildGetByIDList):
+
</ins><span class="cx"> 2013-12-16 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix some whitespace issues in inspector code
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitCCallHelpersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/CCallHelpers.h (160687 => 160688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/CCallHelpers.h 2013-12-17 02:27:01 UTC (rev 160687)
+++ trunk/Source/JavaScriptCore/jit/CCallHelpers.h 2013-12-17 02:43:26 UTC (rev 160688)
</span><span class="lines">@@ -956,6 +956,12 @@
</span><span class="cx"> move(arg4, GPRInfo::argumentGPR3);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ALWAYS_INLINE void setupArguments(GPRReg arg1, GPRReg arg2, GPRReg arg3, TrustedImmPtr arg4)
+ {
+ setupThreeStubArgsGPR<GPRInfo::argumentGPR0, GPRInfo::argumentGPR1, GPRInfo::argumentGPR2>(arg1, arg2, arg3);
+ move(arg4, GPRInfo::argumentGPR3);
+ }
+
</ins><span class="cx"> ALWAYS_INLINE void setupArguments(GPRReg arg1, TrustedImmPtr arg2, GPRReg arg3, TrustedImmPtr arg4)
</span><span class="cx"> {
</span><span class="cx"> setupTwoStubArgsGPR<GPRInfo::argumentGPR0, GPRInfo::argumentGPR2>(arg1, arg3);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitRepatchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/Repatch.cpp (160687 => 160688)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/Repatch.cpp 2013-12-17 02:27:01 UTC (rev 160687)
+++ trunk/Source/JavaScriptCore/jit/Repatch.cpp 2013-12-17 02:43:26 UTC (rev 160688)
</span><span class="lines">@@ -305,11 +305,17 @@
</span><span class="cx"> stubJit.setupArguments(callFrameRegister, scratchGPR, resultGPR);
</span><span class="cx"> operationFunction = operationCallGetter;
</span><span class="cx"> } else {
</span><ins>+#if USE(JSVALUE64)
+ // EncodedJSValue (*GetValueFunc)(ExecState*, EncodedJSValue slotBase, EncodedJSValue thisValue, PropertyName);
+ stubJit.setupArguments(callFrameRegister, MacroAssembler::TrustedImmPtr(protoObject), scratchGPR, MacroAssembler::TrustedImmPtr(propertyName.impl()));
+ operationFunction = FunctionPtr(slot.customGetter());
+#else
</ins><span class="cx"> stubJit.move(MacroAssembler::TrustedImmPtr(protoObject), scratchGPR);
</span><span class="cx"> stubJit.setupArguments(callFrameRegister, scratchGPR,
</span><span class="cx"> MacroAssembler::TrustedImmPtr(FunctionPtr(slot.customGetter()).executableAddress()),
</span><span class="cx"> MacroAssembler::TrustedImmPtr(propertyName.impl()));
</span><span class="cx"> operationFunction = operationCallCustomGetter;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Need to make sure that whenever this call is made in the future, we remember the
</span><span class="lines">@@ -607,11 +613,17 @@
</span><span class="cx"> stubJit.setupArguments(callFrameRegister, baseGPR, scratchGPR);
</span><span class="cx"> operationFunction = operationCallGetter;
</span><span class="cx"> } else {
</span><ins>+#if USE(JSVALUE64)
+ // EncodedJSValue (*GetValueFunc)(ExecState*, EncodedJSValue slotBase, EncodedJSValue thisValue, PropertyName);
+ stubJit.setupArguments(callFrameRegister, baseGPR, baseGPR, MacroAssembler::TrustedImmPtr(ident.impl()));
+ operationFunction = FunctionPtr(slot.customGetter());
+#else
</ins><span class="cx"> stubJit.setupArguments(
</span><span class="cx"> callFrameRegister, baseGPR,
</span><span class="cx"> MacroAssembler::TrustedImmPtr(FunctionPtr(slot.customGetter()).executableAddress()),
</span><span class="cx"> MacroAssembler::TrustedImmPtr(ident.impl()));
</span><span class="cx"> operationFunction = operationCallCustomGetter;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Need to make sure that whenever this call is made in the future, we remember the
</span></span></pre>
</div>
</div>
</body>
</html>