<!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>[161234] 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/161234">161234</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 15:28:36 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack LLInt 32-bit should build
https://bugs.webkit.org/show_bug.cgi?id=126409
Not yet reviewed.
And the stuff we do to make it build should at least try to be correct.
* 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="#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 (161233 => 161234)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-02 23:24:34 UTC (rev 161233)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-02 23:28:36 UTC (rev 161234)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-02 Filip Pizlo <fpizlo@apple.com>
+
+ CStack LLInt 32-bit should build
+ https://bugs.webkit.org/show_bug.cgi?id=126409
+
+ Not yet reviewed.
+
+ And the stuff we do to make it build should at least try to be correct.
+
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+
</ins><span class="cx"> 2014-01-02 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> CStack: Interpreter::executeCall() should check for exceptions after calling callToNativeFunction().
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (161233 => 161234)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-01-02 23:24:34 UTC (rev 161233)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-01-02 23:28:36 UTC (rev 161234)
</span><span class="lines">@@ -145,13 +145,12 @@
</span><span class="cx"> move t1, cfr
</span><span class="cx"> end
</span><span class="cx">
</span><del>-macro doCallToJavaScript(makeCall, doReturn)
</del><ins>+macro doCallToJavaScript(makeCall)
</ins><span class="cx"> if X86
</span><span class="cx"> const entry = t4
</span><del>- const vmTopCallFrame = t2
</del><ins>+ const vm = t2
</ins><span class="cx"> const protoCallFrame = t5
</span><span class="cx">
</span><del>- const extraStackSpace = 28
</del><span class="cx"> const previousCFR = t0
</span><span class="cx"> const previousPC = t1
</span><span class="cx"> const temp1 = t0 # Same as previousCFR
</span><span class="lines">@@ -160,9 +159,8 @@
</span><span class="cx"> const temp4 = t3
</span><span class="cx"> elsif ARM or ARMv7_TRADITIONAL
</span><span class="cx"> const entry = a0
</span><del>- const vmTopCallFrame = a1
</del><ins>+ const vm = a1
</ins><span class="cx"> const protoCallFrame = a2
</span><del>- const topOfStack = a3
</del><span class="cx">
</span><span class="cx"> const extraStackSpace = 16
</span><span class="cx"> const previousCFR = t3
</span><span class="lines">@@ -173,9 +171,8 @@
</span><span class="cx"> const temp4 = t4
</span><span class="cx"> elsif ARMv7
</span><span class="cx"> const entry = a0
</span><del>- const vmTopCallFrame = a1
</del><ins>+ const vm = a1
</ins><span class="cx"> const protoCallFrame = a2
</span><del>- const topOfStack = a3
</del><span class="cx">
</span><span class="cx"> const extraStackSpace = 28
</span><span class="cx"> const previousCFR = t3
</span><span class="lines">@@ -216,45 +213,73 @@
</span><span class="cx"> loadp [sp], previousPC
</span><span class="cx"> move cfr, previousCFR
</span><span class="cx"> end
</span><del>- functionPrologue(extraStackSpace)
</del><span class="cx"> if X86
</span><del>- loadp extraStackSpace+20[sp], entry
- loadp extraStackSpace+24[sp], vmTopCallFrame
- loadp extraStackSpace+28[sp], protoCallFrame
- loadp extraStackSpace+32[sp], cfr
</del><ins>+ loadp 20[sp], entry
+ loadp 24[sp], vm
+ loadp 28[sp], protoCallFrame
</ins><span class="cx"> else
</span><span class="cx"> move cfr, previousCFR
</span><span class="cx"> move topOfStack, cfr
</span><span class="cx"> end
</span><ins>+ callToJavaScriptPrologue()
+
+ checkStackPointerAlignment(temp2, 0xbad0dc01)
</ins><span class="cx">
</span><del>- subp (CallFrameHeaderSlots-1)*8, cfr
- storep 0, ArgumentCount+4[cfr]
</del><ins>+ # The jsStackLimit was previously computed in VMEntryScope using an
+ # estimated stackPointerAtVMEntry value. Adjust the jsStackLimit by
+ # the delta between the actual stackPointerAtVMEntry and the estimate
+ # that we used previously.
+ subp VM::stackPointerAtVMEntry[vm], sp, temp2
+ subp VM::m_jsStackLimit[vm], temp2, temp2
+ storep temp2, VM::m_jsStackLimit[vm]
+ storep sp, VM::stackPointerAtVMEntry[vm]
+
+ # The stack host zone ensures that we have adequate space for the
+ # VMEntrySentinelFrame. Proceed with allocating and initializing the
+ # sentinel frame.
+ move sp, cfr
+ subp CallFrameHeaderSlots * 8, cfr
</ins><span class="cx"> storep 0, ArgumentCount[cfr]
</span><del>- storep 0, Callee+4[cfr]
- storep vmTopCallFrame, Callee[cfr]
- loadp [vmTopCallFrame], temp4
- storep 0, ScopeChain+4[cfr]
- storep temp4, ScopeChain[cfr]
- storep 0, CodeBlock+4[cfr]
</del><ins>+ storep vm, Callee[cfr]
+ loadp VM::topCallFrame[vm], temp2
+ storep temp2, ScopeChain[cfr]
</ins><span class="cx"> storep 1, CodeBlock[cfr]
</span><span class="cx"> storep previousPC, ReturnPC[cfr]
</span><span class="cx"> storep previousCFR, CallerFrame[cfr]
</span><del>- move cfr, temp1
</del><span class="cx">
</span><span class="cx"> loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp2
</span><span class="cx"> addp CallFrameHeaderSlots, temp2, temp2
</span><span class="cx"> lshiftp 3, temp2
</span><del>- subp temp2, cfr
- storep temp1, CallerFrame[cfr]
</del><ins>+ subp cfr, temp2, temp1
</ins><span class="cx">
</span><ins>+ # Ensure that we have enough additional stack capacity for the incoming args,
+ # and the frame for the JS code we're executing. We need to do this check
+ # before we start copying the args from the protoCallFrame below.
+ bpaeq temp1, VM::m_jsStackLimit[vm], .stackHeightOK
+
+ move cfr, sp
+
+ if C_LOOP
+ # FIXME: Need to call stack check here to see if we can grow the stack.
+ # Will need to preserve registers so that we can recover if we do not end
+ # up throwing a StackOverflowError.
+ end
+
+ storep 0, VM::stackPointerAtVMEntry[vm]
+ cCall2(_llint_throw_stack_overflow_error, vm, protoCallFrame)
+ callToJavaScriptEpilogue()
+ ret
+
+.stackHeightOK:
+ move temp1, sp
</ins><span class="cx"> move 5, temp1
</span><span class="cx">
</span><span class="cx"> .copyHeaderLoop:
</span><span class="cx"> subi 1, temp1
</span><del>- loadp [protoCallFrame, temp1, 8], temp3
- storep temp3, CodeBlock[cfr, temp1, 8]
- loadp 4[protoCallFrame, temp1, 8], temp3
- storep temp3, CodeBlock+4[cfr, temp1, 8]
</del><ins>+ loadi TagOffset[protoCallFrame, temp1, 8], temp3
+ storei temp3, TagOffset + CodeBlock[sp, temp1, 8]
+ loadi PayloadOffset[protoCallFrame, temp1, 8], temp3
+ storei temp3, PayloadOffset + CodeBlock[sp, temp1, 8]
</ins><span class="cx"> btinz temp1, .copyHeaderLoop
</span><span class="cx">
</span><span class="cx"> loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
</span><span class="lines">@@ -263,12 +288,10 @@
</span><span class="cx"> subi 1, temp3
</span><span class="cx">
</span><span class="cx"> bieq temp2, temp3, .copyArgs
</span><del>- move 0, temp1
- move UndefinedTag, temp4
</del><span class="cx"> .fillExtraArgsLoop:
</span><span class="cx"> subi 1, temp3
</span><del>- storep temp1, ThisArgumentOffset+8+PayloadOffset[cfr, temp3, 8]
- storep temp4, ThisArgumentOffset+8+TagOffset[cfr, temp3, 8]
</del><ins>+ storei UndefinedTag, ThisArgumentOffset + 8 + TagOffset[sp, temp3, 8]
+ storei 0, ThisArgumentOffset + 8 + PayloadOffset[sp, temp3, 8]
</ins><span class="cx"> bineq temp2, temp3, .fillExtraArgsLoop
</span><span class="cx">
</span><span class="cx"> .copyArgs:
</span><span class="lines">@@ -277,29 +300,33 @@
</span><span class="cx"> .copyArgsLoop:
</span><span class="cx"> btiz temp2, .copyArgsDone
</span><span class="cx"> subi 1, temp2
</span><del>- loadp PayloadOffset[temp1, temp2, 8], temp3
- loadp TagOffset[temp1, temp2, 8], temp4
- storep temp3, ThisArgumentOffset+8+PayloadOffset[cfr, temp2, 8]
- storep temp4, ThisArgumentOffset+8+TagOffset[cfr, temp2, 8]
</del><ins>+ loadi TagOffset[temp1, temp2, 8], temp3
+ storei temp3, ThisArgumentOffset + 8 + TagOffset[sp, temp2, 8]
+ loadi PayloadOffset[temp1, temp2, 8], temp3
+ storei temp3, ThisArgumentOffset + 8 + PayloadOffset[sp, temp2, 8]
</ins><span class="cx"> jmp .copyArgsLoop
</span><span class="cx">
</span><span class="cx"> .copyArgsDone:
</span><del>- if X86
- loadp extraStackSpace+24[sp], vmTopCallFrame
- end
- storep cfr, [vmTopCallFrame]
</del><ins>+ storep sp, VM::topCallFrame[vm]
</ins><span class="cx">
</span><ins>+ checkStackPointerAlignment(temp3, 0xbad0dc02)
+
</ins><span class="cx"> makeCall(entry, temp1)
</span><span class="cx">
</span><ins>+ checkStackPointerAlignment(temp3, 0xbad0dc03)
+
</ins><span class="cx"> bpeq CodeBlock[cfr], 1, .calleeFramePopped
</span><span class="cx"> loadp CallerFrame[cfr], cfr
</span><span class="cx">
</span><span class="cx"> .calleeFramePopped:
</span><del>- loadp Callee[cfr], temp3 # VM.topCallFrame
- loadp ScopeChain[cfr], temp4
- storep temp4, [temp3]
</del><ins>+ loadp Callee[cfr], temp2 # VM
+ loadp ScopeChain[cfr], temp3 # previous topCallFrame
+ storep temp3, VM::topCallFrame[temp2]
</ins><span class="cx">
</span><del>- doReturn(extraStackSpace)
</del><ins>+ checkStackPointerAlignment(temp3, 0xbad0dc04)
+
+ callToJavaScriptEpilogue()
+ ret
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro makeJavaScriptCall(entry, temp)
</span><span class="lines">@@ -330,8 +357,8 @@
</span><span class="cx"> loadp CallerFrame + PayloadOffset[cfr], cfr
</span><span class="cx">
</span><span class="cx"> loadp Callee + PayloadOffset[cfr], t3 # VM.topCallFrame
</span><del>- loadp ScopeChain + PayloadOffset[cfr], t6
- storep t6, [t3]
</del><ins>+ loadp ScopeChain + PayloadOffset[cfr], t5
+ storep t5, [t3]
</ins><span class="cx">
</span><span class="cx"> callToJavaScriptEpilogue()
</span><span class="cx"> ret
</span><span class="lines">@@ -498,14 +525,30 @@
</span><span class="cx"> loadi PayloadOffset + ArgumentCount[cfr], t0
</span><span class="cx"> biaeq t0, CodeBlock::m_numParameters[t1], doneLabel
</span><span class="cx"> cCall2(slowPath, cfr, PC) # This slowPath has a simple protocol: t0 = 0 => no error, t0 != 0 => error
</span><del>- btiz t0, .isArityFixupNeeded
</del><ins>+ btiz t0, .noError
</ins><span class="cx"> move t1, cfr # t1 contains caller frame
</span><span class="cx"> jmp _llint_throw_from_slow_path_trampoline
</span><span class="cx">
</span><del>-.isArityFixupNeeded:
</del><ins>+.noError:
+ # t1 points to ArityCheckData.
+ loadp CommonSlowPaths::ArityCheckData::thunkToCall[t1], t2
+ btpz t2, .proceedInline
+
+ loadp CommonSlowPaths::ArityCheckData::returnPC[t1], t5
+ loadp CommonSlowPaths::ArityCheckData::paddedStackSpace[t1], t0
+ call t2
+ if ASSERT_ENABLED
+ loadp ReturnPC[cfr], t0
+ loadp [t0], t0
+ end
+ jmp .continue
+
+.proceedInline:
+ loadi CommonSlowPaths::ArityCheckData::paddedStackSpace[t1], t1
</ins><span class="cx"> btiz t1, .continue
</span><span class="cx">
</span><del>- // Move frame up "t1" slots
</del><ins>+ // Move frame up "t1 * 2" slots
+ lshiftp 1, t1
</ins><span class="cx"> negi t1
</span><span class="cx"> move cfr, t3
</span><span class="cx"> loadi PayloadOffset + ArgumentCount[cfr], t2
</span><span class="lines">@@ -530,6 +573,7 @@
</span><span class="cx">
</span><span class="cx"> lshiftp 3, t1
</span><span class="cx"> addp t1, cfr
</span><ins>+ addp t1, sp
</ins><span class="cx"> .continue:
</span><span class="cx"> # Reload CodeBlock and PC, since the slow_path clobbered it.
</span><span class="cx"> loadp CodeBlock[cfr], t1
</span><span class="lines">@@ -537,7 +581,6 @@
</span><span class="cx"> jmp doneLabel
</span><span class="cx"> end
</span><span class="cx">
</span><del>-
</del><span class="cx"> macro branchIfException(label)
</span><span class="cx"> loadp ScopeChain[cfr], t3
</span><span class="cx"> andp MarkedBlockMask, t3
</span><span class="lines">@@ -550,6 +593,7 @@
</span><span class="cx">
</span><span class="cx"> _llint_op_enter:
</span><span class="cx"> traceExecution()
</span><ins>+ checkStackPointerAlignment(t2, 0xdead00e1)
</ins><span class="cx"> loadp CodeBlock[cfr], t2 // t2<CodeBlock> = cfr.CodeBlock
</span><span class="cx"> loadi CodeBlock::m_numVars[t2], t2 // t2<size_t> = t2<CodeBlock>.m_numVars
</span><span class="cx"> btiz t2, .opEnterDone
</span><span class="lines">@@ -1858,12 +1902,11 @@
</span><span class="cx"> storei t0, ScopeChain + PayloadOffset[t3]
</span><span class="cx"> loadi 12[PC], t2
</span><span class="cx"> storei PC, ArgumentCount + TagOffset[cfr]
</span><del>- storep cfr, CallerFrame[t3]
</del><span class="cx"> storei t2, ArgumentCount + PayloadOffset[t3]
</span><span class="cx"> storei CellTag, Callee + TagOffset[t3]
</span><span class="cx"> storei CellTag, ScopeChain + TagOffset[t3]
</span><del>- move t3, cfr
- callTargetFunction(t1)
</del><ins>+ addp CallerFrameAndPCSize, t3
+ callTargetFunction(t1, t3)
</ins><span class="cx">
</span><span class="cx"> .opCallSlow:
</span><span class="cx"> slowPathForCall(slowPath)
</span><span class="lines">@@ -2056,6 +2099,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> macro nativeCallTrampoline(executableOffsetToFunction)
</span><ins>+
+ functionPrologue()
</ins><span class="cx"> storep 0, CodeBlock[cfr]
</span><span class="cx"> loadp CallerFrame[cfr], t0
</span><span class="cx"> loadi ScopeChain + PayloadOffset[t0], t1
</span><span class="lines">@@ -2066,15 +2111,12 @@
</span><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> storep cfr, VM::topCallFrame[t3]
</span><del>- peek 0, t1
- storep t1, ReturnPC[cfr]
</del><span class="cx"> move cfr, t2 # t2 = ecx
</span><del>- subp 16 - 4, sp
</del><ins>+ subp 16 - 8, sp
</ins><span class="cx"> loadi Callee + PayloadOffset[cfr], t1
</span><span class="cx"> loadp JSFunction::m_executable[t1], t1
</span><del>- move t0, cfr
</del><span class="cx"> call executableOffsetToFunction[t1]
</span><del>- addp 16 - 4, sp
</del><ins>+ addp 16 - 8, sp
</ins><span class="cx"> loadp ScopeChain[cfr], t3
</span><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="lines">@@ -2118,11 +2160,12 @@
</span><span class="cx"> else
</span><span class="cx"> error
</span><span class="cx"> end
</span><ins>+
+ functionEpilogue()
</ins><span class="cx"> bineq VM::m_exception + TagOffset[t3], EmptyValueTag, .handleException
</span><span class="cx"> ret
</span><span class="cx">
</span><span class="cx"> .handleException:
</span><del>- preserveReturnAddressAfterCall(t1) # This is really only needed on X86
</del><span class="cx"> storep cfr, VM::topCallFrame[t3]
</span><span class="cx"> restoreStackPointerAfterCall()
</span><span class="cx"> jmp _llint_throw_from_slow_path_trampoline
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (161233 => 161234)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-01-02 23:24:34 UTC (rev 161233)
+++ branches/jsCStack/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-01-02 23:28:36 UTC (rev 161234)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> # VMEntrySentinelFrame. Proceed with allocating and initializing the
</span><span class="cx"> # sentinel frame.
</span><span class="cx"> move sp, cfr
</span><del>- subp CallFrameHeaderSlots*8, cfr
</del><ins>+ subp CallFrameHeaderSlots * 8, cfr
</ins><span class="cx"> storep 0, ArgumentCount[cfr]
</span><span class="cx"> storep vm, Callee[cfr]
</span><span class="cx"> loadp VM::topCallFrame[vm], temp2
</span><span class="lines">@@ -172,8 +172,8 @@
</span><span class="cx">
</span><span class="cx"> .copyHeaderLoop:
</span><span class="cx"> subi 1, temp1
</span><del>- loadp [protoCallFrame, temp1, 8], temp3
- storep temp3, CodeBlock[sp, temp1, 8]
</del><ins>+ loadq [protoCallFrame, temp1, 8], temp3
+ storeq temp3, CodeBlock[sp, temp1, 8]
</ins><span class="cx"> btinz temp1, .copyHeaderLoop
</span><span class="cx">
</span><span class="cx"> loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> move ValueUndefined, temp1
</span><span class="cx"> .fillExtraArgsLoop:
</span><span class="cx"> subi 1, temp3
</span><del>- storep temp1, ThisArgumentOffset+8[sp, temp3, 8]
</del><ins>+ storeq temp1, ThisArgumentOffset + 8[sp, temp3, 8]
</ins><span class="cx"> bineq temp2, temp3, .fillExtraArgsLoop
</span><span class="cx">
</span><span class="cx"> .copyArgs:
</span><span class="lines">@@ -194,8 +194,8 @@
</span><span class="cx"> .copyArgsLoop:
</span><span class="cx"> btiz temp2, .copyArgsDone
</span><span class="cx"> subi 1, temp2
</span><del>- loadp [temp1, temp2, 8], temp3
- storep temp3, ThisArgumentOffset+8[sp, temp2, 8]
</del><ins>+ loadq [temp1, temp2, 8], temp3
+ storeq temp3, ThisArgumentOffset + 8[sp, temp2, 8]
</ins><span class="cx"> jmp .copyArgsLoop
</span><span class="cx">
</span><span class="cx"> .copyArgsDone:
</span><span class="lines">@@ -257,8 +257,8 @@
</span><span class="cx"> loadp CallerFrame[cfr], cfr
</span><span class="cx">
</span><span class="cx"> loadp Callee[cfr], t3 # VM
</span><del>- loadp ScopeChain[cfr], t6 # previous topCallFrame
- storep t6, VM::topCallFrame[t3]
</del><ins>+ loadp ScopeChain[cfr], t5 # previous topCallFrame
+ storep t5, VM::topCallFrame[t3]
</ins><span class="cx">
</span><span class="cx"> callToJavaScriptEpilogue()
</span><span class="cx"> ret
</span><span class="lines">@@ -429,7 +429,6 @@
</span><span class="cx"> jmp doneLabel
</span><span class="cx"> end
</span><span class="cx">
</span><del>-
</del><span class="cx"> macro branchIfException(label)
</span><span class="cx"> loadp ScopeChain[cfr], t3
</span><span class="cx"> andp MarkedBlockMask, t3
</span><span class="lines">@@ -1874,10 +1873,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> _llint_throw_during_call_trampoline:
</span><del>-if C_LOOP
-else
- pop t2
-end
</del><ins>+ preserveReturnAddressAfterCall(t2)
</ins><span class="cx"> jmp _llint_throw_from_slow_path_trampoline
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>