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

Merge pull request #2624 from CookiePLMonster/fix-safe-unaligned-writes

Browse source 
Make DoSafeMemoryAccess return true properly for RAM, BIOS, dcache writes
This commit is contained in:
Connor McLaughlin 2021-09-26 09:57:26 +10:00 committed by GitHub
parent 11be9c1498 270899dbdb
commit 8864b48c02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/bus.cpp
View file

@ -1914,7 +1914,10 @@ static ALWAYS_INLINE bool DoSafeMemoryAccess(VirtualMemoryAddress address, u32&
{ {
address &= PHYSICAL_MEMORY_ADDRESS_MASK; address &= PHYSICAL_MEMORY_ADDRESS_MASK;
if ((address & DCACHE_LOCATION_MASK) == DCACHE_LOCATION) if ((address & DCACHE_LOCATION_MASK) == DCACHE_LOCATION)
return DoScratchpadAccess<type, size>(address, value); {
DoScratchpadAccess<type, size>(address, value);
return true;
}
} }
break; break;
@ -1937,16 +1940,18 @@ static ALWAYS_INLINE bool DoSafeMemoryAccess(VirtualMemoryAddress address, u32&
if (address < RAM_MIRROR_END) if (address < RAM_MIRROR_END)
{ {
return DoRAMAccess<type, size, true>(address, value); DoRAMAccess<type, size, true>(address, value);
return true;
} }
else if (address >= BIOS_BASE && address < (BIOS_BASE + BIOS_SIZE)) if constexpr (type == MemoryAccessType::Read)
{ {
return DoBIOSAccess<type, size>(static_cast<u32>(address - BIOS_BASE), value); if (address >= BIOS_BASE && address < (BIOS_BASE + BIOS_SIZE))
} {
else DoBIOSAccess<type, size>(static_cast<u32>(address - BIOS_BASE), value);
{ return true;
return false; }
} }
return false;
} }
bool SafeReadMemoryByte(VirtualMemoryAddress addr, u8* value) bool SafeReadMemoryByte(VirtualMemoryAddress addr, u8* value)