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

Merge pull request #15548 from unknownbrackets/crash-alignment

Browse Source 
Crash: Recover from unaligned CPU access
This commit is contained in:
Henrik Rydgård 2022-05-22 17:36:17 +02:00 committed by GitHub
commit 957c37b63f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/MemFault.cpp
View File

@ -111,15 +111,17 @@ bool HandleFault(uintptr_t hostAddress, void *ctx) {
#endif
// Check whether hostAddress is within the PSP memory space, which (likely) means it was a guest executable that did the bad access.
bool invalidHostAddress = hostAddress == (uintptr_t)0xFFFFFFFFFFFFFFFFULL;
if (hostAddress < baseAddress || hostAddress >= baseAddress + addressSpaceSize) {
// Host address outside - this was a different kind of crash.
return false;
if (!invalidHostAddress)
return false;
}
// OK, a guest executable did a bad access. Take care of it.
uint32_t guestAddress = (uint32_t)(hostAddress - baseAddress);
uint32_t guestAddress = invalidHostAddress ? 0xFFFFFFFFUL : (uint32_t)(hostAddress - baseAddress);
// TODO: Share the struct between the various analyzers, that will allow us to share most of
// the implementations here.