Title: [148653] trunk/Source/_javascript_Core
Revision
148653
Author
[email protected]
Date
2013-04-17 18:08:49 -0700 (Wed, 17 Apr 2013)

Log Message

Fix SH4 build (broken since r148639).
https://bugs.webkit.org/show_bug.cgi?id=114773.

Allow longer displacements for specific branches in SH4 LLINT.

Patch by Julien Brianceau <[email protected]> on 2013-04-17
Reviewed by Oliver Hunt.

* offlineasm/sh4.rb:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (148652 => 148653)


--- trunk/Source/_javascript_Core/ChangeLog	2013-04-18 00:37:14 UTC (rev 148652)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-04-18 01:08:49 UTC (rev 148653)
@@ -1,3 +1,14 @@
+2013-04-17  Julien Brianceau  <[email protected]>
+
+        Fix SH4 build (broken since r148639).
+        https://bugs.webkit.org/show_bug.cgi?id=114773.
+
+        Allow longer displacements for specific branches in SH4 LLINT.
+
+        Reviewed by Oliver Hunt.
+
+        * offlineasm/sh4.rb:
+
 2013-04-14  Roger Fong  <[email protected]>
 
         Unreviewed. More Windows build fix.

Modified: trunk/Source/_javascript_Core/offlineasm/sh4.rb (148652 => 148653)


--- trunk/Source/_javascript_Core/offlineasm/sh4.rb	2013-04-18 00:37:14 UTC (rev 148652)
+++ trunk/Source/_javascript_Core/offlineasm/sh4.rb	2013-04-18 01:08:49 UTC (rev 148653)
@@ -457,8 +457,21 @@
 end
 
 def emitSH4BranchIfT(label, neg)
-    sh4opcode = neg ? "bf" : "bt"
-    $asm.puts "#{sh4opcode} #{label.asmLabel}"
+    outlabel = LocalLabel.unique("branchIfT")
+    sh4opcode = neg ? "bt" : "bf"
+    $asm.puts "#{sh4opcode} #{LocalLabelReference.new(codeOrigin, outlabel).asmLabel}"
+    if label.is_a? LocalLabelReference
+        $asm.puts "bra #{label.asmLabel}"
+        $asm.puts "nop"
+    else
+        $asm.puts ".balign 4"
+        $asm.puts "mov.l @(8, PC), #{SH4_TMP_GPRS[0].sh4Operand}"
+        $asm.puts "jmp @#{SH4_TMP_GPRS[0].sh4Operand}"
+        $asm.puts "nop"
+        $asm.puts "nop"
+        $asm.puts ".long #{label.asmLabel}"
+    end
+    outlabel.lower("SH4")
 end
 
 def emitSH4IntCompare(cmpOpcode, operands)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to