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

fix physical address offset calculations

This commit is contained in:
KrimtonZ 2019-12-27 09:41:21 -06:00
parent e955cadd44
commit 33d4fed24c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
View File

@ -1508,7 +1508,7 @@ void CMipsMemoryVM::Load32CartridgeDomain2Address1(void)
void CMipsMemoryVM::Load32CartridgeDomain2Address2(void) void CMipsMemoryVM::Load32CartridgeDomain2Address2(void)
{ {
uint32_t offset = (m_MemLookupAddress & 0x1FFFFFFF) - 0x08000000; uint32_t offset = (m_MemLookupAddress & 0x1FFFFFFF) - 0x08000000;
if (offset >= 0x10000) if (offset > 0x10000)
{ {
m_MemLookupValue.UW[0] = ((offset & 0xFFFF) << 16) | (offset & 0xFFFF); m_MemLookupValue.UW[0] = ((offset & 0xFFFF) << 16) | (offset & 0xFFFF);
return; return;
@ -2184,8 +2184,8 @@ void CMipsMemoryVM::Write32CartridgeDomain2Address1(void)
void CMipsMemoryVM::Write32CartridgeDomain2Address2(void) void CMipsMemoryVM::Write32CartridgeDomain2Address2(void)
{ {
uint32_t PAddr = m_MemLookupAddress & 0x1FFFFFFF; uint32_t offset = (m_MemLookupAddress & 0x1FFFFFFF) - 0x08000000;
if (g_System->m_SaveUsing == SaveChip_Sram && PAddr < 0x8000) if (g_System->m_SaveUsing == SaveChip_Sram && offset < 0x8000)
{ {
//Store Sram //Store Sram
uint8_t tmp[4] = ""; uint8_t tmp[4] = "";
@ -2203,7 +2203,7 @@ void CMipsMemoryVM::Write32CartridgeDomain2Address2(void)
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);
} }
}*/ }*/
if (PAddr > 0x10000) if (offset > 0x10000)
{ {
return; return;
} }