<!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>[167599] 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/167599">167599</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 11:10:41 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/167591">r167591</a>): ARM64 and ARM traditional builds broken
https://bugs.webkit.org/show_bug.cgi?id=131935
Reviewed by Mark Hahnenberg.
Added store8(TrustedImm32, MacroAssembler::Address) to the ARM traditional and ARM64
macro assemblers. Added a new test for the original patch.
* assembler/MacroAssemblerARM.h:
(JSC::MacroAssemblerARM::store8):
* assembler/MacroAssemblerARM64.h:
(JSC::MacroAssemblerARM64::store8):
* tests/stress/dfg-create-arguments-inline-alloc.js: New test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressdfgcreateargumentsinlineallocjs">trunk/Source/JavaScriptCore/tests/stress/dfg-create-arguments-inline-alloc.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (167598 => 167599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-21 18:08:49 UTC (rev 167598)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-21 18:10:41 UTC (rev 167599)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-21 Michael Saboff <msaboff@apple.com>
+
+ REGRESSION(r167591): ARM64 and ARM traditional builds broken
+ https://bugs.webkit.org/show_bug.cgi?id=131935
+
+ Reviewed by Mark Hahnenberg.
+
+ Added store8(TrustedImm32, MacroAssembler::Address) to the ARM traditional and ARM64
+ macro assemblers. Added a new test for the original patch.
+
+ * assembler/MacroAssemblerARM.h:
+ (JSC::MacroAssemblerARM::store8):
+ * assembler/MacroAssemblerARM64.h:
+ (JSC::MacroAssemblerARM64::store8):
+ * tests/stress/dfg-create-arguments-inline-alloc.js: New test.
+
</ins><span class="cx"> 2014-04-21 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> Inline allocate Arguments objects in the DFG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (167598 => 167599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2014-04-21 18:08:49 UTC (rev 167598)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2014-04-21 18:10:41 UTC (rev 167599)
</span><span class="lines">@@ -459,12 +459,23 @@
</span><span class="cx"> m_assembler.baseIndexTransfer32(ARMAssembler::StoreUint8, src, address.base, address.index, static_cast<int>(address.scale), address.offset);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void store8(RegisterID src, ImplicitAddress address)
+ {
+ m_assembler.dtrUp(ARMAssembler::StoreUint8, src, address.base, address.offset);
+ }
+
</ins><span class="cx"> void store8(RegisterID src, const void* address)
</span><span class="cx"> {
</span><span class="cx"> move(TrustedImmPtr(address), ARMRegisters::S0);
</span><span class="cx"> m_assembler.dtrUp(ARMAssembler::StoreUint8, src, ARMRegisters::S0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void store8(TrustedImm32 imm, ImplicitAddress address)
+ {
+ move(imm, ARMRegisters::S1);
+ store8(ARMRegisters::S1, address);
+ }
+
</ins><span class="cx"> void store8(TrustedImm32 imm, const void* address)
</span><span class="cx"> {
</span><span class="cx"> move(TrustedImm32(reinterpret_cast<ARMWord>(address)), ARMRegisters::S0);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (167598 => 167599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-04-21 18:08:49 UTC (rev 167598)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-04-21 18:10:41 UTC (rev 167599)
</span><span class="lines">@@ -1093,6 +1093,15 @@
</span><span class="cx"> m_assembler.strb(src, memoryTempRegister, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void store8(RegisterID src, ImplicitAddress address)
+ {
+ if (tryStoreWithOffset<8>(src, address.base, address.offset))
+ return;
+
+ signExtend32ToPtr(TrustedImm32(address.offset), getCachedMemoryTempRegisterIDAndInvalidate());
+ m_assembler.str<8>(src, address.base, memoryTempRegister);
+ }
+
</ins><span class="cx"> void store8(TrustedImm32 imm, void* address)
</span><span class="cx"> {
</span><span class="cx"> if (!imm.m_value) {
</span><span class="lines">@@ -1104,7 +1113,17 @@
</span><span class="cx"> store8(dataTempRegister, address);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void store8(TrustedImm32 imm, ImplicitAddress address)
+ {
+ if (!imm.m_value) {
+ store8(ARM64Registers::zr, address);
+ return;
+ }
</ins><span class="cx">
</span><ins>+ move(imm, getCachedDataTempRegisterIDAndInvalidate());
+ store8(dataTempRegister, address);
+ }
+
</ins><span class="cx"> // Floating-point operations:
</span><span class="cx">
</span><span class="cx"> static bool supportsFloatingPoint() { return true; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressdfgcreateargumentsinlineallocjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/dfg-create-arguments-inline-alloc.js (0 => 167599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/dfg-create-arguments-inline-alloc.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/dfg-create-arguments-inline-alloc.js 2014-04-21 18:10:41 UTC (rev 167599)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+var foo = function(o) {
+ var a = Array.prototype.slice.call(arguments);
+ var sum = 0;
+ for (var i = 0; i < a.length; ++i)
+ sum += a[i].x;
+ return sum;
+};
+
+noInline(foo);
+
+var niters = 10000;
+var total = 0;
+var o = {x: 42};
+for (var i = 0; i < niters; ++i) {
+ total += foo(o, o, o);
+}
+
+if (total != 42 * 3 * niters)
+ throw new Error("Incorrect result!");
</ins></span></pre>
</div>
</div>
</body>
</html>