<!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>[161439] 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/161439">161439</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-01-07 11:30:34 -0800 (Tue, 07 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: ARM64 Crash running ecma/FunctionObjects/15.3.1.1-3.js
https://bugs.webkit.org/show_bug.cgi?id=126585
Reviewed by Geoffrey Garen.
We were improperly using a shifted add/subtract for operations with the stack
pointer as the destination. Broadened the cases where we use the extended
register version of add/subtract to include when the destination is the
stack pointer. In the ARM64 documentation, the immediate and extended register
forms of add and subtract are the right variants to manipulate the stack pointer.
* assembler/ARM64Assembler.h:
(JSC::ARM64Assembler::add):
(JSC::ARM64Assembler::sub):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreassemblerARM64Assemblerh">branches/jsCStack/Source/JavaScriptCore/assembler/ARM64Assembler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (161438 => 161439)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-07 19:14:59 UTC (rev 161438)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-07 19:30:34 UTC (rev 161439)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-07 Michael Saboff <msaboff@apple.com>
+
+ CStack Branch: ARM64 Crash running ecma/FunctionObjects/15.3.1.1-3.js
+ https://bugs.webkit.org/show_bug.cgi?id=126585
+
+ Reviewed by Geoffrey Garen.
+
+ We were improperly using a shifted add/subtract for operations with the stack
+ pointer as the destination. Broadened the cases where we use the extended
+ register version of add/subtract to include when the destination is the
+ stack pointer. In the ARM64 documentation, the immediate and extended register
+ forms of add and subtract are the right variants to manipulate the stack pointer.
+
+ * assembler/ARM64Assembler.h:
+ (JSC::ARM64Assembler::add):
+ (JSC::ARM64Assembler::sub):
+
</ins><span class="cx"> 2014-01-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge trunk r161411.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreassemblerARM64Assemblerh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/assembler/ARM64Assembler.h (161438 => 161439)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/assembler/ARM64Assembler.h 2014-01-07 19:14:59 UTC (rev 161438)
+++ branches/jsCStack/Source/JavaScriptCore/assembler/ARM64Assembler.h 2014-01-07 19:30:34 UTC (rev 161439)
</span><span class="lines">@@ -929,8 +929,9 @@
</span><span class="cx"> ALWAYS_INLINE void add(RegisterID rd, RegisterID rn, RegisterID rm, ShiftType shift, int amount)
</span><span class="cx"> {
</span><span class="cx"> CHECK_DATASIZE();
</span><del>- if (isSp(rn)) {
</del><ins>+ if (isSp(rd) || isSp(rn)) {
</ins><span class="cx"> ASSERT(shift == LSL);
</span><ins>+ ASSERT(!isSp(rm));
</ins><span class="cx"> add<datasize, setFlags>(rd, rn, rm, UXTX, amount);
</span><span class="cx"> } else
</span><span class="cx"> insn(addSubtractShiftedRegister(DATASIZE, AddOp_ADD, setFlags, shift, rm, amount, rn, rd));
</span><span class="lines">@@ -1962,8 +1963,9 @@
</span><span class="cx"> ALWAYS_INLINE void sub(RegisterID rd, RegisterID rn, RegisterID rm, ShiftType shift, int amount)
</span><span class="cx"> {
</span><span class="cx"> CHECK_DATASIZE();
</span><del>- if (isSp(rn)) {
</del><ins>+ if (isSp(rd) || isSp(rn)) {
</ins><span class="cx"> ASSERT(shift == LSL);
</span><ins>+ ASSERT(!isSp(rm));
</ins><span class="cx"> sub<datasize, setFlags>(rd, rn, rm, UXTX, amount);
</span><span class="cx"> } else
</span><span class="cx"> insn(addSubtractShiftedRegister(DATASIZE, AddOp_SUB, setFlags, shift, rm, amount, rn, rd));
</span></span></pre>
</div>
</div>
</body>
</html>