Changeset 154025 in webkit

Timestamp:

Aug 13, 2013 3:15:13 PM (11 years ago)

Author:

oliver@apple.com

Message:

[sh4] Prepare LLINT for DFG_JIT implementation.
​https://bugs.webkit.org/show_bug.cgi?id=119755

Patch by Julien Brianceau <​jbrianceau@nds.com> on 2013-08-13
Reviewed by Oliver Hunt.

• LLIntOffsetsExtractor.pro: Add sh4.rb dependency.
• offlineasm/sh4.rb:
  • Handle storeb opcode.
  • Make relative jumps when possible using braf opcode.
  • Update bmulio implementation to be consistent with baseline JIT.
  • Remove useless code from leap opcode.
  • Fix incorrect comment.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• LLIntOffsetsExtractor.pro (modified) (1 diff)
• offlineasm/sh4.rb (modified) (9 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-08-13  Julien Brianceau  <jbrianceau@nds.com>
+
+        [sh4] Prepare LLINT for DFG_JIT implementation.
+        https://bugs.webkit.org/show_bug.cgi?id=119755
+
+        Reviewed by Oliver Hunt.
+
+        * LLIntOffsetsExtractor.pro: Add sh4.rb dependency.
+        * offlineasm/sh4.rb:
+            - Handle storeb opcode.
+            - Make relative jumps when possible using braf opcode.
+            - Update bmulio implementation to be consistent with baseline JIT.
+            - Remove useless code from leap opcode.
+            - Fix incorrect comment.
+
 2013-08-13  Julien Brianceau  <jbrianceau@nds.com>
 

trunk/Source/JavaScriptCore/LLIntOffsetsExtractor.pro

@@ -46 +46 @@
     $$PWD/offlineasm/self_hash.rb \
     $$PWD/offlineasm/settings.rb \
+    $$PWD/offlineasm/sh4.rb \
     $$PWD/offlineasm/transform.rb \
     $$PWD/offlineasm/x86.rb

trunk/Source/JavaScriptCore/offlineasm/sh4.rb

@@ -213 +213 @@
 # will become:
 #
-# addi foo, bar, tmp
-# bs tmp, baz
+# addi foo, bar
+# bs bar, baz
 #
 
@@ -406 +406 @@
             if address.is_a? Address
                 case node.opcode
-                when "btbz", "btbnz", "cbeq", "bbeq", "bbneq", "bbb", "loadb"
+                when "btbz", "btbnz", "cbeq", "bbeq", "bbneq", "bbb", "loadb", "storeb"
                     (0..15).include? address.offset.value and
                         ((node.operands[0].is_a? RegisterID and node.operands[0].sh4Operand == "r0") or
@@ -442 +442 @@
 end
 
-def emitSH4Load32(constant, dest)
-    outlabel = LocalLabel.unique("load32out")
-    constlabel = LocalLabel.unique("load32const")
-    $asm.puts "mov.l #{LocalLabelReference.new(codeOrigin, constlabel).asmLabel}, #{dest.sh4Operand}"
-    $asm.puts "bra #{LocalLabelReference.new(codeOrigin, outlabel).asmLabel}"
+def emitSH4Load32AndJump(constant, scratch)
+    $asm.puts "mov.l 2f, #{scratch.sh4Operand}"
+    $asm.puts "braf #{scratch.sh4Operand}"
     $asm.puts "nop"
-    $asm.puts ".balign 4"
-    constlabel.lower("SH4")
-    $asm.puts ".long #{constant}"
-    outlabel.lower("SH4")
-end
-
-def emitSH4Load32AndJump(constant, scratch)
-    constlabel = LocalLabel.unique("load32const")
-    $asm.puts "mov.l #{LocalLabelReference.new(codeOrigin, constlabel).asmLabel}, #{scratch.sh4Operand}"
-    $asm.puts "jmp @#{scratch.sh4Operand}"
-    $asm.puts "nop"
-    $asm.puts ".balign 4"
-    constlabel.lower("SH4")
-    $asm.puts ".long #{constant}"
+    $asm.puts "1: .balign 4"
+    $asm.puts "2: .long #{constant}-1b"
 end
 
@@ -481 +467 @@
         constlabel.lower("SH4")
     else
-        emitSH4Load32(operands[0].value, operands[1])
+        outlabel = LocalLabel.unique("load32out")
+        constlabel = LocalLabel.unique("load32const")
+        $asm.puts "mov.l #{LocalLabelReference.new(codeOrigin, constlabel).asmLabel}, #{operands[1].sh4Operand}"
+        $asm.puts "bra #{LocalLabelReference.new(codeOrigin, outlabel).asmLabel}"
+        $asm.puts "nop"
+        $asm.puts ".balign 4"
+        constlabel.lower("SH4")
+        $asm.puts ".long #{operands[0].value}"
+        outlabel.lower("SH4")
     end
 end
@@ -657 +651 @@
             $asm.puts "dmuls.l #{sh4Operands([operands[2], operands[3]])}"
             $asm.puts "sts macl, #{operands[3].sh4Operand}"
-            $asm.puts "sts mach, #{operands[0].sh4Operand}"
             $asm.puts "cmp/pz #{operands[3].sh4Operand}"
             $asm.puts "movt #{operands[1].sh4Operand}"
-            $asm.puts "dt #{operands[1].sh4Operand}"
+            $asm.puts "add #-1, #{operands[1].sh4Operand}"
+            $asm.puts "sts mach, #{operands[0].sh4Operand}"
             $asm.puts "cmp/eq #{sh4Operands([operands[0], operands[1]])}"
             $asm.puts "bf #{operands[4].asmLabel}"
@@ -716 +710 @@
             $asm.puts "lds r0, pr"
             $asm.puts "mov.l @(6, PC), #{operands[1].sh4Operand}"
-            $asm.puts "jmp @#{operands[1].sh4Operand}"
+            $asm.puts "braf #{operands[1].sh4Operand}"
             $asm.puts "mov #{operands[0].sh4Operand}, r0"
-            $asm.puts ".long #{operands[2].asmLabel}"
+            $asm.puts ".long #{operands[2].asmLabel}-."
         when "jmp"
             if operands[0].is_a? LocalLabelReference
@@ -736 +730 @@
             $asm.puts "mov.b #{sh4Operands(operands)}"
             $asm.puts "extu.b #{sh4Operands([operands[1], operands[1]])}"
+        when "storeb"
+            $asm.puts "mov.b #{sh4Operands(operands)}"
         when "loadh"
             $asm.puts "mov.w #{sh4Operands(operands)}"
@@ -742 +738 @@
             $asm.puts "mov.l #{sh4Operands(operands)}"
         when "move"
-            if operands[0].is_a? LabelReference
-                emitSH4Load32(operands[0].asmLabel, operands[1])
-            elsif operands[0].is_a? Immediate
+            if operands[0].is_a? Immediate
                 emitSH4LoadImm(operands)
             else
@@ -752 +746 @@
             if operands[0].is_a? BaseIndex
                 biop = operands[0]
-                if biop.scale > 0
-                    $asm.puts "mov #{sh4Operands([biop.index, operands[1]])}"
-                    if biop.scaleShift > 0
-                        emitSH4ShiftImm(biop.scaleShift, operands[1], "l")
-                    end
-                    $asm.puts "add #{sh4Operands([biop.base, operands[1]])}"
-                else
-                    $asm.puts "mov #{sh4Operands([biop.base, operands[1]])}"
-                end
+                $asm.puts "mov #{sh4Operands([biop.index, operands[1]])}"
+                if biop.scaleShift > 0
+                    emitSH4ShiftImm(biop.scaleShift, operands[1], "l")
+                end
+                $asm.puts "add #{sh4Operands([biop.base, operands[1]])}"
                 if biop.offset.value != 0
                     $asm.puts "add #{sh4Operands([biop.offset, operands[1]])}"