Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #17684 from hrydgard/retroachievements-invalid-memory-hack

Browse Source 
RetroAchievements: Revert to the old behavior for bad accesses (return 0).
This commit is contained in:
Henrik Rydgård 2023-07-10 16:27:31 +02:00 committed by GitHub
commit 11c91d356e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Core/RetroAchievements.cpp
View File

@ -160,6 +160,7 @@ bool IsActive() {
static uint32_t read_memory_callback(uint32_t address, uint8_t *buffer, uint32_t num_bytes, rc_client_t *client) {
// Achievements are traditionally defined relative to the base of main memory of the emulated console.
// This is some kind of RetroArch-related legacy. In the PSP's case, this is simply a straight offset of 0x08000000.
uint32_t orig_address = address;
address += PSP_MEMORY_OFFSET;
if (!Memory::IsValidAddress(address)) {
@ -167,9 +168,15 @@ static uint32_t read_memory_callback(uint32_t address, uint8_t *buffer, uint32_t
// So we'll just count the bad accesses.
Achievements::g_stats.badMemoryAccessCount++;
if (g_Config.bAchievementsLogBadMemReads) {
WARN_LOG(G3D, "RetroAchievements PeekMemory: Bad address %08x (%d bytes)", address, num_bytes);
WARN_LOG(G3D, "RetroAchievements PeekMemory: Bad address %08x (%d bytes) (%08x was passed in)", address, num_bytes, orig_address);
}
return 0;
// TEMPORARY HACK: rcheevos' handling of bad memory accesses causes a LOT of extra work, since
// for some reason these invalid accesses keeps happening. So we'll temporarily to back to the previous
// behavior of simply returning 0.
uint32_t temp = 0;
memcpy(buffer, &temp, num_bytes);
return num_bytes;
}
switch (num_bytes) {