<!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>[195926] 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/195926">195926</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-31 03:41:52 -0800 (Sun, 31 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[mips] don't save to a callee saved register too early
https://bugs.webkit.org/show_bug.cgi?id=153463
If we save $gp to $s4 in pichdr, then in some cases, we were
overwriting $s4 before LLInt's pushCalleeSaves() is called (as pichdr
is at the very beginning of a function). Now we save $gp to $s4 at the
end of pushCalleeSaves().
Patch by Guillaume Emont <guijemont@igalia.com> on 2016-01-31
Reviewed by Michael Saboff.
* offlineasm/mips.rb:
* llint/LowLevelInterpreter.asm:
Move the saving of $gp to $s4 from pichdr to pushCalleeSaves(). Take
the opportunity to only save $s4 as we never use the other callee
saved registers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreterasm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm</a></li>
<li><a href="#trunkSourceJavaScriptCoreofflineasmmipsrb">trunk/Source/JavaScriptCore/offlineasm/mips.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (195925 => 195926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-01-31 11:41:44 UTC (rev 195925)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-01-31 11:41:52 UTC (rev 195926)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-31 Guillaume Emont <guijemont@igalia.com>
+
+ [mips] don't save to a callee saved register too early
+ https://bugs.webkit.org/show_bug.cgi?id=153463
+
+ If we save $gp to $s4 in pichdr, then in some cases, we were
+ overwriting $s4 before LLInt's pushCalleeSaves() is called (as pichdr
+ is at the very beginning of a function). Now we save $gp to $s4 at the
+ end of pushCalleeSaves().
+
+ Reviewed by Michael Saboff.
+
+ * offlineasm/mips.rb:
+ * llint/LowLevelInterpreter.asm:
+ Move the saving of $gp to $s4 from pichdr to pushCalleeSaves(). Take
+ the opportunity to only save $s4 as we never use the other callee
+ saved registers.
+
</ins><span class="cx"> 2016-01-30 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r195799 and r195828.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreterasm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm (195925 => 195926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-01-31 11:41:44 UTC (rev 195925)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2016-01-31 11:41:52 UTC (rev 195926)
</span><span class="lines">@@ -430,8 +430,10 @@
</span><span class="cx"> const CalleeSaveRegisterCount = 0
</span><span class="cx"> elsif ARM or ARMv7_TRADITIONAL or ARMv7
</span><span class="cx"> const CalleeSaveRegisterCount = 7
</span><del>-elsif SH4 or MIPS
</del><ins>+elsif SH4
</ins><span class="cx"> const CalleeSaveRegisterCount = 5
</span><ins>+elsif MIPS
+ const CalleeSaveRegisterCount = 1
</ins><span class="cx"> elsif X86 or X86_WIN
</span><span class="cx"> const CalleeSaveRegisterCount = 3
</span><span class="cx"> end
</span><span class="lines">@@ -449,12 +451,10 @@
</span><span class="cx"> elsif ARMv7
</span><span class="cx"> emit "push {r4-r6, r8-r11}"
</span><span class="cx"> elsif MIPS
</span><del>- emit "addiu $sp, $sp, -20"
- emit "sw $20, 16($sp)"
- emit "sw $19, 12($sp)"
- emit "sw $18, 8($sp)"
- emit "sw $17, 4($sp)"
- emit "sw $16, 0($sp)"
</del><ins>+ emit "addiu $sp, $sp, -4"
+ emit "sw $s4, 0($sp)"
+ # save $gp to $s4 so that we can restore it after a function call
+ emit "move $s4, $gp"
</ins><span class="cx"> elsif SH4
</span><span class="cx"> emit "mov.l r13, @-r15"
</span><span class="cx"> emit "mov.l r11, @-r15"
</span><span class="lines">@@ -479,12 +479,8 @@
</span><span class="cx"> elsif ARMv7
</span><span class="cx"> emit "pop {r4-r6, r8-r11}"
</span><span class="cx"> elsif MIPS
</span><del>- emit "lw $16, 0($sp)"
- emit "lw $17, 4($sp)"
- emit "lw $18, 8($sp)"
- emit "lw $19, 12($sp)"
- emit "lw $20, 16($sp)"
- emit "addiu $sp, $sp, 20"
</del><ins>+ emit "lw $s4, 0($sp)"
+ emit "addiu $sp, $sp, 4"
</ins><span class="cx"> elsif SH4
</span><span class="cx"> emit "mov.l @r15+, r8"
</span><span class="cx"> emit "mov.l @r15+, r9"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreofflineasmmipsrb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/offlineasm/mips.rb (195925 => 195926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/offlineasm/mips.rb 2016-01-31 11:41:44 UTC (rev 195925)
+++ trunk/Source/JavaScriptCore/offlineasm/mips.rb 2016-01-31 11:41:52 UTC (rev 195926)
</span><span class="lines">@@ -1041,7 +1041,6 @@
</span><span class="cx"> $asm.puts "sltu #{operands[0].mipsOperand}, #{operands[1].mipsOperand}, #{operands[2].mipsOperand}"
</span><span class="cx"> when "pichdr"
</span><span class="cx"> $asm.putStr("OFFLINE_ASM_CPLOAD(#{MIPS_CALL_REG.mipsOperand})")
</span><del>- $asm.puts "move #{MIPS_GPSAVE_REG.mipsOperand}, #{MIPS_GP_REG.mipsOperand}"
</del><span class="cx"> when "memfence"
</span><span class="cx"> $asm.puts "sync"
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>