Remove more uses of Value

Change-Id: I889e760f75b485a28e1f2a2c26b2337ae9bfafac
Reviewed-by: Simon Hausmann <[email protected]>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/qml/compiler/qv4isel_masm_p.h b/src/qml/compiler/qv4isel_masm_p.h
index fd84b03b77..20b0c1b7e8 100644
--- a/src/qml/compiler/qv4isel_masm_p.h
+++ b/src/qml/compiler/qv4isel_masm_p.h
@@ -323,8 +323,8 @@ public:
 
         int calculateJSStackFrameSize() const
         {
-            const int locals = (localCount + sizeof(QV4::CallData)/sizeof(QV4::Value) - 1 + maxOutgoingArgumentCount) + 1;
-            int frameSize = locals * sizeof(QV4::Value);
+            const int locals = (localCount + sizeof(QV4::CallData)/sizeof(QV4::SafeValue) - 1 + maxOutgoingArgumentCount) + 1;
+            int frameSize = locals * sizeof(QV4::SafeValue);
             return frameSize;
         }
 
@@ -334,7 +334,7 @@ public:
             Q_ASSERT(idx < localCount);
 
             Pointer addr = callDataAddress(0);
-            addr.offset -= sizeof(QV4::Value) * (idx + 1);
+            addr.offset -= sizeof(QV4::SafeValue) * (idx + 1);
             return addr;
         }
 
@@ -346,11 +346,11 @@ public:
             Q_ASSERT(argument < maxOutgoingArgumentCount);
 
             const int index = maxOutgoingArgumentCount - argument;
-            return Pointer(Assembler::LocalsRegister, sizeof(QV4::Value) * (-index));
+            return Pointer(Assembler::LocalsRegister, sizeof(QV4::SafeValue) * (-index));
         }
 
         Pointer callDataAddress(int offset = 0) const {
-            return Pointer(Assembler::LocalsRegister, -(sizeof(QV4::CallData) + sizeof(QV4::Value) * (maxOutgoingArgumentCount - 1)) + offset);
+            return Pointer(Assembler::LocalsRegister, -(sizeof(QV4::CallData) + sizeof(QV4::SafeValue) * (maxOutgoingArgumentCount - 1)) + offset);
         }
 
         Address savedRegPointer(int offset) const
@@ -358,7 +358,7 @@ public:
             Q_ASSERT(offset >= 0);
             Q_ASSERT(offset < savedRegCount);
 
-            const int off = offset * sizeof(QV4::Value);
+            const int off = offset * sizeof(QV4::SafeValue);
             return Address(Assembler::StackFrameRegister, - calleeSavedRegisterSpace() - off);
         }
 
@@ -610,7 +610,7 @@ public:
 
     void storeUInt32ReturnValue(RegisterID dest)
     {
-        Pointer tmp(StackPointerRegister, -int(sizeof(QV4::Value)));
+        Pointer tmp(StackPointerRegister, -int(sizeof(QV4::SafeValue)));
         storeReturnValue(tmp);
         toUInt32Register(tmp, dest);
     }
@@ -622,7 +622,7 @@ public:
         xor64(ScratchRegister, ReturnValueRegister);
         move64ToDouble(ReturnValueRegister, dest);
 #else
-        Pointer tmp(StackPointerRegister, -int(sizeof(QV4::Value)));
+        Pointer tmp(StackPointerRegister, -int(sizeof(QV4::SafeValue)));
         storeReturnValue(tmp);
         loadDouble(tmp, dest);
 #endif
@@ -817,14 +817,14 @@ public:
         JSC::MacroAssembler::storeDouble(FPGpr0, target);
     }
 
-    void storeValue(QV4::Value value, RegisterID destination)
+    void storeValue(QV4::Primitive value, RegisterID destination)
     {
         Q_UNUSED(value);
         Q_UNUSED(destination);
         Q_UNREACHABLE();
     }
 
-    void storeValue(QV4::Value value, Address destination)
+    void storeValue(QV4::Primitive value, Address destination)
     {
 #ifdef VALUE_FITS_IN_REGISTER
         store64(TrustedImm64(value.val), destination);
@@ -835,7 +835,7 @@ public:
 #endif
     }
 
-    void storeValue(QV4::Value value, V4IR::Temp* temp);
+    void storeValue(QV4::Primitive value, V4IR::Temp* temp);
 
     void enterStandardStackFrame();
     void leaveStandardStackFrame();
@@ -1120,7 +1120,7 @@ public:
             Address tagAddr = addr;
             tagAddr.offset += 4;
 
-            QV4::Value v = convertToValue(c);
+            QV4::Primitive v = convertToValue(c);
             store32(TrustedImm32(v.int_32), addr);
             store32(TrustedImm32(v.tag), tagAddr);
             return Pointer(addr);