backout bug 669564
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Thu, 07 Jul 2011 23:47:06 +0900
changeset 75186 9863e9639d801e9abb7e77a65e44981bb1c29f5b
parent 75185 d870a3d2a5ffd67a11d374dc0f26ae16886bbbe6
child 75187 1d6b237397870a7a8b0233a6e5d3a9beda672897
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
bugs669564
milestone8.0a1
backout bug 669564
js/src/methodjit/MachineRegs.h
--- a/js/src/methodjit/MachineRegs.h
+++ b/js/src/methodjit/MachineRegs.h
@@ -348,35 +348,28 @@ struct Registers {
         return true;
     }
 
     /* Floating point registers. */
 
     typedef JSC::MacroAssembler::FPRegisterID FPRegisterID;
 
 #if defined(JS_CPU_X86) || defined(JS_CPU_X64)
-#ifdef _WIN64
-    /* scrach registers of Win64 ABI are xmm0-xmm5 */
-    static const uint32 TotalFPRegisters = 5;
-#else
     static const uint32 TotalFPRegisters = 7;
-#endif
     static const uint32 TempFPRegs = (
           (1 << JSC::X86Registers::xmm0)
         | (1 << JSC::X86Registers::xmm1)
         | (1 << JSC::X86Registers::xmm2)
         | (1 << JSC::X86Registers::xmm3)
         | (1 << JSC::X86Registers::xmm4)
-#ifndef _WIN64
+        | (1 << JSC::X86Registers::xmm5)
         | (1 << JSC::X86Registers::xmm6)
-        | (1 << JSC::X86Registers::xmm7)
-#endif
         ) << TotalRegisters;
     /* For shuffling FP values around, or loading GPRs into a FP reg. */
-    static const FPRegisterID FPConversionTemp = JSC::X86Registers::xmm5;
+    static const FPRegisterID FPConversionTemp = JSC::X86Registers::xmm7;
 #elif defined(JS_CPU_ARM)
     static const uint32 TotalFPRegisters = 3;
     static const uint32 TempFPRegs = (
           (1 << JSC::ARMRegisters::d0)
         | (1 << JSC::ARMRegisters::d1)
         | (1 << JSC::ARMRegisters::d2)
         ) << TotalRegisters;
     static const FPRegisterID FPConversionTemp = JSC::ARMRegisters::d3;