<!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>[162701] 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/162701">162701</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2014-01-24 08:34:24 -0800 (Fri, 24 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ARM Offline assembler temporary register allocator has duplicate register when building fat binaries
https://bugs.webkit.org/show_bug.cgi?id=127545
Reviewed by Mark Lam.
Eliminate the conditional addition of <a href="http://trac.webkit.org/projects/webkit/changeset/11">r11</a>/<a href="http://trac.webkit.org/projects/webkit/changeset/7">r7</a> from getModifiedListARMCommon as the
.concat will add the new register to ARM_EXTRA_GPRS. If getModifiedListARMCommon is
invoked a second time, there will be a second <a href="http://trac.webkit.org/projects/webkit/changeset/11">r11</a> or <a href="http://trac.webkit.org/projects/webkit/changeset/7">r7</a>, which messes things up.
Instead, <a href="http://trac.webkit.org/projects/webkit/changeset/6">r6</a> was added to ARM_EXTRA_GPRS. <a href="http://trac.webkit.org/projects/webkit/changeset/6">r6</a> is currently an unused register.
* offlineasm/arm.rb:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreofflineasmarmrb">trunk/Source/JavaScriptCore/offlineasm/arm.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (162700 => 162701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-24 16:19:45 UTC (rev 162700)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-24 16:34:24 UTC (rev 162701)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-24 Michael Saboff <msaboff@apple.com>
+
+ ARM Offline assembler temporary register allocator has duplicate register when building fat binaries
+ https://bugs.webkit.org/show_bug.cgi?id=127545
+
+ Reviewed by Mark Lam.
+
+ Eliminate the conditional addition of r11/r7 from getModifiedListARMCommon as the
+ .concat will add the new register to ARM_EXTRA_GPRS. If getModifiedListARMCommon is
+ invoked a second time, there will be a second r11 or r7, which messes things up.
+ Instead, r6 was added to ARM_EXTRA_GPRS. r6 is currently an unused register.
+
+ * offlineasm/arm.rb:
+
</ins><span class="cx"> 2014-01-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Move ContentSearchUtils, ScriptBreakpoint, and ScriptDebugListener into JavaScriptCore for inspector
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreofflineasmarmrb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/offlineasm/arm.rb (162700 => 162701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/offlineasm/arm.rb 2014-01-24 16:19:45 UTC (rev 162700)
+++ trunk/Source/JavaScriptCore/offlineasm/arm.rb 2014-01-24 16:34:24 UTC (rev 162701)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-ARM_EXTRA_GPRS = [SpecialRegister.new("r10"), SpecialRegister.new("r12")]
</del><ins>+ARM_EXTRA_GPRS = [SpecialRegister.new("r6"), SpecialRegister.new("r10"), SpecialRegister.new("r12")]
</ins><span class="cx"> ARM_EXTRA_FPRS = [SpecialRegister.new("d7")]
</span><span class="cx"> ARM_SCRATCH_FPR = SpecialRegister.new("d6")
</span><span class="cx">
</span><span class="lines">@@ -223,11 +223,7 @@
</span><span class="cx"> result = riscLowerMalformedImmediates(result, 0..0xff)
</span><span class="cx"> result = riscLowerMisplacedAddresses(result)
</span><span class="cx"> result = riscLowerRegisterReuse(result)
</span><del>- if isARMv7
- result = assignRegistersToTemporaries(result, :gpr, ARM_EXTRA_GPRS.concat([SpecialRegister.new("r11")]))
- else
- result = assignRegistersToTemporaries(result, :gpr, ARM_EXTRA_GPRS.concat([SpecialRegister.new("r7")]))
- end
</del><ins>+ result = assignRegistersToTemporaries(result, :gpr, ARM_EXTRA_GPRS)
</ins><span class="cx"> result = assignRegistersToTemporaries(result, :fpr, ARM_EXTRA_FPRS)
</span><span class="cx"> return result
</span><span class="cx"> end
</span></span></pre>
</div>
</div>
</body>
</html>