libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-12-01 21:56:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86jit: Fix immediate kernel addresses.

Browse Source 
Using a signed add + a value with the top bit set = bad.  Will have to
live with losing the kernel bit here, should be fine.
This commit is contained in:
Unknown W. Brackets 2015-04-10 20:25:29 -07:00
parent e58eb5e186
commit eaed080add
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/MIPS/x86/JitSafeMem.cpp
View File

@ -51,8 +51,9 @@ JitSafeMem::JitSafeMem(Jit *jit, MIPSGPReg raddr, s32 offset, u32 alignMask)
{
// This makes it more instructions, so let's play it safe and say we need a far jump.
far_ = !g_Config.bIgnoreBadMemAccess || !CBreakPoints::GetMemChecks().empty();
// Mask out the kernel RAM bit, because we'll end up with a negative offset to MEMBASEREG.
if (jit_->gpr.IsImm(raddr_))
iaddr_ = jit_->gpr.GetImm(raddr_) + offset_;
iaddr_ = (jit_->gpr.GetImm(raddr_) + offset_) & 0x7FFFFFFF;
else
iaddr_ = (u32) -1;
@ -123,9 +124,9 @@ bool JitSafeMem::PrepareRead(OpArg &src, int size)
OpArg JitSafeMem::NextFastAddress(int suboffset)
{
if (jit_->gpr.IsImm(raddr_))
if (iaddr_ != (u32) -1)
{
u32 addr = (jit_->gpr.GetImm(raddr_) + offset_ + suboffset) & alignMask_;
u32 addr = (iaddr_ + suboffset) & alignMask_;
#ifdef _M_IX86
return M(Memory::base + (addr & Memory::MEMVIEW32_MASK));