Changeset 148653 in webkit

Timestamp:

Apr 17, 2013 6:08:49 PM (11 years ago)

Author:

commit-queue@webkit.org

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 <​jbrianceau@nds.com> on 2013-04-17
Reviewed by Oliver Hunt.

• offlineasm/sh4.rb:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• offlineasm/sh4.rb (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-04-17  Julien Brianceau  <jbrianceau@nds.com>
+
+        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  <roger_fong@apple.com>
 

trunk/Source/JavaScriptCore/offlineasm/sh4.rb

@@ -458 +458 @@
 
 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