OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-25 09:50:15 +00:00
Code Issues Projects Releases Wiki Activity

fixup! JitX64: Move thumb_BLX_* variables below ArmDecoder::Visitor functions

Browse Source
This commit is contained in:
MerryMage 2016-04-05 09:54:43 +01:00
parent 10786333b3
commit b5e96a5b77
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/arm/jit_x64/jit_x64.cpp
View File

@ -167,7 +167,7 @@ void JitX64::CompileCallHost(const void* const fn) {
ASSERT(reg_alloc.JitStateReg() != RSP); ASSERT(reg_alloc.JitStateReg() != RSP);
code->MOV(64, R(RSP), MJitStateHostReturnRSP()); code->MOV(64, R(RSP), MJitStateHostReturnRSP());
const u64 distance = reinterpret_cast<const u64>(fn) - (reinterpret_cast<const u64>(code->GetCodePtr()) + 5); const uintptr_t distance = reinterpret_cast<uintptr_t>(fn) - (reinterpret_cast<uintptr_t>(code->GetCodePtr()) + 5);
if (distance >= 0x0000000080000000ULL && distance < 0xFFFFFFFF80000000ULL) { if (distance >= 0x0000000080000000ULL && distance < 0xFFFFFFFF80000000ULL) {
// Far call // Far call
code->MOV(64, R(RAX), ImmPtr(fn)); code->MOV(64, R(RAX), ImmPtr(fn));

4
src/core/arm/jit_x64/jit_x64.h
View File

@ -421,12 +421,12 @@ private:
// Thumb specific instructions // Thumb specific instructions
void thumb_B(Cond cond, ArmImm8 imm8) override; void thumb_B(Cond cond, ArmImm8 imm8) override;
void thumb_B(ArmImm11 imm11) 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; ArmImm11 thumb_BLX_prefix_imm11 = 0;
bool thumb_BLX_prefix_executed = false; bool thumb_BLX_prefix_executed = false;
bool thumb_BLX_suffix_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 } // namespace JitX64