Changeset 239838 in webkit for trunk/Source/JavaScriptCore/offlineasm/arm.rb

Timestamp:

Jan 10, 2019, 12:04:32 PM (6 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r239825.
​https://bugs.webkit.org/show_bug.cgi?id=193330

Broke tests on armv7/linux bots (Requested by guijemont on
#webkit).

Reverted changeset:

"Enable DFG on ARM/Linux again"
​https://bugs.webkit.org/show_bug.cgi?id=192496
​https://trac.webkit.org/changeset/239825

File:

• trunk/Source/JavaScriptCore/offlineasm/arm.rb (modified) (6 diffs)

trunk/Source/JavaScriptCore/offlineasm/arm.rb

@@ -35 +35 @@
 #  x3 => t3, a3, r3
 #  x6 =>            (callee-save scratch)
-#  x7 => cfr
+#  x7 => cfr        (ARMv7 only)
 #  x8 => t4         (callee-save)
 #  x9 => t5         (callee-save)
@@ -56 +56 @@
 # d7 =>              (scratch)
 
+def isARMv7
+    case $activeBackend
+    when "ARMv7"
+        true
+    else
+        raise "bad value for $activeBackend: #{$activeBackend}"
+    end
+end
+
 class Node
     def armSingle
@@ -83 +92 @@
     elsif (~value) >= 0 && (~value) < 256
         $asm.puts "mvn #{register.armOperand}, \##{~value}"
-    else
+    elsif isARMv7
         $asm.puts "movw #{register.armOperand}, \##{value & 0xffff}"
         if (value & 0xffff0000) != 0
             $asm.puts "movt #{register.armOperand}, \##{(value >> 16) & 0xffff}"
         end
+    else
+        $asm.puts "ldr #{register.armOperand}, =#{value}"
     end
 end
@@ -109 +120 @@
             "r9"
         when "cfr"
-            "r7"
+            isARMv7 ?  "r7" : "r11"
         when "csr0"
             "r11"
@@ -599 +610 @@
                 $asm.puts "mov pc, #{operands[0].armOperand}"
             end
+            if not isARMv7 and not isARMv7Traditional
+                $asm.puts ".ltorg"
+            end
         when "call"
             if operands[0].label?
@@ -679 +693 @@
             $asm.puts "ldr #{dest.armOperand}, [#{dest.armOperand}, #{temp.armOperand}]"
 
-            offset = 4
+            offset = $activeBackend == "ARMv7" ? 4 : 8
 
             $asm.deferNextLabelAction {