Changeset 229331 in webkit

Timestamp:

Mar 6, 2018 11:14:10 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[ARM] Assembler warnings: "use of r13 is deprecated"
​https://bugs.webkit.org/show_bug.cgi?id=183286

Patch by Dominik Infuehr <​dinfuehr@igalia.com> on 2018-03-06
Reviewed by Mark Lam.

Usage of sp/r13 as operand Rm is deprecated on ARM. offlineasm
sometimes generates assembly code that triggers this warning. Prevent
this by simply switching operands.

• offlineasm/arm.rb:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• offlineasm/arm.rb (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2018-03-06  Dominik Infuehr  <dinfuehr@igalia.com>
+
+        [ARM] Assembler warnings: "use of r13 is deprecated"
+        https://bugs.webkit.org/show_bug.cgi?id=183286
+
+        Reviewed by Mark Lam.
+
+        Usage of sp/r13 as operand Rm is deprecated on ARM. offlineasm
+        sometimes generates assembly code that triggers this warning. Prevent
+        this by simply switching operands.
+
+        * offlineasm/arm.rb:
+
 2018-03-06  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/offlineasm/arm.rb

@@ -221 +221 @@
 #
 
+def armOpcodeReversedOperands(opcode)
+    m = /\Ab[ipb]/.match(opcode)
+
+    operation = case m.post_match
+                when "eq" then "eq"
+                when "neq" then "neq"
+                when "a" then "b"
+                when "aeq" then "beq"
+                when "b" then "a"
+                when "beq" then "aeq"
+                when "gt" then "lt"
+                when "gteq" then "lteq"
+                when "lt" then "gt"
+                when "lteq" then "gteq"
+                else
+                    raise "unknown operation #{m.post_match}"
+                end
+
+    "#{m[0]}#{operation}"
+end
+
+def armLowerStackPointerInComparison(list)
+    newList = []
+    list.each {
+        | node |
+        if node.is_a? Instruction
+            case node.opcode
+            when "bieq", "bpeq", "bbeq",
+                "bineq", "bpneq", "bbneq",
+                "bia", "bpa", "bba",
+                "biaeq", "bpaeq", "bbaeq",
+                "bib", "bpb", "bbb",
+                "bibeq", "bpbeq", "bbbeq",
+                "bigt", "bpgt", "bbgt",
+                "bigteq", "bpgteq", "bbgteq",
+                "bilt", "bplt", "bblt",
+                "bilteq", "bplteq", "bblteq"
+                if node.operands[1].is_a?(RegisterID) && node.operands[1].name == "sp"
+                    newList << Instruction.new(codeOrigin, armOpcodeReversedOperands(node.opcode), [node.operands[1], node.operands[0]] + node.operands[2..-1])
+                else
+                    newList << node
+                end
+            else
+                newList << node
+            end
+        else
+            newList << node
+        end
+    }
+    newList
+end
+
 class Sequence
     def getModifiedListARM
@@ -259 +311 @@
         result = assignRegistersToTemporaries(result, :gpr, ARM_EXTRA_GPRS)
         result = assignRegistersToTemporaries(result, :fpr, ARM_EXTRA_FPRS)
+        result = armLowerStackPointerInComparison(result)
         return result
     end