Changeset 237486 in webkit for trunk/Source/JavaScriptCore/offlineasm/x86.rb

Timestamp:

Oct 26, 2018, 4:34:01 PM (7 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r237479 and r237484.
​https://bugs.webkit.org/show_bug.cgi?id=190978

broke JSC on iOS (Requested by tadeuzagallo on #webkit).

Reverted changesets:

"New bytecode format for JSC"
​https://bugs.webkit.org/show_bug.cgi?id=187373
​https://trac.webkit.org/changeset/237479

"Gardening: Build fix after r237479."
​https://bugs.webkit.org/show_bug.cgi?id=187373
​https://trac.webkit.org/changeset/237484

File:

• trunk/Source/JavaScriptCore/offlineasm/x86.rb (modified) (5 diffs)

trunk/Source/JavaScriptCore/offlineasm/x86.rb

@@ -284 +284 @@
                 isWin ? "r10" : "r8"
             when "t5"
-                isWin ? "ecx" : "r10"
+                raise "cannot use register #{name} on X86-64 Windows" unless not isWin
+                "r10"
             when "csr0"
                 "ebx"
@@ -465 +466 @@
         # FIXME: Implement this on platforms that aren't Mach-O.
         # https://bugs.webkit.org/show_bug.cgi?id=175104
-        used
-        if !isIntelSyntax
-            $asm.puts "movq #{asmLabel}@GOTPCREL(%rip), #{dst.x86Operand(:ptr)}"
-        else
-            $asm.puts "lea #{dst.x86Operand(:ptr)}, #{asmLabel}"
-        end
+        $asm.puts "movq #{asmLabel}@GOTPCREL(%rip), #{dst.x86Operand(:ptr)}"
         "#{offset}(#{dst.x86Operand(kind)})"
     end
@@ -589 +585 @@
     def emitX86Lea(src, dst, kind)
         if src.is_a? LabelReference
-            src.used
-            if !isIntelSyntax
-                $asm.puts "movq #{src.asmLabel}@GOTPCREL(%rip), #{dst.x86Operand(:ptr)}"
-            else
-                $asm.puts "lea #{dst.x86Operand(:ptr)}, #{src.asmLabel}"
-            end
+            $asm.puts "movq #{src.asmLabel}@GOTPCREL(%rip), #{dst.x86Operand(:ptr)}"
         else
             $asm.puts "lea#{x86Suffix(kind)} #{orderOperands(src.x86AddressOperand(kind), dst.x86Operand(kind))}"
@@ -957 +948 @@
         when "xorq"
             handleX86Op("xor#{x86Suffix(:quad)}", :quad)
-        when "leap"
-            emitX86Lea(operands[0], operands[1], :ptr)
         when "loadi"
             $asm.puts "mov#{x86Suffix(:int)} #{x86LoadOperands(:int, :int)}"
@@ -992 +981 @@
             else
                 $asm.puts "movsx #{x86LoadOperands(:byte, :int)}"
-            end
-        when "loadbsp"
-            if !isIntelSyntax
-                $asm.puts "movsb#{x86Suffix(:ptr)} #{x86LoadOperands(:byte, :ptr)}"
-            else
-                $asm.puts "movsx #{x86LoadOperands(:byte, :ptr)}"
             end
         when "loadh"