[INFER] Fix build (fix AnyRegister API change and remove duplicate function).
authorPaul Biggar <pbiggar@mozilla.com>
Fri, 25 Feb 2011 12:43:49 -0800
changeset 74701 040641eb2a9788aef094b72d5662e9a361fb809c
parent 74700 eb1eec3d6c2255f3647c7c3f2d90aa8f50cc6c50
child 74702 5bbdcbbb05e063819dc99ce512799b587b4e1aa6
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
milestone2.0b12pre
[INFER] Fix build (fix AnyRegister API change and remove duplicate function).
js/src/methodjit/PunboxAssembler.h
js/src/methodjit/TypedArrayIC.h
--- a/js/src/methodjit/PunboxAssembler.h
+++ b/js/src/methodjit/PunboxAssembler.h
@@ -399,24 +399,16 @@ class PunboxAssembler : public JSC::Macr
             loadValueAsComponents(address, typeReg.reg(), dataReg);
             if (holeCheck)
                 notHole = branchPtr(Equal, typeReg.reg(), ImmType(JSVAL_TYPE_MAGIC));
         } else {
             loadPayload(address, dataReg);
         }
         return notHole;
     }
-
-    /* :FIXME: borrowed from patch in bug 594247 */
-    void breakDouble(FPRegisterID srcDest, RegisterID typeReg, RegisterID dataReg) {
-        m_assembler.movq_rr(srcDest, typeReg);
-        move(Registers::PayloadMaskReg, dataReg);
-        andPtr(typeReg, dataReg);
-        xorPtr(dataReg, typeReg);
-    }
 };
 
 typedef PunboxAssembler ValueAssembler;
 
 } /* namespace mjit */
 } /* namespace js */
 
 #endif
--- a/js/src/methodjit/TypedArrayIC.h
+++ b/js/src/methodjit/TypedArrayIC.h
@@ -450,23 +450,23 @@ StoreToTypedArray(JSContext *cx, Assembl
             uint32 pinned = Assembler::maskAddress(address);
             if (!vr.isTypeKnown())
                 pinned |= Registers::maskReg(vr.typeReg());
 
             Registers avail = allowMask & ~(pinned | saveMask);
 
             RegisterID newReg;
             if (!avail.empty()) {
-                newReg = avail.takeAnyReg();
+                newReg = avail.takeAnyReg().reg();
             } else {
                 // If no registers meet the ideal set, relax a constraint and spill.
                 avail = allowMask & ~pinned;
 
                 if (!avail.empty()) {
-                    newReg = avail.takeAnyReg();
+                    newReg = avail.takeAnyReg().reg();
                     saveRHS.preserve(Registers::maskReg(newReg));
                 } else {
                     // Oh no! *All* single byte registers are pinned. This
                     // sucks. We'll swap the type and data registers in |vr|
                     // and unswap them later.
 
                     // If |vr|'s registers are part of the address, swapping is
                     // going to cause problems during the store.