<!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>[161407] 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/161407">161407</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-01-06 22:09:59 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack Branch: ARM64 Crash in llint_function_for_call_arity_check running 3d-raytrace.js
https://bugs.webkit.org/show_bug.cgi?id=126557
Reviewed by Geoffrey Garen.
We were crashing due the to definition of t5 in the offline assembler not
matching the definition of regT5 in GPRInfo.h. The crash was due to passing
the stub return address to the fixup thunk in regT5, but it contained garbage.
I changed the definitions of t4, t5 and t6 in the ARM64 back end of the offline
assembler to match GPRInfo.h.
* offlineasm/arm64.rb:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreofflineasmarm64rb">branches/jsCStack/Source/JavaScriptCore/offlineasm/arm64.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (161406 => 161407)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-07 06:09:35 UTC (rev 161406)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-07 06:09:59 UTC (rev 161407)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-01-06 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><ins>+ CStack Branch: ARM64 Crash in llint_function_for_call_arity_check running 3d-raytrace.js
+ https://bugs.webkit.org/show_bug.cgi?id=126557
+
+ Reviewed by Geoffrey Garen.
+
+ We were crashing due the to definition of t5 in the offline assembler not
+ matching the definition of regT5 in GPRInfo.h. The crash was due to passing
+ the stub return address to the fixup thunk in regT5, but it contained garbage.
+ I changed the definitions of t4, t5 and t6 in the ARM64 back end of the offline
+ assembler to match GPRInfo.h.
+
+ * offlineasm/arm64.rb:
+
+2014-01-06 Michael Saboff <msaboff@apple.com>
+
</ins><span class="cx"> CStack Branch: Fix nativeForGenerator() for non-X86 platforms
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126551
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreofflineasmarm64rb"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/offlineasm/arm64.rb (161406 => 161407)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/offlineasm/arm64.rb 2014-01-07 06:09:35 UTC (rev 161406)
+++ branches/jsCStack/Source/JavaScriptCore/offlineasm/arm64.rb 2014-01-07 06:09:59 UTC (rev 161407)
</span><span class="lines">@@ -40,14 +40,14 @@
</span><span class="cx"> # x1 => t1, a1, r1
</span><span class="cx"> # x2 => t2, a2
</span><span class="cx"> # x3 => a3
</span><ins>+# x5 => t5
+# x6 => t6
</ins><span class="cx"> # x9 => (nonArgGPR1 in baseline)
</span><del>-# x10 => t4 (unused in baseline)
-# x11 => t5 (unused in baseline)
-# x12 => t6 (unused in baseline)
</del><span class="cx"> # x13 => scratch (unused in baseline)
</span><span class="cx"> # x16 => scratch
</span><span class="cx"> # x17 => scratch
</span><span class="cx"> # x23 => t3
</span><ins>+# x24 => t4
</ins><span class="cx"> # x27 => csr1 (tagTypeNumber)
</span><span class="cx"> # x28 => csr2 (tagMask)
</span><span class="cx"> # x29 => cfr
</span><span class="lines">@@ -113,11 +113,11 @@
</span><span class="cx"> when 't3'
</span><span class="cx"> arm64GPRName('x23', kind)
</span><span class="cx"> when 't4'
</span><del>- arm64GPRName('x10', kind)
</del><ins>+ arm64GPRName('x24', kind)
</ins><span class="cx"> when 't5'
</span><del>- arm64GPRName('x11', kind)
</del><ins>+ arm64GPRName('x5', kind)
</ins><span class="cx"> when 't6'
</span><del>- arm64GPRName('x12', kind)
</del><ins>+ arm64GPRName('x6', kind)
</ins><span class="cx"> when 'cfr'
</span><span class="cx"> arm64GPRName('x29', kind)
</span><span class="cx"> when 'csr1'
</span></span></pre>
</div>
</div>
</body>
</html>