libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-03-01 05:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3687 from unknownbrackets/mips-minor

Browse Source 
Always use fastmem for sw/lw offset from SP
This commit is contained in:
Henrik Rydgård 2013-09-07 23:56:18 -07:00
commit d888ef22bd
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/MIPS/ARM/ArmCompLoadStore.cpp
View File

@ -163,7 +163,7 @@ namespace MIPSComp
_dbg_assert_msg_(JIT, !gpr.IsImm(rs), "Invalid immediate address? CPU bug?");
load ? gpr.MapDirtyIn(rt, rs) : gpr.MapInIn(rt, rs);
if (!g_Config.bFastMemory) {
if (!g_Config.bFastMemory && rs != MIPS_REG_SP) {
SetCCAndR0ForSafeAddress(rs, offset, R1);
doCheck = true;
} else {

14
Core/MIPS/x86/Jit.cpp
View File

@ -516,6 +516,8 @@ Jit::JitSafeMem::JitSafeMem(Jit *jit, MIPSGPReg raddr, s32 offset, u32 alignMask
iaddr_ = jit_->gpr.GetImmediate32(raddr_) + offset_;
else
iaddr_ = (u32) -1;
fast_ = g_Config.bFastMemory || raddr == MIPS_REG_SP;
}
void Jit::JitSafeMem::SetFar()
@ -602,7 +604,7 @@ OpArg Jit::JitSafeMem::PrepareMemoryOpArg(ReadType type)
bool needTemp = alignMask_ != 0xFFFFFFFF;
#ifdef _M_IX86
// We always mask on 32 bit in fast memory mode.
needTemp = needTemp || g_Config.bFastMemory;
needTemp = needTemp || fast_;
#endif
if (jit_->gpr.R(raddr_).IsSimpleReg() && !needTemp)
@ -618,7 +620,7 @@ OpArg Jit::JitSafeMem::PrepareMemoryOpArg(ReadType type)
MemCheckAsm(type);
if (!g_Config.bFastMemory)
if (!fast_)
{
// Is it in physical ram?
jit_->CMP(32, R(xaddr_), Imm32(PSP_GetKernelMemoryBase() - offset_));
@ -672,9 +674,9 @@ bool Jit::JitSafeMem::PrepareSlowWrite()
{
// If it's immediate, we only need a slow write on invalid.
if (iaddr_ != (u32) -1)
return !g_Config.bFastMemory && !ImmValid();
return !fast_ && !ImmValid();
if (!g_Config.bFastMemory)
if (!fast_)
{
PrepareSlowAccess();
return true;
@ -700,7 +702,7 @@ void Jit::JitSafeMem::DoSlowWrite(void *safeFunc, const OpArg src, int suboffset
bool Jit::JitSafeMem::PrepareSlowRead(void *safeFunc)
{
if (!g_Config.bFastMemory)
if (!fast_)
{
if (iaddr_ != (u32) -1)
{
@ -727,7 +729,7 @@ bool Jit::JitSafeMem::PrepareSlowRead(void *safeFunc)
void Jit::JitSafeMem::NextSlowRead(void *safeFunc, int suboffset)
{
_dbg_assert_msg_(JIT, !g_Config.bFastMemory, "NextSlowRead() called in fast memory mode?");
_dbg_assert_msg_(JIT, !fast_, "NextSlowRead() called in fast memory mode?");
// For simplicity, do nothing for 0. We already read in PrepareSlowRead().
if (suboffset == 0)

1
Core/MIPS/x86/Jit.h
View File

@ -385,6 +385,7 @@ private:
bool needsCheck_;
bool needsSkip_;
bool far_;
bool fast_;
u32 alignMask_;
u32 iaddr_;
X64Reg xaddr_;