From f90019561d81cf40ad8c6f24518d3375b7755675 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Tue, 18 Sep 2018 18:05:53 +0200 Subject: [PATCH] - switch from ASMJIT_ARCH_X64 to ASMJIT_ARCH_64BIT when checking if we need to use 64-bit pointers --- src/scripting/vm/jit.cpp | 4 ++-- src/scripting/vm/jit_flow.cpp | 2 +- src/scripting/vm/jit_load.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scripting/vm/jit.cpp b/src/scripting/vm/jit.cpp index e239e76c3..a818960ba 100644 --- a/src/scripting/vm/jit.cpp +++ b/src/scripting/vm/jit.cpp @@ -270,7 +270,7 @@ void JitCompiler::EmitThrowException(EVMAbortException reason) // Update JitExceptionInfo struct cc.mov(x86::dword_ptr(exceptInfo, 0 * 4), (int32_t)reason); -#ifdef ASMJIT_ARCH_X64 +#ifdef ASMJIT_ARCH_64BIT cc.mov(x86::qword_ptr(exceptInfo, 4 * 4), ToMemAddress(pc)); #else cc.mov(x86::dword_ptr(exceptInfo, 4 * 4), ToMemAddress(pc)); @@ -289,7 +289,7 @@ void JitCompiler::EmitThrowException(EVMAbortException reason, asmjit::X86Gp arg // Update JitExceptionInfo struct cc.mov(x86::dword_ptr(exceptInfo, 0 * 4), (int32_t)reason); cc.mov(x86::dword_ptr(exceptInfo, 1 * 4), arg1); -#ifdef ASMJIT_ARCH_X64 +#ifdef ASMJIT_ARCH_64BIT cc.mov(x86::qword_ptr(exceptInfo, 4 * 4), ToMemAddress(pc)); #else cc.mov(x86::dword_ptr(exceptInfo, 4 * 4), ToMemAddress(pc)); diff --git a/src/scripting/vm/jit_flow.cpp b/src/scripting/vm/jit_flow.cpp index 1db547d99..6a9898c7b 100644 --- a/src/scripting/vm/jit_flow.cpp +++ b/src/scripting/vm/jit_flow.cpp @@ -199,7 +199,7 @@ void JitCompiler::EmitRET() break; } case REGT_POINTER: - #ifdef ASMJIT_ARCH_X64 + #ifdef ASMJIT_ARCH_64BIT if (regtype & REGT_KONST) cc.mov(x86::qword_ptr(location), ToMemAddress(konsta[regnum].v)); else diff --git a/src/scripting/vm/jit_load.cpp b/src/scripting/vm/jit_load.cpp index 50ab180dd..7d9d6cfab 100644 --- a/src/scripting/vm/jit_load.cpp +++ b/src/scripting/vm/jit_load.cpp @@ -52,7 +52,7 @@ void JitCompiler::EmitLKS_R() auto base = cc.newIntPtr(); cc.mov(base, ToMemAddress(konsts + C)); auto ptr = cc.newIntPtr(); -#ifdef ASMJIT_ARCH_X64 +#ifdef ASMJIT_ARCH_64BIT static_assert(sizeof(FString) == 8, "sizeof(FString) needs to be 8"); cc.lea(ptr, asmjit::x86::ptr(base, regD[B], 3)); #else @@ -68,7 +68,7 @@ void JitCompiler::EmitLKP_R() { auto base = cc.newIntPtr(); cc.mov(base, ToMemAddress(konsta + C)); -#ifdef ASMJIT_ARCH_X64 +#ifdef ASMJIT_ARCH_64BIT static_assert(sizeof(FVoidObj) == 8, "sizeof(FVoidObj) needs to be 8"); cc.mov(regA[A], asmjit::x86::ptr(base, regD[B], 3)); #else