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

Memory exception handler: Don't disassemble if ignoring the exception

Browse Source
This commit is contained in:
Henrik Rydgård 2024-02-04 11:59:36 +01:00
parent b28502a07e
commit b634e4154e
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Core/MemFault.cpp
View File

@ -152,19 +152,6 @@ bool HandleFault(uintptr_t hostAddress, void *ctx) {
MemoryExceptionType type = MemoryExceptionType::NONE; MemoryExceptionType type = MemoryExceptionType::NONE;
std::string infoString = "";
bool isAtDispatch = false;
if (MIPSComp::jit) {
std::string desc;
if (MIPSComp::jit->DescribeCodePtr(codePtr, desc)) {
infoString += desc + "\n";
}
if (MIPSComp::jit->IsAtDispatchFetch(codePtr)) {
isAtDispatch = true;
}
}
int instructionSize = 4; int instructionSize = 4;
#if PPSSPP_ARCH(AMD64) || PPSSPP_ARCH(X86) #if PPSSPP_ARCH(AMD64) || PPSSPP_ARCH(X86)
// X86, X86-64. Variable instruction size so need to analyze the mov instruction in detail. // X86, X86-64. Variable instruction size so need to analyze the mov instruction in detail.
@ -251,12 +238,7 @@ bool HandleFault(uintptr_t hostAddress, void *ctx) {
} }
#endif #endif
std::string disassembly; if (MIPSComp::jit && MIPSComp::jit->IsAtDispatchFetch(codePtr)) {
if (DisassembleNativeAt(codePtr, instructionSize, &disassembly)) {
infoString += disassembly + "\n";
}
if (isAtDispatch) {
u32 targetAddr = currentMIPS->pc; // bad approximation u32 targetAddr = currentMIPS->pc; // bad approximation
// TODO: Do the other archs and platforms. // TODO: Do the other archs and platforms.
#if PPSSPP_ARCH(AMD64) && PPSSPP_PLATFORM(WINDOWS) #if PPSSPP_ARCH(AMD64) && PPSSPP_PLATFORM(WINDOWS)
@ -299,6 +281,16 @@ bool HandleFault(uintptr_t hostAddress, void *ctx) {
ERROR_LOG(MEMMAP, "Bad memory access detected and ignored: %08x (%p)", guestAddress, (void *)hostAddress); ERROR_LOG(MEMMAP, "Bad memory access detected and ignored: %08x (%p)", guestAddress, (void *)hostAddress);
} }
} else { } else {
std::string infoString = "";
std::string temp;
if (MIPSComp::jit && MIPSComp::jit->DescribeCodePtr(codePtr, temp)) {
infoString += temp + "\n";
}
temp.clear();
if (DisassembleNativeAt(codePtr, instructionSize, &temp)) {
infoString += temp + "\n";
}
// Either bIgnoreBadMemAccess is off, or we failed recovery analysis. // Either bIgnoreBadMemAccess is off, or we failed recovery analysis.
// We can't ignore this memory access. // We can't ignore this memory access.
uint32_t approximatePC = currentMIPS->pc; uint32_t approximatePC = currentMIPS->pc;