From b5e96a5b77afb9fbfa666b021910638d45e148f5 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Tue, 5 Apr 2016 09:54:43 +0100 Subject: [PATCH] fixup! JitX64: Move thumb_BLX_* variables below ArmDecoder::Visitor functions --- src/core/arm/jit_x64/jit_x64.cpp | 2 +- src/core/arm/jit_x64/jit_x64.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/arm/jit_x64/jit_x64.cpp b/src/core/arm/jit_x64/jit_x64.cpp index 1ce6d30c1..2220cc960 100644 --- a/src/core/arm/jit_x64/jit_x64.cpp +++ b/src/core/arm/jit_x64/jit_x64.cpp @@ -167,7 +167,7 @@ void JitX64::CompileCallHost(const void* const fn) { ASSERT(reg_alloc.JitStateReg() != RSP); code->MOV(64, R(RSP), MJitStateHostReturnRSP()); - const u64 distance = reinterpret_cast(fn) - (reinterpret_cast(code->GetCodePtr()) + 5); + const uintptr_t distance = reinterpret_cast(fn) - (reinterpret_cast(code->GetCodePtr()) + 5); if (distance >= 0x0000000080000000ULL && distance < 0xFFFFFFFF80000000ULL) { // Far call code->MOV(64, R(RAX), ImmPtr(fn)); diff --git a/src/core/arm/jit_x64/jit_x64.h b/src/core/arm/jit_x64/jit_x64.h index 770158a12..d8e745266 100644 --- a/src/core/arm/jit_x64/jit_x64.h +++ b/src/core/arm/jit_x64/jit_x64.h @@ -421,12 +421,12 @@ private: // Thumb specific instructions void thumb_B(Cond cond, ArmImm8 imm8) override; void thumb_B(ArmImm11 imm11) override; + void thumb_BLX_prefix(ArmImm11 imm11) override; + void thumb_BLX_suffix(bool L, ArmImm11 imm11) override; ArmImm11 thumb_BLX_prefix_imm11 = 0; bool thumb_BLX_prefix_executed = false; bool thumb_BLX_suffix_executed = false; - void thumb_BLX_prefix(ArmImm11 imm11) override; - void thumb_BLX_suffix(bool L, ArmImm11 imm11) override; }; } // namespace JitX64