<!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>[173886] 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/173886">173886</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-23 13:21:51 -0700 (Tue, 23 Sep 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[CLoop] - Fix CLoop on the 32-bit Big-Endians
https://bugs.webkit.org/show_bug.cgi?id=137020

Patch by Tomas Popela &lt;tpopela@redhat.com&gt; on 2014-09-23
Reviewed by Mark Lam.

* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter32_64.asm:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173885 => 173886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-09-23 19:53:08 UTC (rev 173885)
+++ trunk/Source/JavaScriptCore/ChangeLog        2014-09-23 20:21:51 UTC (rev 173886)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-23  Tomas Popela  &lt;tpopela@redhat.com&gt;
+
+        [CLoop] - Fix CLoop on the 32-bit Big-Endians
+        https://bugs.webkit.org/show_bug.cgi?id=137020
+
+        Reviewed by Mark Lam.
+
+        * llint/LowLevelInterpreter.asm:
+        * llint/LowLevelInterpreter32_64.asm:
+
</ins><span class="cx"> 2014-09-23  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Should be able to attach a debugger to a JSContext before anything is executed
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (173885 => 173886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm        2014-09-23 19:53:08 UTC (rev 173885)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm        2014-09-23 20:21:51 UTC (rev 173886)
</span><span class="lines">@@ -533,13 +533,21 @@
</span><span class="cx"> end
</span><span class="cx"> 
</span><span class="cx"> macro functionForCallCodeBlockGetter(targetRegister)
</span><del>-    loadp Callee[cfr], targetRegister
</del><ins>+    if JSVALUE64
+        loadp Callee[cfr], targetRegister
+    else
+        loadp Callee + PayloadOffset[cfr], targetRegister
+    end
</ins><span class="cx">     loadp JSFunction::m_executable[targetRegister], targetRegister
</span><span class="cx">     loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
</span><span class="cx"> end
</span><span class="cx"> 
</span><span class="cx"> macro functionForConstructCodeBlockGetter(targetRegister)
</span><del>-    loadp Callee[cfr], targetRegister
</del><ins>+    if JSVALUE64
+        loadp Callee[cfr], targetRegister
+    else
+        loadp Callee + PayloadOffset[cfr], targetRegister
+    end
</ins><span class="cx">     loadp JSFunction::m_executable[targetRegister], targetRegister
</span><span class="cx">     loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
</span><span class="cx"> end
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (173885 => 173886)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm        2014-09-23 19:53:08 UTC (rev 173885)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm        2014-09-23 20:21:51 UTC (rev 173886)
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx">     loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx">     loadp VM::callFrameForThrow[t3], cfr
</span><span class="cx"> 
</span><del>-    loadp CallerFrame + PayloadOffset[cfr], cfr
</del><ins>+    loadp CallerFrame[cfr], cfr
</ins><span class="cx"> 
</span><span class="cx">     if ARMv7
</span><span class="cx">         vmEntryRecord(cfr, t3)
</span><span class="lines">@@ -689,7 +689,7 @@
</span><span class="cx"> end
</span><span class="cx"> 
</span><span class="cx"> macro branchIfException(label)
</span><del>-    loadp Callee[cfr], t3
</del><ins>+    loadp Callee + PayloadOffset[cfr], t3
</ins><span class="cx">     andp MarkedBlockMask, t3
</span><span class="cx">     loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx">     bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException
</span><span class="lines">@@ -2136,7 +2136,7 @@
</span><span class="cx">         loadp JSFunction::m_executable[t1], t1
</span><span class="cx">         checkStackPointerAlignment(t3, 0xdead0001)
</span><span class="cx">         call executableOffsetToFunction[t1]
</span><del>-        loadp Callee[cfr], t3
</del><ins>+        loadp Callee + PayloadOffset[cfr], t3
</ins><span class="cx">         andp MarkedBlockMask, t3
</span><span class="cx">         loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx">         addp 8, sp
</span><span class="lines">@@ -2159,7 +2159,7 @@
</span><span class="cx">         else
</span><span class="cx">             call executableOffsetToFunction[t1]
</span><span class="cx">         end
</span><del>-        loadp Callee[cfr], t3
</del><ins>+        loadp Callee + PayloadOffset[cfr], t3
</ins><span class="cx">         andp MarkedBlockMask, t3
</span><span class="cx">         loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx">         addp 8, sp
</span><span class="lines">@@ -2197,7 +2197,7 @@
</span><span class="cx">     loadp CodeBlock[cfr], t0
</span><span class="cx">     loadisFromInstruction(4, t2)
</span><span class="cx"> 
</span><del>-    loadp ScopeChain[cfr], t0
</del><ins>+    loadp ScopeChain + PayloadOffset[cfr], t0
</ins><span class="cx">     btiz t2, .resolveScopeLoopEnd
</span><span class="cx"> 
</span><span class="cx"> .resolveScopeLoop:
</span><span class="lines">@@ -2256,7 +2256,7 @@
</span><span class="cx"> 
</span><span class="cx"> macro loadWithStructureCheck(operand, slowPath)
</span><span class="cx">     loadisFromInstruction(operand, t0)
</span><del>-    loadp [cfr, t0, 8], t0
</del><ins>+    loadp PayloadOffset[cfr, t0, 8], t0
</ins><span class="cx">     loadpFromInstruction(5, t1)
</span><span class="cx">     bpneq JSCell::m_structureID[t0], t1, slowPath
</span><span class="cx"> end
</span></span></pre>
</div>
</div>

</body>
</html>