<!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>[160665] 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/160665">160665</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 14:52:36 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change slow path result to take a void* instead of a ExecState*.
https://bugs.webkit.org/show_bug.cgi?id=125802.
Reviewed by Filip Pizlo.
This is in preparation for C Stack OSR entry work that is coming soon.
In the OSR entry case, we'll be returning a topOfFrame pointer value
instead of the ExecState*.
* offlineasm/cloop.rb:
* runtime/CommonSlowPaths.h:
(JSC::encodeResult):
(JSC::decodeResult):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreofflineasmclooprb">trunk/Source/JavaScriptCore/offlineasm/cloop.rb</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathsh">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160664 => 160665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-16 22:51:00 UTC (rev 160664)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-16 22:52:36 UTC (rev 160665)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2013-12-16 Mark Lam <mark.lam@apple.com>
+
+ Change slow path result to take a void* instead of a ExecState*.
+ https://bugs.webkit.org/show_bug.cgi?id=125802.
+
+ Reviewed by Filip Pizlo.
+
+ This is in preparation for C Stack OSR entry work that is coming soon.
+ In the OSR entry case, we'll be returning a topOfFrame pointer value
+ instead of the ExecState*.
+
+ * offlineasm/cloop.rb:
+ * runtime/CommonSlowPaths.h:
+ (JSC::encodeResult):
+ (JSC::decodeResult):
+
</ins><span class="cx"> 2013-12-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fixed Win64 build on VS2013.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreofflineasmclooprb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/offlineasm/cloop.rb (160664 => 160665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/offlineasm/cloop.rb 2013-12-16 22:51:00 UTC (rev 160664)
+++ trunk/Source/JavaScriptCore/offlineasm/cloop.rb 2013-12-16 22:52:36 UTC (rev 160665)
</span><span class="lines">@@ -558,7 +558,7 @@
</span><span class="cx"> $asm.putc " ExecState* exec = CAST<ExecState*>(#{operands[1].clValue(:voidPtr)});"
</span><span class="cx"> $asm.putc " Instruction* pc = CAST<Instruction*>(#{operands[2].clValue(:voidPtr)});"
</span><span class="cx"> $asm.putc " SlowPathReturnType result = #{operands[0].cLabel}(exec, pc);"
</span><del>- $asm.putc " decodeResult(result, t0.instruction, t1.execState);"
</del><ins>+ $asm.putc " decodeResult(result, t0.instruction, t1.vp);"
</ins><span class="cx"> $asm.putc "}"
</span><span class="cx"> end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h (160664 => 160665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2013-12-16 22:51:00 UTC (rev 160664)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2013-12-16 22:52:36 UTC (rev 160665)
</span><span class="lines">@@ -105,10 +105,10 @@
</span><span class="cx"> // warnings, or worse, a change in the ABI used to return these types.
</span><span class="cx"> struct SlowPathReturnType {
</span><span class="cx"> void* a;
</span><del>- ExecState* b;
</del><ins>+ void* b;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-inline SlowPathReturnType encodeResult(void* a, ExecState* b)
</del><ins>+inline SlowPathReturnType encodeResult(void* a, void* b)
</ins><span class="cx"> {
</span><span class="cx"> SlowPathReturnType result;
</span><span class="cx"> result.a = a;
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void decodeResult(SlowPathReturnType result, void*& a, ExecState*& b)
</del><ins>+inline void decodeResult(SlowPathReturnType result, void*& a, void*& b)
</ins><span class="cx"> {
</span><span class="cx"> a = result.a;
</span><span class="cx"> b = result.b;
</span><span class="lines">@@ -128,12 +128,12 @@
</span><span class="cx"> typedef union {
</span><span class="cx"> struct {
</span><span class="cx"> void* a;
</span><del>- ExecState* b;
</del><ins>+ void* b;
</ins><span class="cx"> } pair;
</span><span class="cx"> int64_t i;
</span><span class="cx"> } SlowPathReturnTypeEncoding;
</span><span class="cx">
</span><del>-inline SlowPathReturnType encodeResult(void* a, ExecState* b)
</del><ins>+inline SlowPathReturnType encodeResult(void* a, void* b)
</ins><span class="cx"> {
</span><span class="cx"> SlowPathReturnTypeEncoding u;
</span><span class="cx"> u.pair.a = a;
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> return u.i;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void decodeResult(SlowPathReturnType result, void*& a, ExecState*& b)
</del><ins>+inline void decodeResult(SlowPathReturnType result, void*& a, void*& b)
</ins><span class="cx"> {
</span><span class="cx"> SlowPathReturnTypeEncoding u;
</span><span class="cx"> u.i = result;
</span></span></pre>
</div>
</div>
</body>
</html>