Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-03-04 12:17:16 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Switch back to rcheevos' upstream version

Browse Source
This commit is contained in:
Henrik Rydgård 2023-07-16 17:05:08 +02:00
parent 755269c90d
commit a259ed1835
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -46,4 +46,4 @@
url = https://github.com/google/cpu_features.git
[submodule "ext/rcheevos"]
path = ext/rcheevos
url = https://github.com/hrydgard/rcheevos.git
url = https://github.com/RetroAchievements/rcheevos.git

8
Core/RetroAchievements.cpp
View File

@ -161,12 +161,8 @@ static uint32_t read_memory_callback(uint32_t address, uint8_t *buffer, uint32_t
WARN_LOG(G3D, "RetroAchievements PeekMemory: Bad address %08x (%d bytes) (%08x was passed in)", address, num_bytes, orig_address);
}
// 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. This is fixed in a PR upstream, not yet merged.
uint32_t temp = 0;
memcpy(buffer, &temp, num_bytes);
return num_bytes;
// This tells rcheevos that the access was bad, which should now be handled properly.
return 0;
}
Memory::MemcpyUnchecked(buffer, address, num_bytes);

2
ext/rcheevos

@ -1 +1 @@
Subproject commit 223df0761313c5c9d9f4d4dc4b5897cf41e7e036
Subproject commit aa6324e886e12da0cf24dee1cf4e873571f39191