<!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>[197660] releases/WebKitGTK/webkit-2.4/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/197660">197660</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-06 23:54:15 -0800 (Sun, 06 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173886">r173886</a> - [CLoop] - Fix CLoop on the 32-bit Big-Endians
https://bugs.webkit.org/show_bug.cgi?id=137020
Patch by Tomas Popela <tpopela@redhat.com> on 2014-09-23
Reviewed by Mark Lam.
* llint/LowLevelInterpreter.asm:
* llint/LowLevelInterpreter32_64.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCorellintLLIntSlowPathscpp">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCorellintLowLevelInterpreterasm">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCorellintLowLevelInterpreter32_64asm">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceJavaScriptCorellintLowLevelInterpreter64asm">releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog (197659 => 197660)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog 2016-03-07 06:41:51 UTC (rev 197659)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/ChangeLog 2016-03-07 07:54:15 UTC (rev 197660)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-23 Tomas Popela <tpopela@redhat.com>
+
+ [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"> 2015-12-07 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> Crashes on PPC64 due to mprotect() on address not aligned to the page size
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (197659 => 197660)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-03-07 06:41:51 UTC (rev 197659)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2016-03-07 07:54:15 UTC (rev 197660)
</span><span class="lines">@@ -1354,7 +1354,7 @@
</span><span class="cx"> CodeBlock* codeBlock = exec->codeBlock();
</span><span class="cx"> ConcurrentJITLocker locker(codeBlock->m_lock);
</span><span class="cx"> pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure());
</span><del>- pc[6].u.operand = slot.cachedOffset();
</del><ins>+ pc[6].u.pointer = reinterpret_cast<void*>(slot.cachedOffset());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1381,7 +1381,7 @@
</span><span class="cx"> if (slot.isCacheable() && slot.base() == scope && scope->structure()->propertyAccessesAreCacheable()) {
</span><span class="cx"> ConcurrentJITLocker locker(codeBlock->m_lock);
</span><span class="cx"> pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure());
</span><del>- pc[6].u.operand = slot.cachedOffset();
</del><ins>+ pc[6].u.pointer = reinterpret_cast<void*>(slot.cachedOffset());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (197659 => 197660)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-03-07 06:41:51 UTC (rev 197659)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-03-07 07:54:15 UTC (rev 197660)
</span><span class="lines">@@ -299,13 +299,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="releasesWebKitGTKwebkit24SourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (197659 => 197660)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 06:41:51 UTC (rev 197659)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2016-03-07 07:54:15 UTC (rev 197660)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx">
</span><span class="cx"> .calleeFramePopped:
</span><span class="cx"> loadp Callee[cfr], temp3 # VM.topCallFrame
</span><del>- loadp ScopeChain[cfr], temp4
</del><ins>+ loadp ScopeChain + PayloadOffset[cfr], temp4
</ins><span class="cx"> storep temp4, [temp3]
</span><span class="cx">
</span><span class="cx"> doReturn(extraStackSpace)
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> macro branchIfException(label)
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp ScopeChain + 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">@@ -2002,7 +2002,7 @@
</span><span class="cx"> loadi 20[PC], t2
</span><span class="cx"> loadi PayloadOffset[cfr, t2, 8], t2
</span><span class="cx"> loadp JSPropertyNameIterator::m_jsStrings[t2], t3
</span><del>- loadi [t3, t0, 8], t3
</del><ins>+ loadi PayloadOffset[t3, t0, 8], t3
</ins><span class="cx"> addi 1, t0
</span><span class="cx"> storei t0, PayloadOffset[cfr, t1, 8]
</span><span class="cx"> loadi 4[PC], t1
</span><span class="lines">@@ -2039,7 +2039,7 @@
</span><span class="cx"> # the interpreter's throw trampoline (see _llint_throw_trampoline).
</span><span class="cx"> # The throwing code must have known that we were throwing to the interpreter,
</span><span class="cx"> # and have set VM::targetInterpreterPCForThrow.
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp ScopeChain + 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"> loadp VM::callFrameForThrow[t3], cfr
</span><span class="lines">@@ -2135,7 +2135,7 @@
</span><span class="cx"> move t0, cfr
</span><span class="cx"> call executableOffsetToFunction[t1]
</span><span class="cx"> addp 16 - 4, sp
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp ScopeChain + 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"> elsif ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS or SH4
</span><span class="lines">@@ -2159,7 +2159,7 @@
</span><span class="cx"> andp MarkedBlockMask, t3
</span><span class="cx"> loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
</span><span class="cx"> elsif C_LOOP
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp ScopeChain + 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"> storep cfr, VM::topCallFrame[t3]
</span><span class="lines">@@ -2172,7 +2172,7 @@
</span><span class="cx"> move t2, cfr
</span><span class="cx"> cloopCallNative executableOffsetToFunction[t1]
</span><span class="cx"> restoreReturnAddressBeforeReturn(t3)
</span><del>- loadp ScopeChain[cfr], t3
</del><ins>+ loadp ScopeChain + 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"> else
</span><span class="lines">@@ -2212,7 +2212,7 @@
</span><span class="cx"> addi 1, t2
</span><span class="cx">
</span><span class="cx"> .resolveScopeAfterActivationCheck:
</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">@@ -2271,13 +2271,13 @@
</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_structure[t0], t1, slowPath
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro getProperty()
</span><del>- loadisFromInstruction(6, t3)
</del><ins>+ loadpFromInstruction(6, t3)
</ins><span class="cx"> loadPropertyAtVariableOffset(t3, t0, t1, t2)
</span><span class="cx"> valueProfile(t1, t2, 28, t0)
</span><span class="cx"> loadisFromInstruction(1, t0)
</span><span class="lines">@@ -2297,7 +2297,7 @@
</span><span class="cx">
</span><span class="cx"> macro getClosureVar()
</span><span class="cx"> loadp JSVariableObject::m_registers[t0], t0
</span><del>- loadisFromInstruction(6, t3)
</del><ins>+ loadpFromInstruction(6, t3)
</ins><span class="cx"> loadp TagOffset[t0, t3, 8], t1
</span><span class="cx"> loadp PayloadOffset[t0, t3, 8], t2
</span><span class="cx"> valueProfile(t1, t2, 28, t0)
</span><span class="lines">@@ -2356,7 +2356,7 @@
</span><span class="cx"> macro putProperty()
</span><span class="cx"> loadisFromInstruction(3, t1)
</span><span class="cx"> loadConstantOrVariable(t1, t2, t3)
</span><del>- loadisFromInstruction(6, t1)
</del><ins>+ loadpFromInstruction(6, t1)
</ins><span class="cx"> storePropertyAtVariableOffset(t1, t0, t2, t3)
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -2374,7 +2374,7 @@
</span><span class="cx"> loadisFromInstruction(3, t1)
</span><span class="cx"> loadConstantOrVariable(t1, t2, t3)
</span><span class="cx"> loadp JSVariableObject::m_registers[t0], t0
</span><del>- loadisFromInstruction(6, t1)
</del><ins>+ loadpFromInstruction(6, t1)
</ins><span class="cx"> storei t2, TagOffset[t0, t1, 8]
</span><span class="cx"> storei t3, PayloadOffset[t0, t1, 8]
</span><span class="cx"> end
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (197659 => 197660)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-03-07 06:41:51 UTC (rev 197659)
+++ releases/WebKitGTK/webkit-2.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2016-03-07 07:54:15 UTC (rev 197660)
</span><span class="lines">@@ -2047,7 +2047,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro getProperty()
</span><del>- loadisFromInstruction(6, t1)
</del><ins>+ loadpFromInstruction(6, t1)
</ins><span class="cx"> loadPropertyAtVariableOffset(t1, t0, t2)
</span><span class="cx"> valueProfile(t2, 7, t0)
</span><span class="cx"> loadisFromInstruction(1, t0)
</span><span class="lines">@@ -2064,7 +2064,7 @@
</span><span class="cx">
</span><span class="cx"> macro getClosureVar()
</span><span class="cx"> loadp JSVariableObject::m_registers[t0], t0
</span><del>- loadisFromInstruction(6, t1)
</del><ins>+ loadpFromInstruction(6, t1)
</ins><span class="cx"> loadq [t0, t1, 8], t0
</span><span class="cx"> valueProfile(t0, 7, t1)
</span><span class="cx"> loadisFromInstruction(1, t1)
</span><span class="lines">@@ -2121,7 +2121,7 @@
</span><span class="cx"> macro putProperty()
</span><span class="cx"> loadisFromInstruction(3, t1)
</span><span class="cx"> loadConstantOrVariable(t1, t2)
</span><del>- loadisFromInstruction(6, t1)
</del><ins>+ loadpFromInstruction(6, t1)
</ins><span class="cx"> storePropertyAtVariableOffset(t1, t0, t2)
</span><span class="cx"> end
</span><span class="cx">
</span><span class="lines">@@ -2138,7 +2138,7 @@
</span><span class="cx"> loadisFromInstruction(3, t1)
</span><span class="cx"> loadConstantOrVariable(t1, t2)
</span><span class="cx"> loadp JSVariableObject::m_registers[t0], t0
</span><del>- loadisFromInstruction(6, t1)
</del><ins>+ loadpFromInstruction(6, t1)
</ins><span class="cx"> storeq t2, [t0, t1, 8]
</span><span class="cx"> end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>