1 files changed, 24 insertions, 12 deletions

diff --git a/src/qml/jit/qv4assembler_p.h b/src/qml/jit/qv4assembler_p.h
index 3b65acb26c..ab74211d23 100644
--- a/src/qml/jit/qv4assembler_p.h
+++ b/src/qml/jit/qv4assembler_p.h
@@ -478,7 +478,7 @@ public:
             load64(addr, dest);
         } else {
             QV4::Value undefined = QV4::Primitive::undefinedValue();
-            move(TrustedImm64(undefined.val), dest);
+            move(TrustedImm64(undefined.rawValue()), dest);
         }
     }
 
@@ -491,7 +491,7 @@ public:
             load64(addr, dest);
         } else {
             QV4::Value undefined = QV4::Primitive::undefinedValue();
-            move(TrustedImm64(undefined.val), dest);
+            move(TrustedImm64(undefined.rawValue()), dest);
         }
     }
 
@@ -500,7 +500,7 @@ public:
         Q_UNUSED(argumentNumber);
 
         QV4::Value v = convertToValue(c);
-        move(TrustedImm64(v.val), dest);
+        move(TrustedImm64(v.rawValue()), dest);
     }
 
     void loadArgumentInRegister(IR::Expr* expr, RegisterID dest, int argumentNumber)
@@ -509,7 +509,7 @@ public:
 
         if (!expr) {
             QV4::Value undefined = QV4::Primitive::undefinedValue();
-            move(TrustedImm64(undefined.val), dest);
+            move(TrustedImm64(undefined.rawValue()), dest);
         } else if (IR::Temp *t = expr->asTemp()){
             loadArgumentInRegister(t, dest, argumentNumber);
         } else if (IR::ArgLocal *al = expr->asArgLocal()) {
@@ -565,6 +565,8 @@ public:
         moveIntsToDouble(JSC::ARMRegisters::r0, JSC::ARMRegisters::r1, dest, FPGpr0);
 #elif defined(Q_PROCESSOR_X86)
         moveIntsToDouble(JSC::X86Registers::eax, JSC::X86Registers::edx, dest, FPGpr0);
+#elif defined(Q_PROCESSOR_MIPS)
+        moveIntsToDouble(JSC::MIPSRegisters::v0, JSC::MIPSRegisters::v1, dest, FPGpr0);
 #else
         subPtr(TrustedImm32(sizeof(QV4::Value)), StackPointerRegister);
         Pointer tmp(StackPointerRegister, 0);
@@ -595,6 +597,14 @@ public:
         destination.offset += 4;
         store32(JSC::ARMRegisters::r1, destination);
     }
+#elif defined(Q_PROCESSOR_MIPS)
+    void storeReturnValue(const Pointer &dest)
+    {
+        Pointer destination = dest;
+        store32(JSC::MIPSRegisters::v0, destination);
+        destination.offset += 4;
+        store32(JSC::MIPSRegisters::v1, destination);
+    }
 #endif
 
     void storeReturnValue(IR::Expr *target)
@@ -781,11 +791,11 @@ public:
     void storeValue(QV4::Primitive value, Address destination)
     {
 #ifdef VALUE_FITS_IN_REGISTER
-        store64(TrustedImm64(value.val), destination);
+        store64(TrustedImm64(value.rawValue()), destination);
 #else
-        store32(TrustedImm32(value.int_32), destination);
+        store32(TrustedImm32(value.int_32()), destination);
         destination.offset += 4;
-        store32(TrustedImm32(value.tag), destination);
+        store32(TrustedImm32(value.tag()), destination);
 #endif
     }
 
@@ -820,6 +830,8 @@ public:
         else
 #if OS(WINDOWS) && CPU(X86_64)
             loadArgumentOnStack<argumentNumber>(value, argumentNumber);
+#elif CPU(MIPS) // Stack space for 4 arguments needs to be allocated for MIPS platforms.
+            loadArgumentOnStack<argumentNumber>(value, argumentNumber + 4);
 #else // Sanity:
             loadArgumentOnStack<argumentNumber - RegisterArgumentCount>(value, argumentNumber);
 #endif
@@ -945,8 +957,8 @@ public:
             tagAddr.offset += 4;
 
             QV4::Primitive v = convertToValue(c);
-            store32(TrustedImm32(v.int_32), addr);
-            store32(TrustedImm32(v.tag), tagAddr);
+            store32(TrustedImm32(v.int_32()), addr);
+            store32(TrustedImm32(v.tag()), tagAddr);
             return Pointer(addr);
         }
 
@@ -961,7 +973,7 @@ public:
     {
         store32(reg, addr);
         addr.offset += 4;
-        store32(TrustedImm32(QV4::Primitive::fromBoolean(0).tag), addr);
+        store32(TrustedImm32(QV4::Primitive::fromBoolean(0).tag()), addr);
     }
 
     void storeBool(RegisterID src, RegisterID dest)
@@ -1005,7 +1017,7 @@ public:
     {
         store32(reg, addr);
         addr.offset += 4;
-        store32(TrustedImm32(QV4::Primitive::fromInt32(0).tag), addr);
+        store32(TrustedImm32(QV4::Primitive::fromInt32(0).tag()), addr);
     }
 
     void storeInt32(RegisterID reg, IR::Expr *target)
@@ -1084,7 +1096,7 @@ public:
     RegisterID toInt32Register(IR::Expr *e, RegisterID scratchReg)
     {
         if (IR::Const *c = e->asConst()) {
-            move(TrustedImm32(convertToValue(c).int_32), scratchReg);
+            move(TrustedImm32(convertToValue(c).int_32()), scratchReg);
             return scratchReg;
         }