Changeset 154095 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Aug 15, 2013, 4:28:55 AM (12 years ago)

Author:

[email protected]

Message:

REGRESSION(r148790) Made 7 tests fail on x86 32bit
​https://bugs.webkit.org/show_bug.cgi?id=114913

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

The X87 register was not freed before some calls. Instead
of inserting resetX87Registers to the last call sites,
the two X87 registers are now freed in every call.

• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• offlineasm/instructions.rb:
• offlineasm/x86.rb:

LayoutTests:

Unskip the five tests now passsing again.

• platform/qt/TestExpectations:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• llint/LowLevelInterpreter32_64.asm (modified) (2 diffs)
• llint/LowLevelInterpreter64.asm (modified) (1 diff)
• offlineasm/instructions.rb (modified) (1 diff)
• offlineasm/x86.rb (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-08-15  Allan Sandfeld Jensen  <[email protected]>
+
+        REGRESSION(r148790) Made 7 tests fail on x86 32bit
+        https://bugs.webkit.org/show_bug.cgi?id=114913
+
+        Reviewed by Filip Pizlo.
+
+        The X87 register was not freed before some calls. Instead
+        of inserting resetX87Registers to the last call sites,
+        the two X87 registers are now freed in every call.
+
+        * llint/LowLevelInterpreter32_64.asm:
+        * llint/LowLevelInterpreter64.asm:
+        * offlineasm/instructions.rb:
+        * offlineasm/x86.rb:
+
 2013-08-14  Michael Saboff  <[email protected]>
 

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm

@@ -103 +103 @@
         call function
     elsif X86
-        resetX87Stack
         poke arg1, 0
         poke arg2, 1
@@ -127 +126 @@
         call function
     elsif X86
-        resetX87Stack
         poke arg1, 0
         poke arg2, 1

trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm

@@ -82 +82 @@
     leap [PB, PC, 8], PC
     move PB, t3
-    if X86_64
-        resetX87Stack
-    end
 end
 

trunk/Source/JavaScriptCore/offlineasm/instructions.rb

@@ -255 +255 @@
     [
      "cdqi",
-     "idivi",
-     "resetX87Stack"
+     "idivi"
     ]
 

trunk/Source/JavaScriptCore/offlineasm/x86.rb

@@ -1150 +1150 @@
             $asm.puts "int $3"
         when "call"
+            if useX87
+                2.times {
+                    | offset |
+                    $asm.puts "ffree %st(#{offset})"
+                }
+            end
             $asm.puts "call #{operands[0].x86CallOperand(:ptr)}"
         when "ret"
@@ -1337 +1343 @@
         when "leap"
             $asm.puts "lea#{x86Suffix(:ptr)} #{operands[0].x86AddressOperand(:ptr)}, #{operands[1].x86Operand(:ptr)}"
-        when "resetX87Stack"
-            if useX87
-                2.times {
-                    | offset |
-                    $asm.puts "ffree %st(#{offset})"
-                }
-            end
         else
             lowerDefault