zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-01-24 18:31:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- switch from ASMJIT_ARCH_X64 to ASMJIT_ARCH_64BIT when checking if we need to use 64-bit pointers

Browse source
This commit is contained in:
Magnus Norddahl 2018-09-18 18:05:53 +02:00
parent ad260aa971
commit 05ac219ba6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/scripting/vm/jit.cpp
View file

@ -270,7 +270,7 @@ void JitCompiler::EmitThrowException(EVMAbortException reason)
// Update JitExceptionInfo struct // Update JitExceptionInfo struct
cc.mov(x86::dword_ptr(exceptInfo, 0 * 4), (int32_t)reason); 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)); cc.mov(x86::qword_ptr(exceptInfo, 4 * 4), ToMemAddress(pc));
#else #else
cc.mov(x86::dword_ptr(exceptInfo, 4 * 4), ToMemAddress(pc)); 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 // Update JitExceptionInfo struct
cc.mov(x86::dword_ptr(exceptInfo, 0 * 4), (int32_t)reason); cc.mov(x86::dword_ptr(exceptInfo, 0 * 4), (int32_t)reason);
cc.mov(x86::dword_ptr(exceptInfo, 1 * 4), arg1); 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)); cc.mov(x86::qword_ptr(exceptInfo, 4 * 4), ToMemAddress(pc));
#else #else
cc.mov(x86::dword_ptr(exceptInfo, 4 * 4), ToMemAddress(pc)); cc.mov(x86::dword_ptr(exceptInfo, 4 * 4), ToMemAddress(pc));

2
src/scripting/vm/jit_flow.cpp
View file

@ -199,7 +199,7 @@ void JitCompiler::EmitRET()
break; break;
} }
case REGT_POINTER: case REGT_POINTER:
#ifdef ASMJIT_ARCH_X64 #ifdef ASMJIT_ARCH_64BIT
if (regtype & REGT_KONST) if (regtype & REGT_KONST)
cc.mov(x86::qword_ptr(location), ToMemAddress(konsta[regnum].v)); cc.mov(x86::qword_ptr(location), ToMemAddress(konsta[regnum].v));
else else

4
src/scripting/vm/jit_load.cpp
View file

@ -52,7 +52,7 @@ void JitCompiler::EmitLKS_R()
auto base = cc.newIntPtr(); auto base = cc.newIntPtr();
cc.mov(base, ToMemAddress(konsts + C)); cc.mov(base, ToMemAddress(konsts + C));
auto ptr = cc.newIntPtr(); auto ptr = cc.newIntPtr();
#ifdef ASMJIT_ARCH_X64 #ifdef ASMJIT_ARCH_64BIT
static_assert(sizeof(FString) == 8, "sizeof(FString) needs to be 8"); static_assert(sizeof(FString) == 8, "sizeof(FString) needs to be 8");
cc.lea(ptr, asmjit::x86::ptr(base, regD[B], 3)); cc.lea(ptr, asmjit::x86::ptr(base, regD[B], 3));
#else #else
@ -68,7 +68,7 @@ void JitCompiler::EmitLKP_R()
{ {
auto base = cc.newIntPtr(); auto base = cc.newIntPtr();
cc.mov(base, ToMemAddress(konsta + C)); 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"); static_assert(sizeof(FVoidObj) == 8, "sizeof(FVoidObj) needs to be 8");
cc.mov(regA[A], asmjit::x86::ptr(base, regD[B], 3)); cc.mov(regA[A], asmjit::x86::ptr(base, regD[B], 3));
#else #else