Changeset 141641 in webkit

Timestamp:

Feb 1, 2013 2:00:00 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

offlineasm BaseIndex handling is broken on ARM due to MIPS changes
​https://bugs.webkit.org/show_bug.cgi?id=108261

Patch by Balazs Kilvady <​kilvadyb@homejinni.com> on 2013-02-01
Reviewed by Filip Pizlo.

offlineasm BaseIndex handling fix on MIPS.

• offlineasm/mips.rb:
• offlineasm/risc.rb:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• offlineasm/mips.rb (modified) (3 diffs)
• offlineasm/risc.rb (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-02-01  Balazs Kilvady  <kilvadyb@homejinni.com>
+
+        offlineasm BaseIndex handling is broken on ARM due to MIPS changes
+        https://bugs.webkit.org/show_bug.cgi?id=108261
+
+        Reviewed by Filip Pizlo.
+
+        offlineasm BaseIndex handling fix on MIPS.
+
+        * offlineasm/mips.rb:
+        * offlineasm/risc.rb:
+
 2013-02-01  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/JavaScriptCore/offlineasm/mips.rb

@@ -313 +313 @@
 #
 
+class Node
+    def mipsLowerMalformedAddressesRecurse(list, topLevelNode, &block)
+        mapChildren {
+            | subNode |
+            subNode.mipsLowerMalformedAddressesRecurse(list, topLevelNode, &block)
+        }
+    end
+end
+
+class Address
+    def mipsLowerMalformedAddressesRecurse(list, node, &block)
+        riscLowerMalformedAddressesRecurse(list, node, &block)
+    end
+end
+
 class BaseIndex
-    def BROKEN_riscLowerMalformedAddressesRecurse(list, node, &block)
+    def mipsLowerMalformedAddressesRecurse(list, node, &block)
         if scaleShift == 0
             tmp0 = Tmp.new(codeOrigin, :gpr)
@@ -326 +341 @@
         end
     end
+end
+
+class AbsoluteAddress
+    def mipsLowerMalformedAddressesRecurse(list, node, &block)
+        riscLowerMalformedAddressesRecurse(list, node, &block)
+    end
+end
+
+def mipsLowerMalformedAddresses(list, &block)
+    newList = []
+    list.each {
+        | node |
+        newList << node.mipsLowerMalformedAddressesRecurse(newList, node, &block)
+    }
+    newList
 end
 
@@ -533 +563 @@
         result = riscLowerHardBranchOps(result)
         result = riscLowerShiftOps(result)
-        result = riscLowerMalformedAddresses(result) {
+        result = mipsLowerMalformedAddresses(result) {
             | node, address |
             if address.is_a? Address

trunk/Source/JavaScriptCore/offlineasm/risc.rb

@@ -188 +188 @@
 
 class Address
-    def riscLowerMalformedAddressesRecurse(list, node)
+    def riscLowerMalformedAddressesRecurse(list, node, &block)
         return self if yield node, self
 
@@ -209 +209 @@
 
 class AbsoluteAddress
-    def riscLowerMalformedAddressesRecurse(list, node)
+    def riscLowerMalformedAddressesRecurse(list, node, &block)
         return self if yield node, self