From 06b54d3aaa5c1306c22e43ccb22f54e22ccabd17 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 15 Sep 2018 15:05:52 +0200 Subject: [PATCH] - avoid certain x86::ptr overloads as the last argument is not always an offset --- src/scripting/vm/jit_load.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scripting/vm/jit_load.cpp b/src/scripting/vm/jit_load.cpp index 59885019a..5fdbdbaf1 100644 --- a/src/scripting/vm/jit_load.cpp +++ b/src/scripting/vm/jit_load.cpp @@ -36,14 +36,14 @@ void JitCompiler::EmitLKP() void JitCompiler::EmitLK_R() { - cc.mov(regD[A], asmjit::x86::ptr(ToMemAddress(konstd), regD[B], 2, C * sizeof(int32_t))); + cc.mov(regD[A], asmjit::x86::ptr(ToMemAddress(konstd + C), regD[B], 2)); } void JitCompiler::EmitLKF_R() { auto tmp = cc.newIntPtr(); - cc.mov(tmp, ToMemAddress(konstf)); - cc.movsd(regF[A], asmjit::x86::qword_ptr(tmp, regD[B], 3, C * sizeof(double))); + cc.mov(tmp, ToMemAddress(konstf + C)); + cc.movsd(regF[A], asmjit::x86::qword_ptr(tmp, regD[B], 3)); } void JitCompiler::EmitLKS_R() @@ -68,7 +68,7 @@ void JitCompiler::EmitLKS_R() void JitCompiler::EmitLKP_R() { - cc.mov(regA[A], asmjit::x86::ptr(ToMemAddress(konsta), regD[B], 2, C * sizeof(void*))); + cc.mov(regA[A], asmjit::x86::ptr(ToMemAddress(konsta + C), regD[B], 2)); } void JitCompiler::EmitLFP()