Changeset 51067 in webkit

Timestamp:

Nov 16, 2009, 11:16:22 PM (16 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=31050

Patch by Zoltan Herczeg <​[email protected]> on 2009-11-16
Reviewed by Gavin Barraclough.

Minor fixes for JSVALUE32_64: branchConvertDoubleToInt32
failed on a CortexA8 CPU, but not on a simulator; and
JITCall.cpp modifications was somehow not committed to mainline.

• assembler/ARMAssembler.h:

(JSC::ARMAssembler::fmrs_r):

• assembler/MacroAssemblerARM.h:

(JSC::MacroAssemblerARM::branchConvertDoubleToInt32):

• jit/JITCall.cpp:

(JSC::JIT::compileOpCall):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• assembler/ARMAssembler.h (modified) (1 diff)
• assembler/MacroAssemblerARM.h (modified) (1 diff)
• jit/JITCall.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-11-16  Zoltan Herczeg  <[email protected]>
+
+        Reviewed by Gavin Barraclough.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31050
+
+        Minor fixes for JSVALUE32_64: branchConvertDoubleToInt32
+        failed on a CortexA8 CPU, but not on a simulator; and
+        JITCall.cpp modifications was somehow not committed to mainline.
+
+        * assembler/ARMAssembler.h:
+        (JSC::ARMAssembler::fmrs_r):
+        * assembler/MacroAssemblerARM.h:
+        (JSC::MacroAssemblerARM::branchConvertDoubleToInt32):
+        * jit/JITCall.cpp:
+        (JSC::JIT::compileOpCall):
+
 2009-11-16  Joerg Bornemann  <[email protected]>
 

trunk/JavaScriptCore/assembler/ARMAssembler.h

@@ -511 +511 @@
         }
 
-        void fmrs_r(int dd, int rn, Condition cc = AL)
-        {
-            emitInst(static_cast<ARMWord>(cc) | FMRS, rn, dd, 0);
+        void fmrs_r(int rd, int dn, Condition cc = AL)
+        {
+            emitInst(static_cast<ARMWord>(cc) | FMRS, rd, dn, 0);
         }
 

trunk/JavaScriptCore/assembler/MacroAssemblerARM.h

@@ -830 +830 @@
     void branchConvertDoubleToInt32(FPRegisterID src, RegisterID dest, JumpList& failureCases, FPRegisterID fpTemp)
     {
-        m_assembler.ftosid_r(src, ARMRegisters::SD0);
-        m_assembler.fmrs_r(ARMRegisters::SD0, dest);
+        m_assembler.ftosid_r(ARMRegisters::SD0, src);
+        m_assembler.fmrs_r(dest, ARMRegisters::SD0);
 
         // Convert the integer result back to float & compare to the original value - if not equal or unordered (NaN) then jump.
         m_assembler.fsitod_r(ARMRegisters::SD0, ARMRegisters::SD0);
-        failureCases.append(branchDouble(DoubleNotEqual, src, ARMRegisters::SD0));
+        failureCases.append(branchDouble(DoubleNotEqualOrUnordered, src, ARMRegisters::SD0));
 
         // If the result is zero, it might have been -0.0, and 0.0 equals to -0.0

trunk/JavaScriptCore/jit/JITCall.cpp

@@ -316 +316 @@
 
     DataLabelPtr addressOfLinkedFunctionCheck;
+
+    BEGIN_UNINTERRUPTED_SEQUENCE(sequenceOpCall);
+
     Jump jumpToSlow = branchPtrWithPatch(NotEqual, regT0, addressOfLinkedFunctionCheck, ImmPtr(0));
+
+    END_UNINTERRUPTED_SEQUENCE(sequenceOpCall);
+
     addSlowCase(jumpToSlow);
     ASSERT(differenceBetween(addressOfLinkedFunctionCheck, jumpToSlow) == patchOffsetOpCallCompareToJump);