Fix stack pointer arithmetic when cross-compiling

Replace the use of size(void*) with target assembler specific values for
the pointer size, when calculating offsets into the stack for
poke/peek/push/pop and placing arguments onto the stack before calling
functions.

Change-Id: I3aff540f0083967e75b61e0c29dbeb4d9ecfa433
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

6 files changed, 14 insertions, 4 deletions

diff --git a/src/3rdparty/masm/assembler/MacroAssembler.h b/src/3rdparty/masm/assembler/MacroAssembler.h
index 7d9f156c8c..f37861eb66 100644
--- a/src/3rdparty/masm/assembler/MacroAssembler.h
+++ b/src/3rdparty/masm/assembler/MacroAssembler.h
@@ -94,6 +94,7 @@ public:
     using DataLabelCompact = typename MacroAssemblerBase::DataLabelCompact;
     using Jump = typename MacroAssemblerBase::Jump;
     using PatchableJump = typename MacroAssemblerBase::PatchableJump;
+    using MacroAssemblerBase::PointerSize;
 
     using MacroAssemblerBase::pop;
     using MacroAssemblerBase::jump;
@@ -200,19 +201,19 @@ public:
     // described in terms of other macro assembly methods.
     void pop()
     {
-        addPtr(TrustedImm32(sizeof(void*)), MacroAssemblerBase::stackPointerRegister);
+        addPtr(TrustedImm32(PointerSize), MacroAssemblerBase::stackPointerRegister);
     }
     
     void peek(RegisterID dest, int index = 0)
     {
-        loadPtr(Address(MacroAssemblerBase::stackPointerRegister, (index * sizeof(void*))), dest);
+        loadPtr(Address(MacroAssemblerBase::stackPointerRegister, (index * PointerSize)), dest);
     }
 
     Address addressForPoke(int index)
     {
-        return Address(MacroAssemblerBase::stackPointerRegister, (index * sizeof(void*)));
+        return Address(MacroAssemblerBase::stackPointerRegister, (index * PointerSize));
     }
-    
+
     void poke(RegisterID src, int index = 0)
     {
         storePtr(src, addressForPoke(index));
@@ -223,10 +224,12 @@ public:
         store32(value, addressForPoke(index));
     }
 
+#if !defined(V4_BOOTSTRAP)
     void poke(TrustedImmPtr imm, int index = 0)
     {
         storePtr(imm, addressForPoke(index));
     }
+#endif
 
 #if (CPU(X86_64) || CPU(ARM64)) && !defined(V4_BOOTSTRAP)
     void peek64(RegisterID dest, int index = 0)
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerARM64.h b/src/3rdparty/masm/assembler/MacroAssemblerARM64.h
index a11637f7ca..11f1672e15 100644
--- a/src/3rdparty/masm/assembler/MacroAssemblerARM64.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerARM64.h
@@ -127,6 +127,8 @@ private:
     static const ptrdiff_t REPATCH_OFFSET_CALL_TO_POINTER = -16;
     
 public:
+    static const int PointerSize = 8;
+
     MacroAssemblerARM64()
         : m_dataMemoryTempRegister(this, dataTempRegister)
         , m_cachedMemoryTempRegister(this, memoryTempRegister)
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h
index 0d5d42bf71..fe8170d098 100644
--- a/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerARMv7.h
@@ -46,6 +46,8 @@ protected: // the YarrJIT needs know about addressTempRegister in order to push
     inline ARMRegisters::FPSingleRegisterID fpTempRegisterAsSingle() { return ARMRegisters::asSingle(fpTempRegister); }
 
 public:
+    static const int PointerSize = 4;
+
     MacroAssemblerARMv7()
         : m_makeJumpPatchable(false)
     {
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
index 68584527fc..f2ad6a4470 100644
--- a/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
@@ -37,6 +37,7 @@ namespace JSC {
 class MacroAssemblerMIPS : public AbstractMacroAssembler<MIPSAssembler> {
 public:
     typedef MIPSRegisters::FPRegisterID FPRegisterID;
+    static const int PointerSize = 4;
 
     MacroAssemblerMIPS()
         : m_fixedWidth(false)
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerX86.h b/src/3rdparty/masm/assembler/MacroAssemblerX86.h
index 742a4b48f7..280cf427fc 100644
--- a/src/3rdparty/masm/assembler/MacroAssemblerX86.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerX86.h
@@ -35,6 +35,7 @@ namespace JSC {
 class MacroAssemblerX86 : public MacroAssemblerX86Common {
 public:
     static const Scale ScalePtr = TimesFour;
+    static const int PointerSize = 4;
 
     using MacroAssemblerX86Common::add32;
     using MacroAssemblerX86Common::and32;
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h b/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h
index 3566702413..8ee134c2fa 100644
--- a/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerX86_64.h
@@ -37,6 +37,7 @@ namespace JSC {
 class MacroAssemblerX86_64 : public MacroAssemblerX86Common {
 public:
     static const Scale ScalePtr = TimesEight;
+    static const int PointerSize = 8;
 
     using MacroAssemblerX86Common::add32;
     using MacroAssemblerX86Common::and32;