From 79a6690a3049f7dfde004c87ba26940f85c776c0 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 8 Jul 2017 16:39:26 -0700 Subject: [PATCH 1/2] x64: Fix coreState rip checks. --- Core/MIPS/x86/Jit.cpp | 4 ++-- Core/MIPS/x86/JitSafeMem.cpp | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index 55d436c298..fd909aff98 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -374,7 +374,7 @@ const u8 *Jit::DoJit(u32 em_address, JitBlock *b) { // If we're rewinding, CORE_NEXTFRAME should not cause a rewind. // It doesn't really matter either way if we're not rewinding. // CORE_RUNNING is <= CORE_NEXTFRAME. - if (RipAccessible((const void *)coreState)) { + if (RipAccessible((const void *)&coreState)) { CMP(32, M(&coreState), Imm32(CORE_NEXTFRAME)); // rip accessible } else { MOV(PTRBITS, R(RAX), ImmPtr((const void *)&coreState)); @@ -667,7 +667,7 @@ void Jit::WriteExit(u32 destination, int exit_num) { // If we need to verify coreState and rewind, we may not jump yet. if (js.afterOp & (JitState::AFTER_CORE_STATE | JitState::AFTER_REWIND_PC_BAD_STATE)) { // CORE_RUNNING is <= CORE_NEXTFRAME. - if (RipAccessible((const void *)coreState)) { + if (RipAccessible((const void *)&coreState)) { CMP(32, M(&coreState), Imm32(CORE_NEXTFRAME)); // rip accessible } else { MOV(PTRBITS, R(RAX), ImmPtr((const void *)&coreState)); diff --git a/Core/MIPS/x86/JitSafeMem.cpp b/Core/MIPS/x86/JitSafeMem.cpp index 94e9f2f384..1716c5b819 100644 --- a/Core/MIPS/x86/JitSafeMem.cpp +++ b/Core/MIPS/x86/JitSafeMem.cpp @@ -368,11 +368,14 @@ void JitSafeMem::MemCheckImm(MemoryOpType type) jit_->CallProtectedFunction(&JitMemCheck, iaddr_, size_, type == MEM_WRITE ? 1 : 0); // CORE_RUNNING is <= CORE_NEXTFRAME. - if (jit_->RipAccessible((const void *)coreState)) { + if (jit_->RipAccessible((const void *)&coreState)) { jit_->CMP(32, M(&coreState), Imm32(CORE_NEXTFRAME)); // rip accessible } else { + // We can't safely overwrite any register, so push. This is only while debugging. + jit_->PUSH(RAX); jit_->MOV(PTRBITS, R(RAX), ImmPtr((const void *)&coreState)); jit_->CMP(32, MatR(RAX), Imm32(CORE_NEXTFRAME)); + jit_->POP(RAX); } skipChecks_.push_back(jit_->J_CC(CC_G, true)); jit_->js.afterOp |= JitState::AFTER_CORE_STATE | JitState::AFTER_REWIND_PC_BAD_STATE | JitState::AFTER_MEMCHECK_CLEANUP; @@ -423,11 +426,14 @@ void JitSafeMem::MemCheckAsm(MemoryOpType type) if (possible) { // CORE_RUNNING is <= CORE_NEXTFRAME. - if (jit_->RipAccessible((const void *)coreState)) { + if (jit_->RipAccessible((const void *)&coreState)) { jit_->CMP(32, M(&coreState), Imm32(CORE_NEXTFRAME)); // rip accessible } else { + // We can't safely overwrite any register, so push. This is only while debugging. + jit_->PUSH(RAX); jit_->MOV(PTRBITS, R(RAX), ImmPtr((const void *)&coreState)); jit_->CMP(32, MatR(RAX), Imm32(CORE_NEXTFRAME)); + jit_->POP(RAX); } skipChecks_.push_back(jit_->J_CC(CC_G, true)); jit_->js.afterOp |= JitState::AFTER_CORE_STATE | JitState::AFTER_REWIND_PC_BAD_STATE | JitState::AFTER_MEMCHECK_CLEANUP; From 3dacd323c838d9e5819e55b7ec54d5ddf21fb600 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 8 Jul 2017 16:40:06 -0700 Subject: [PATCH 2/2] x64: Avoid clobbering jr dest in cases. --- Core/MIPS/x86/Jit.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index fd909aff98..6a6b196aec 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -714,8 +714,9 @@ void Jit::WriteExitDestInReg(X64Reg reg) { if (RipAccessible((const void *)coreState)) { CMP(32, M(&coreState), Imm32(CORE_NEXTFRAME)); // rip accessible } else { - MOV(PTRBITS, R(RAX), ImmPtr((const void *)&coreState)); - CMP(32, MatR(RAX), Imm32(CORE_NEXTFRAME)); + X64Reg temp = reg == RAX ? RDX : RAX; + MOV(PTRBITS, R(temp), ImmPtr((const void *)&coreState)); + CMP(32, MatR(temp), Imm32(CORE_NEXTFRAME)); } FixupBranch skipCheck = J_CC(CC_LE); MOV(32, MIPSSTATE_VAR(pc), Imm32(GetCompilerPC()));