Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-01-19 06:45:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cheats/MemoryScan: Restrict search to RAM/Scratchpad/BIOS

Browse source
This commit is contained in:
Connor McLaughlin 2020-10-21 21:43:51 +10:00
parent 0d387dfaca
commit 2fb611518d
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/core/cheats.cpp
View file

@ -1,4 +1,5 @@
#include "cheats.h" #include "cheats.h"
#include "bus.h"
#include "common/assert.h" #include "common/assert.h"
#include "common/file_system.h" #include "common/file_system.h"
#include "common/log.h" #include "common/log.h"
@ -836,10 +837,28 @@ void MemoryScan::Search()
} }
} }
static bool IsValidScanAddress(PhysicalMemoryAddress address)
{
address &= CPU::PHYSICAL_MEMORY_ADDRESS_MASK;
if (address < Bus::RAM_MIRROR_END)
return true;
if (address >= CPU::DCACHE_LOCATION && address < (CPU::DCACHE_LOCATION + CPU::DCACHE_SIZE))
return true;
if (address >= Bus::BIOS_BASE && address < (Bus::BIOS_BASE + Bus::BIOS_SIZE))
return true;
return false;
}
void MemoryScan::SearchBytes() void MemoryScan::SearchBytes()
{ {
for (PhysicalMemoryAddress address = m_start_address; address < m_end_address; address++) for (PhysicalMemoryAddress address = m_start_address; address < m_end_address; address++)
{ {
if (!IsValidScanAddress(address))
continue;
u8 bvalue = 0; u8 bvalue = 0;
CPU::SafeReadMemoryByte(address, &bvalue); CPU::SafeReadMemoryByte(address, &bvalue);
@ -858,6 +877,9 @@ void MemoryScan::SearchHalfwords()
{ {
for (PhysicalMemoryAddress address = m_start_address; address < m_end_address; address += 2) for (PhysicalMemoryAddress address = m_start_address; address < m_end_address; address += 2)
{ {
if (!IsValidScanAddress(address))
continue;
u16 bvalue = 0; u16 bvalue = 0;
CPU::SafeReadMemoryHalfWord(address, &bvalue); CPU::SafeReadMemoryHalfWord(address, &bvalue);
@ -876,6 +898,9 @@ void MemoryScan::SearchWords()
{ {
for (PhysicalMemoryAddress address = m_start_address; address < m_end_address; address += 4) for (PhysicalMemoryAddress address = m_start_address; address < m_end_address; address += 4)
{ {
if (!IsValidScanAddress(address))
continue;
Result res; Result res;
res.address = address; res.address = address;
CPU::SafeReadMemoryWord(address, &res.value); CPU::SafeReadMemoryWord(address, &res.value);