Changeset 148045 in webkit

Timestamp:

Apr 9, 2013 1:42:19 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

LLInt conditional branch compilation fault on MIPS.
​https://bugs.webkit.org/show_bug.cgi?id=114264

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

Fix conditional branch compilation in LLInt offlineasm.

• offlineasm/mips.rb:

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-04-09  Balazs Kilvady  <kilvadyb@homejinni.com>
+
+        LLInt conditional branch compilation fault on MIPS.
+        https://bugs.webkit.org/show_bug.cgi?id=114264
+
+        Reviewed by Filip Pizlo.
+
+        Fix conditional branch compilation in LLInt offlineasm.
+
+        * offlineasm/mips.rb:
+
 2013-04-08  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/JavaScriptCore/offlineasm/mips.rb

@@ -291 +291 @@
                 newList << Instruction.new(node.codeOrigin, comp, [tmp, node.operands[1], node.operands[0]], annotation)
                 newList << Instruction.new(node.codeOrigin, "bz", [tmp, MIPS_ZERO_REG, node.operands[2]])
-            when "btiz", "btpz", "btbz"
-                lowerMIPSCondBranch(newList, "bz", node)
-            when "btinz", "btpnz", "btbnz"
-                lowerMIPSCondBranch(newList, "bnz", node)
-            when "btio", "btpo", "btbo"
-                newList << node
-            when "btis", "btps", "btbs"
-                lowerMIPSCondBranch(newList, "bs", node)
+            when /^bt(i|p|b)/
+                lowerMIPSCondBranch(newList, "b" + $~.post_match + $1, node)
             else
                 newList << node
@@ -443 +437 @@
                                            node.opcode,
                                            riscAsRegisters(newList, [], node.operands, "b"))
-            when "bz", "bnz", "bs", "bo"
+            when /^(bz|bnz|bs|bo)/
+                tl = $~.post_match == "" ? "i" : $~.post_match
                 newList << Instruction.new(node.codeOrigin,
                                            node.opcode,
-                                           riscAsRegisters(newList, [], node.operands, "i"))
+                                           riscAsRegisters(newList, [], node.operands, tl))
             else
                 newList << node
@@ -862 +857 @@
             $asm.puts "mfc1 #{operands[1].mipsOperand}, #{operands[0].mipsSingleLo}"
             $asm.puts "mfc1 #{operands[2].mipsOperand}, #{operands[0].mipsSingleHi}"
-        when "bo"
+        when /^bo/
             $asm.puts "bgt #{operands[0].mipsOperand}, #{operands[1].mipsOperand}, #{operands[2].asmLabel}"
-        when "bs"
+        when /^bs/
             $asm.puts "blt #{operands[0].mipsOperand}, #{operands[1].mipsOperand}, #{operands[2].asmLabel}"
-        when "bz"
+        when /^bz/
             $asm.puts "beq #{operands[0].mipsOperand}, #{operands[1].mipsOperand}, #{operands[2].asmLabel}"
-        when "bnz"
+        when /^bnz/
             $asm.puts "bne #{operands[0].mipsOperand}, #{operands[1].mipsOperand}, #{operands[2].asmLabel}"
         when "leai", "leap"