Changeset 167566 in webkit

Timestamp:

Apr 20, 2014 6:58:25 AM (10 years ago)

Author:

Csaba Osztrogonác

Message:

JavaScriptCore: ARM build fix after r167094.
​https://bugs.webkit.org/show_bug.cgi?id=131612

Patch by László Langó <​llango.u-szeged@partner.samsung.com> on 2014-04-20
Reviewed by Michael Saboff.

After r167094 there are many build errors on ARM like these:

/tmp/ccgtHRno.s:370: Error: invalid constant (425a) after fixup
/tmp/ccgtHRno.s:374: Error: invalid constant (426e) after fixup
/tmp/ccgtHRno.s:378: Error: invalid constant (4282) after fixup
/tmp/ccgtHRno.s:382: Error: invalid constant (4296) after fixup

Problem is caused by the wrong generated assembly like:

"\tmov r2, (" LOCAL_LABEL_STRING(llint_op_strcat) " - " LOCAL_LABEL_STRING(relativePCBase) ")\n" /home/webkit/WebKit/Source/JavaScriptCore/llint/LowLevelInterpreter.asm:741

mov can only move 8 bit immediate, but not every constant fit into 8 bit. Clang converts
the mov to a single movw or a movw and a movt, depending on the immediate, but binutils doesn't.
Add a new ARM specific offline assembler instruction (mvlbl) for the following llint_entry
use case: move rn, (label1-label2) which is translated to movw and movt.

• llint/LowLevelInterpreter.asm:
• offlineasm/arm.rb:
• offlineasm/instructions.rb:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter.asm (modified) (1 diff)
• offlineasm/arm.rb (modified) (1 diff)
• offlineasm/instructions.rb (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-20  László Langó  <llango.u-szeged@partner.samsung.com>
+
+        JavaScriptCore: ARM build fix after r167094.
+        https://bugs.webkit.org/show_bug.cgi?id=131612
+
+        Reviewed by Michael Saboff.
+
+        After r167094 there are many build errors on ARM like these:
+
+            /tmp/ccgtHRno.s:370: Error: invalid constant (425a) after fixup
+            /tmp/ccgtHRno.s:374: Error: invalid constant (426e) after fixup
+            /tmp/ccgtHRno.s:378: Error: invalid constant (4282) after fixup
+            /tmp/ccgtHRno.s:382: Error: invalid constant (4296) after fixup
+
+        Problem is caused by the wrong generated assembly like:
+            "\tmov r2, (" LOCAL_LABEL_STRING(llint_op_strcat) " - " LOCAL_LABEL_STRING(relativePCBase) ")\n" // /home/webkit/WebKit/Source/JavaScriptCore/llint/LowLevelInterpreter.asm:741
+
+        `mov` can only move 8 bit immediate, but not every constant fit into 8 bit. Clang converts
+        the mov to a single movw or a movw and a movt, depending on the immediate, but binutils doesn't.
+        Add a new ARM specific offline assembler instruction (`mvlbl`) for the following llint_entry
+        use case: move rn, (label1-label2) which is translated to movw and movt.
+
+        * llint/LowLevelInterpreter.asm:
+        * offlineasm/arm.rb:
+        * offlineasm/instructions.rb:
+
 2014-04-20  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter.asm

@@ -738 +738 @@
         move index, t2
         storep t1, [a0, t2, 8]
-    elsif ARM or ARMv7 or ARMv7_TRADITIONAL or SH4
+    elsif ARM or ARMv7 or ARMv7_TRADITIONAL
+        mvlbl (label - _relativePCBase), t2
+        addp t2, t1, t2
+        move index, t3
+        storep t2, [a0, t3, 4]
+    elsif SH4
         move (label - _relativePCBase), t2
         addp t2, t1, t2
         move index, t3
         storep t2, [a0, t3, 4]
-        if SH4
-            flushcp # Force constant pool flush to avoid "pcrel too far" link error.
-        end
+        flushcp # Force constant pool flush to avoid "pcrel too far" link error.
     elsif MIPS
         crash()  # Need to replace with code to turn label into and absolute address and save at index

trunk/Source/JavaScriptCore/offlineasm/arm.rb

@@ -485 +485 @@
                 $asm.puts "mov #{armFlippedOperands(operands)}"
             end
+        when "mvlbl"
+                $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
+                $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
         when "nop"
             $asm.puts "nop"

trunk/Source/JavaScriptCore/offlineasm/instructions.rb

@@ -262 +262 @@
 ARM_INSTRUCTIONS =
     [
-     "clrbp"
+     "clrbp",
+     "mvlbl"
     ]