<!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>[161211] branches/jsCStack/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/161211">161211</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 11:20:52 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor LLInt C stack frame munging helpers so that 32-bit code paths can use them
https://bugs.webkit.org/show_bug.cgi?id=126387
Not yet reviewed.
This gets us closer to the 32-bit LLInt working on the C stack by enabling the
32-bit code paths to use the low-level stack/frame pointer munging helpers. This
patch doesn't completely ensure that these helpers actually work - the 32-bit
build is still broken - but it's a good change to land separately since it affects
64-bit code paths as well.
* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreterasm">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter32_64asm">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter64asm">branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (161210 => 161211)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-02 18:45:33 UTC (rev 161210)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-02 19:20:52 UTC (rev 161211)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-02 Filip Pizlo <fpizlo@apple.com>
+
+ Refactor LLInt C stack frame munging helpers so that 32-bit code paths can use them
+ https://bugs.webkit.org/show_bug.cgi?id=126387
+
+ Not yet reviewed.
+
+ This gets us closer to the 32-bit LLInt working on the C stack by enabling the
+ 32-bit code paths to use the low-level stack/frame pointer munging helpers. This
+ patch doesn't completely ensure that these helpers actually work - the 32-bit
+ build is still broken - but it's a good change to land separately since it affects
+ 64-bit code paths as well.
+
+ * llint/LowLevelInterpreter.asm:
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2013-12-31 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack: Need a separate stack limit for the JS stack and the C stack.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (161210 => 161211)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2014-01-02 18:45:33 UTC (rev 161210)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2014-01-02 19:20:52 UTC (rev 161211)
</span><span class="lines">@@ -216,6 +216,14 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+macro checkStackPointerAlignment(tempReg, location)
+ andp sp, 0xf, tempReg
+ btpz tempReg, .stackPointerOkay
+ move location, tempReg
+ break
+.stackPointerOkay:
+end
+
</ins><span class="cx"> macro preserveCallerPCAndCFR()
</span><span class="cx"> if C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or ARM64 or MIPS or SH4
</span><span class="cx"> # In C_LOOP case, we're only preserving the bytecode vPC.
</span><span class="lines">@@ -229,7 +237,6 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-
</del><span class="cx"> macro restoreCallerPCAndCFR()
</span><span class="cx"> if C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or ARM64 or MIPS or SH4
</span><span class="cx"> # In C_LOOP case, we're only preserving the bytecode vPC.
</span><span class="lines">@@ -241,7 +248,6 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-
</del><span class="cx"> macro preserveReturnAddressAfterCall(destinationRegister)
</span><span class="cx"> if C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or ARM64 or MIPS or SH4
</span><span class="cx"> # In C_LOOP case, we're only preserving the bytecode vPC.
</span><span class="lines">@@ -264,6 +270,54 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><ins>+macro functionPrologue()
+ if X86 or X86_64
+ push cfr
+ move sp, cfr
+ elsif ARM64 or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+ pushLRAndFP
+ end
+end
+
+macro functionEpilogue()
+ if X86 or X86_64
+ pop cfr
+ elsif ARM64 or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+ popLRAndFP
+ end
+end
+
+macro callToJavaScriptPrologue()
+ if X86 or X86_64
+ elsif ARM64 or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+ pushLRAndFP
+ end
+ pushCalleeSaves
+end
+
+macro callToJavaScriptEpilogue()
+ addp CallFrameHeaderSlots * 8, cfr, sp
+ loadp CallerFrame[cfr], cfr
+
+ popCalleeSaves
+ if X86 or X86_64
+ elsif ARM64 or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+ popLRAndFP
+ end
+end
+
+macro moveStackPointerForCodeBlock(codeBlock, scratch)
+ loadi CodeBlock::m_numCalleeRegisters[codeBlock], t2
+ lshiftp 3, t2
+ addp maxFrameExtentForSlowPathCall, t2
+ subp cfr, t2, sp
+end
+
+macro restoreStackPointerAfterCall()
+ loadp CodeBlock[cfr], t1
+ moveStackPointerForCodeBlock(t1, t2)
+end
+
</ins><span class="cx"> macro traceExecution()
</span><span class="cx"> if EXECUTION_TRACING
</span><span class="cx"> callSlowPath(_llint_trace)
</span><span class="lines">@@ -375,9 +429,7 @@
</span><span class="cx"> end
</span><span class="cx"> codeBlockSetter(t1)
</span><span class="cx">
</span><del>- loadi CodeBlock::m_numCalleeRegisters[t1], t2
- lshiftp 3, t2
- subp t2, sp
</del><ins>+ moveStackPointerForCodeBlock(t1, t2)
</ins><span class="cx">
</span><span class="cx"> # Set up the PC.
</span><span class="cx"> if JSVALUE64
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (161210 => 161211)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-01-02 18:45:33 UTC (rev 161210)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-01-02 19:20:52 UTC (rev 161211)
</span><span class="lines">@@ -145,31 +145,6 @@
</span><span class="cx"> move t1, cfr
</span><span class="cx"> end
</span><span class="cx">
</span><del>-macro functionPrologue(extraStackSpace)
- if X86
- push cfr
- move sp, cfr
- end
- pushCalleeSaves
- if ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
- push cfr
- push lr
- end
- subp extraStackSpace, sp
-end
-
-macro functionEpilogue(extraStackSpace)
- addp extraStackSpace, sp
- if ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
- pop lr
- pop cfr
- end
- popCalleeSaves
- if X86
- pop cfr
- end
-end
-
</del><span class="cx"> macro doCallToJavaScript(makeCall, doReturn)
</span><span class="cx"> if X86
</span><span class="cx"> const entry = t4
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (161210 => 161211)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-01-02 18:45:33 UTC (rev 161210)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-01-02 19:20:52 UTC (rev 161211)
</span><span class="lines">@@ -90,64 +90,6 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-macro checkStackPointerAlignment(tempReg, location)
- andp sp, 0xf, tempReg
- btpz tempReg, .stackPointerOkay
- move location, tempReg
- break
-.stackPointerOkay:
-end
-
-
-macro functionPrologue()
- if X86_64
- push cfr
- move sp, cfr
- elsif ARM64
- pushLRAndFP
- end
-end
-
-macro functionEpilogue()
- if X86_64
- pop cfr
- elsif ARM64
- popLRAndFP
- end
-end
-
-macro callToJavaScriptPrologue()
- if X86_64
- elsif ARM64
- pushLRAndFP
- end
- pushCalleeSaves
-end
-
-macro callToJavaScriptEpilogue()
- addp CallFrameHeaderSlots*8, cfr, sp
- loadp CallerFrame[cfr], cfr
-
- popCalleeSaves
- if X86_64
- elsif ARM64
- popLRAndFP
- end
-end
-
-macro moveStackPointerForCallframe(codeblock)
- loadi CodeBlock::m_numCalleeRegisters[codeblock], t1
- lshiftp 3, t1
- subp cfr, t1, sp
-end
-
-macro restoreStackPointerAfterCall()
- loadp CodeBlock[cfr], t1
- loadi CodeBlock::m_numCalleeRegisters[t1], t1
- lshiftp 3, t1
- subp cfr, t1, sp
-end
-
</del><span class="cx"> macro doCallToJavaScript(makeCall)
</span><span class="cx"> if X86_64
</span><span class="cx"> const entry = t4
</span></span></pre>
</div>
</div>
</body>
</html>