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

Merge pull request #991 from phire/dsi_should_crash 

Panic if game does an invalid memory access.
This commit is contained in:
comex 2014-10-21 01:53:08 -04:00
parent 305d2e1863 1963717855
commit 24e72cd064
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Core/HW/MemmapFunctions.cpp
View File

@ -122,7 +122,7 @@ inline void ReadFromHardware(T &_var, const u32 em_address, const u32 effective_
// fake VMEM
_var = bswap((*(const T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK]));
}
else
else if (SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU)
{
// MMU
// Handle loads that cross page boundaries (ewwww)
@ -187,6 +187,10 @@ inline void ReadFromHardware(T &_var, const u32 em_address, const u32 effective_
}
}
}
else
{
PanicAlertT("Invalid Read at 0x%08x, PC = 0x%08x ", em_address, PC);
}
}
@ -238,9 +242,9 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address,
*(T*)&m_pRAM[em_address & RAM_MASK] = bswap(data);
return;
}
else if (((em_address & 0xF0000000) == 0x90000000) ||
else if (m_pEXRAM && (((em_address & 0xF0000000) == 0x90000000) ||
((em_address & 0xF0000000) == 0xD0000000) ||
((em_address & 0xF0000000) == 0x10000000))
((em_address & 0xF0000000) == 0x10000000)))
{
*(T*)&m_pEXRAM[em_address & EXRAM_MASK] = bswap(data);
return;
@ -256,7 +260,7 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address,
// fake VMEM
*(T*)&m_pFakeVMEM[em_address & FAKEVMEM_MASK] = bswap(data);
}
else
else if (SConfig::GetInstance().m_LocalCoreStartupParameter.bMMU)
{
// MMU
// Handle stores that cross page boundaries (ewwww)
@ -314,6 +318,10 @@ inline void WriteToHardware(u32 em_address, const T data, u32 effective_address,
}
}
}
else
{
PanicAlertT("Invalid Write to 0x%08x, PC = 0x%08x ", em_address, PC);
}
}
// =====================