Changeset 167127 in webkit

Timestamp:

Apr 11, 2014 8:55:29 AM (10 years ago)

Author:

Julien Brianceau

Message:

Fix LLInt for sh4 architecture (broken since C stack merge).
​https://bugs.webkit.org/show_bug.cgi?id=131532

Reviewed by Mark Lam.

This patch fixes build and also implements sh4 parts for initPCRelative and
setEntryAddress macros introduced in ​http://trac.webkit.org/changeset/167094.

• llint/LowLevelInterpreter.asm:
• llint/LowLevelInterpreter32_64.asm:
• offlineasm/instructions.rb:
• offlineasm/sh4.rb:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter.asm (modified) (7 diffs)
• llint/LowLevelInterpreter32_64.asm (modified) (1 diff)
• offlineasm/instructions.rb (modified) (1 diff)
• offlineasm/sh4.rb (modified) (9 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-11  Julien Brianceau  <jbriance@cisco.com>
+
+        Fix LLInt for sh4 architecture (broken since C stack merge).
+        https://bugs.webkit.org/show_bug.cgi?id=131532
+
+        Reviewed by Mark Lam.
+
+        This patch fixes build and also implements sh4 parts for initPCRelative and
+        setEntryAddress macros introduced in http://trac.webkit.org/changeset/167094.
+
+        * llint/LowLevelInterpreter.asm:
+        * llint/LowLevelInterpreter32_64.asm:
+        * offlineasm/instructions.rb:
+        * offlineasm/sh4.rb:
+
 2014-04-10  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -229 +229 @@
 
 macro checkStackPointerAlignment(tempReg, location)
-    if ARM64 or C_LOOP
+    if ARM64 or C_LOOP or SH4
         # ARM64 will check for us!
         # C_LOOP does not need the alignment, and can use a little perf
         # improvement from avoiding useless work.
+        # SH4 does not need specific alignment (4 bytes).
     else
         if ARM or ARMv7 or ARMv7_TRADITIONAL
@@ -301 +302 @@
     elsif ARM64
         pushLRAndFP
-    elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+    elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS or SH4
         push lr
         push cfr
@@ -313 +314 @@
     elsif ARM64
         popLRAndFP
-    elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+    elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS or SH4
         pop cfr
         pop lr
@@ -327 +328 @@
     elsif ARM64
         pushLRAndFP
-    elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+    elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS or SH4
         push lr
         push cfr
@@ -382 +383 @@
     elsif ARM64
         popLRAndFP
-    elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS
+    elsif C_LOOP or ARM or ARMv7 or ARMv7_TRADITIONAL or MIPS or SH4
         pop cfr
         pop lr
@@ -717 +718 @@
         crash()  # Need to replace with any initialization steps needed to step up PC relative address calculation
     elsif SH4
-        crash()  # Need to replace with any initialization steps needed to step up PC relative address calculation
+        mova _relativePCBase, t0
+        move t0, pcBase
+        alignformova
+    _relativePCBase:
     end
 end
@@ -742 +746 @@
         crash()  # Need to replace with code to turn label into and absolute address and save at index
     elsif SH4
-        crash()  # Need to replace with code to turn label into and absolute address and save at index
+        move label, t2
+        subp _relativePCBase, t2
+        addp t1, t2
+        move index, t3
+        storep t2, [a0, t3, 4]
+        flushcp # Force constant pool flush to avoid "pcrel too far" link error.
     end
 end

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -193 +193 @@
     elsif SH4
         const entry = a0
-        const vmTopCallFrame = a1
+        const vm = a1
         const protoCallFrame = a2
-        const topOfStack = a3
 
         const previousCFR = t3
         const previousPC = lr
         const temp1 = t3 # Same as previousCFR
-        const temp2 = a3 # Same as topOfStack
+        const temp2 = a3
         const temp3 = t8
         const temp4 = t9

trunk/Source/JavaScriptCore/offlineasm/instructions.rb

@@ -293 +293 @@
 SH4_INSTRUCTIONS =
     [
+    "flushcp",
+    "alignformova",
+    "mova",
     "shllx",
     "shlrx",

trunk/Source/JavaScriptCore/offlineasm/sh4.rb

@@ -151 +151 @@
 end
 
+class LabelReference
+    def sh4Operand
+        value
+    end
+end
+
 class ConstPool < Node
     attr_reader :size
@@ -457 +463 @@
             operands.each {
                 | operand |
-                if operand.is_a? LabelReference
+                if operand.is_a? LabelReference and node.opcode != "mova"
                     tmp = Tmp.new(operand.codeOrigin, :gpr)
                     newList << Instruction.new(operand.codeOrigin, "move", [operand, tmp])
@@ -550 +556 @@
         if node.is_a? Instruction
             case node.opcode
-            when "jmp", "ret"
-                newList << node
+            when "jmp", "ret", "flushcp"
+                if node.opcode == "flushcp"
+                    outlabel = LocalLabel.unique("flushcp")
+                    newList << Instruction.new(codeOrigin, "jmp", [LocalLabelReference.new(codeOrigin, outlabel)])
+                else
+                    newList << node
+                end
                 if not currentPool16.empty?
                     newList << ConstPool.new(codeOrigin, currentPool16, 16)
@@ -559 +570 @@
                     newList << ConstPool.new(codeOrigin, currentPool32, 32)
                     currentPool32 = []
+                end
+                if node.opcode == "flushcp"
+                    newList << outlabel
                 end
             when "move"
@@ -844 +858 @@
         when "subi", "subp"
             if operands.size == 3
-                if operands[1].sh4Operand == operands[2].sh4Operand
+                if operands[1].is_a? Immediate
+                    $asm.puts "mov #{sh4Operands([Immediate.new(codeOrigin, -1 * operands[1].value), operands[2]])}"
+                    $asm.puts "add #{sh4Operands([operands[0], operands[2]])}"
+                elsif operands[1].sh4Operand == operands[2].sh4Operand
                     $asm.puts "neg #{sh4Operands([operands[2], operands[2]])}"
                     $asm.puts "add #{sh4Operands([operands[0], operands[2]])}"
@@ -878 +895 @@
                 $asm.puts "shl#{opcode[3, 1]}#{operands[0].value} #{operands[1].sh4Operand}"
             end
+        when "shalx", "sharx"
+            raise "Unhandled parameters for opcode #{opcode}" unless operands[0].is_a? Immediate and operands[0].value == 1
+            $asm.puts "sha#{opcode[3, 1]} #{operands[1].sh4Operand}"
         when "shld", "shad"
             $asm.puts "#{opcode} #{sh4Operands(operands)}"
@@ -1009 +1029 @@
         when "loadi", "loadis", "loadp", "storei", "storep"
             $asm.puts "mov.l #{sh4Operands(operands)}"
+        when "alignformova"
+            $asm.puts ".balign 4"
+        when "mova"
+            $asm.puts "mova #{sh4Operands(operands)}"
         when "move"
             if operands[0].is_a? ConstPoolEntry
@@ -1046 +1070 @@
         when "memfence"
             $asm.puts "synco"
+        when "pop"
+            if operands[0].sh4Operand == "pr"
+                $asm.puts "lds.l @r15+, #{sh4Operands(operands)}"
+            else
+                $asm.puts "mov.l @r15+, #{sh4Operands(operands)}"
+            end
+        when "push"
+            if operands[0].sh4Operand == "pr"
+                $asm.puts "sts.l #{sh4Operands(operands)}, @-r15"
+            else
+                $asm.puts "mov.l #{sh4Operands(operands)}, @-r15"
+            end
         when "popCalleeSaves"
             $asm.puts "mov.l @r15+, r8"
@@ -1052 +1088 @@
             $asm.puts "mov.l @r15+, r11"
             $asm.puts "mov.l @r15+, r13"
-            $asm.puts "lds.l @r15+, pr"
-            $asm.puts "mov.l @r15+, r14"
         when "pushCalleeSaves"
-            $asm.puts "mov.l r14, @-r15"
-            $asm.puts "sts.l pr, @-r15"
             $asm.puts "mov.l r13, @-r15"
             $asm.puts "mov.l r11, @-r15"