From 71c85ccf33f03a72e0c86c8e8fbe8f286122ef88 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 9 Feb 2013 23:04:39 -0800 Subject: [PATCH] In jit slowmem, verify actual address. Oops, it could crash if it was near the boundary. Well, it still could if it were very near, but that's rare. --- Core/MIPS/x86/Jit.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/MIPS/x86/Jit.cpp b/Core/MIPS/x86/Jit.cpp index 5efaa0c7b8..8574d454ac 100644 --- a/Core/MIPS/x86/Jit.cpp +++ b/Core/MIPS/x86/Jit.cpp @@ -413,9 +413,9 @@ OpArg Jit::JitSafeMem::PrepareMemoryOpArg() if (!g_Config.bFastMemory) { // Is it in physical ram? - jit_->CMP(32, R(xaddr_), Imm32(PSP_GetKernelMemoryBase())); + jit_->CMP(32, R(xaddr_), Imm32(PSP_GetKernelMemoryBase() - offset_)); tooLow_ = jit_->J_CC(CC_L); - jit_->CMP(32, R(xaddr_), Imm32(PSP_GetUserMemoryEnd())); + jit_->CMP(32, R(xaddr_), Imm32(PSP_GetUserMemoryEnd() - offset_)); tooHigh_ = jit_->J_CC(CC_GE); // We may need to jump back up here. @@ -448,9 +448,9 @@ void Jit::JitSafeMem::PrepareSlowAccess() jit_->SetJumpTarget(tooHigh_); // Might also be the scratchpad. - jit_->CMP(32, R(xaddr_), Imm32(PSP_GetScratchpadMemoryBase())); + jit_->CMP(32, R(xaddr_), Imm32(PSP_GetScratchpadMemoryBase() - offset_)); FixupBranch tooLow = jit_->J_CC(CC_L); - jit_->CMP(32, R(xaddr_), Imm32(PSP_GetScratchpadMemoryEnd())); + jit_->CMP(32, R(xaddr_), Imm32(PSP_GetScratchpadMemoryEnd() - offset_)); jit_->J_CC(CC_L, safe_); jit_->SetJumpTarget(tooLow); }