ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ResetMemoryStackPos: Allow stack pointer to be in tlb space

This commit is contained in:
zilmar 2013-02-11 19:25:11 +11:00
parent 990b9ddb55
commit 05e4f22dcf
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Project64/N64 System/Recompiler/Recompiler Class.cpp
View File

@ -995,9 +995,13 @@ void CRecompiler::ResetMemoryStackPos( void )
m_MemoryStack = NULL; m_MemoryStack = NULL;
return; return;
} }
if (m_Registers.m_GPR[29].UW[0] < 0x80000000 || m_Registers.m_GPR[29].UW[0] >= 0xC0000000)
DWORD pAddr = 0;
if (g_TransVaddr->TranslateVaddr(m_Registers.m_GPR[29].UW[0],pAddr))
{ {
m_MemoryStack = (DWORD)(g_MMU->Rdram() + pAddr);
} else {
WriteTraceF(TraceError,__FUNCTION__ ": Failed to translate SP address (%s)",m_Registers.m_GPR[29].UW[0]);
g_Notify->BreakPoint(__FILE__,__LINE__); g_Notify->BreakPoint(__FILE__,__LINE__);
} }
m_MemoryStack = (DWORD)(g_MMU->Rdram() + (m_Registers.m_GPR[29].UW[0] & 0x1FFFFFFF));
} }