<!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>[160315] 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/160315">160315</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-09 10:36:44 -0800 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix sh4 LLINT build.
https://bugs.webkit.org/show_bug.cgi?id=125454
Patch by Julien Brianceau <jbriance@cisco.com> on 2013-12-09
Reviewed by Michael Saboff.
In LLINT, sh4 backend implementation didn't handle properly conditional jumps using
a LabelReference instance. This patch fixes it through sh4LowerMisplacedLabels phase.
Also, to avoid the need of a 4th temporary gpr, this phase is triggered later in
getModifiedListSH4.
* offlineasm/sh4.rb:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreofflineasmsh4rb">trunk/Source/JavaScriptCore/offlineasm/sh4.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160314 => 160315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-09 18:30:31 UTC (rev 160314)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-09 18:36:44 UTC (rev 160315)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-09 Julien Brianceau <jbriance@cisco.com>
+
+ Fix sh4 LLINT build.
+ https://bugs.webkit.org/show_bug.cgi?id=125454
+
+ Reviewed by Michael Saboff.
+
+ In LLINT, sh4 backend implementation didn't handle properly conditional jumps using
+ a LabelReference instance. This patch fixes it through sh4LowerMisplacedLabels phase.
+ Also, to avoid the need of a 4th temporary gpr, this phase is triggered later in
+ getModifiedListSH4.
+
+ * offlineasm/sh4.rb:
+
</ins><span class="cx"> 2013-12-08 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Add the notion of ConstantStoragePointer to DFG IR
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreofflineasmsh4rb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/offlineasm/sh4.rb (160314 => 160315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/offlineasm/sh4.rb 2013-12-09 18:30:31 UTC (rev 160314)
+++ trunk/Source/JavaScriptCore/offlineasm/sh4.rb 2013-12-09 18:36:44 UTC (rev 160315)
</span><span class="lines">@@ -452,18 +452,19 @@
</span><span class="cx"> list.each {
</span><span class="cx"> | node |
</span><span class="cx"> if node.is_a? Instruction
</span><del>- case node.opcode
- when "jmp", "call"
- if node.operands[0].is_a? LabelReference
- tmp = Tmp.new(codeOrigin, :gpr)
- newList << Instruction.new(codeOrigin, "move", [node.operands[0], tmp])
- newList << Instruction.new(codeOrigin, node.opcode, [tmp])
</del><ins>+ operands = node.operands
+ newOperands = []
+ operands.each {
+ | operand |
+ if operand.is_a? LabelReference
+ tmp = Tmp.new(operand.codeOrigin, :gpr)
+ newList << Instruction.new(operand.codeOrigin, "move", [operand, tmp])
+ newOperands << tmp
</ins><span class="cx"> else
</span><del>- newList << node
</del><ins>+ newOperands << operand
</ins><span class="cx"> end
</span><del>- else
- newList << node
- end
</del><ins>+ }
+ newList << Instruction.new(node.codeOrigin, node.opcode, newOperands, node.annotation)
</ins><span class="cx"> else
</span><span class="cx"> newList << node
</span><span class="cx"> end
</span><span class="lines">@@ -730,8 +731,8 @@
</span><span class="cx"> "bbeq", "bbneq", "bbb", "bieq", "bpeq", "bineq", "bpneq", "bia", "bpa", "biaeq", "bpaeq", "bib", "bpb",
</span><span class="cx"> "bigteq", "bpgteq", "bilt", "bplt", "bigt", "bpgt", "bilteq", "bplteq", "btiz", "btpz", "btinz", "btpnz", "btbz", "btbnz"])
</span><span class="cx"> result = riscLowerMalformedImmediates(result, -128..127)
</span><ins>+ result = riscLowerMisplacedAddresses(result)
</ins><span class="cx"> result = sh4LowerMisplacedLabels(result)
</span><del>- result = riscLowerMisplacedAddresses(result)
</del><span class="cx"> result = sh4LowerMisplacedSpecialRegisters(result)
</span><span class="cx">
</span><span class="cx"> result = assignRegistersToTemporaries(result, :gpr, SH4_TMP_GPRS)
</span><span class="lines">@@ -749,6 +750,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def emitSH4Branch(sh4opcode, operand)
</span><ins>+ raise "Invalid operand #{operand}" unless operand.is_a? RegisterID or operand.is_a? SpecialRegister
</ins><span class="cx"> $asm.puts "#{sh4opcode} @#{operand.sh4Operand}"
</span><span class="cx"> $asm.puts "nop"
</span><span class="cx"> end
</span><span class="lines">@@ -772,12 +774,16 @@
</span><span class="cx"> end
</span><span class="cx"> end
</span><span class="cx">
</span><del>-def emitSH4BranchIfT(label, neg)
</del><ins>+def emitSH4BranchIfT(dest, neg)
</ins><span class="cx"> outlabel = LocalLabel.unique("branchIfT")
</span><span class="cx"> sh4opcode = neg ? "bt" : "bf"
</span><span class="cx"> $asm.puts "#{sh4opcode} #{LocalLabelReference.new(codeOrigin, outlabel).asmLabel}"
</span><del>- $asm.puts "bra #{label.asmLabel}"
- $asm.puts "nop"
</del><ins>+ if dest.is_a? LocalLabelReference
+ $asm.puts "bra #{dest.asmLabel}"
+ $asm.puts "nop"
+ else
+ emitSH4Branch("jmp", dest)
+ end
</ins><span class="cx"> outlabel.lower("SH4")
</span><span class="cx"> end
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>