ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trap to the debugger properly after BackPatch failure.

This commit is contained in:
comex 2013-09-29 22:00:13 -04:00
parent fe3d0c9aa2
commit 3b0c0e2500
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp
View File

@ -177,15 +177,23 @@ const u8 *Jitx86Base::BackPatch(u8 *codePtr, u32 emAddress, void *ctx_void)
InstructionInfo info; InstructionInfo info;
if (!DisassembleMov(codePtr, &info)) { if (!DisassembleMov(codePtr, &info)) {
BackPatchError("BackPatch - failed to disassemble MOV instruction", codePtr, emAddress); BackPatchError("BackPatch - failed to disassemble MOV instruction", codePtr, emAddress);
return 0;
} }
if (info.otherReg != RBX) if (info.otherReg != RBX)
{
PanicAlert("BackPatch : Base reg not RBX." PanicAlert("BackPatch : Base reg not RBX."
"\n\nAttempted to access %08x.", emAddress); "\n\nAttempted to access %08x.", emAddress);
return 0;
}
auto it = registersInUseAtLoc.find(codePtr); auto it = registersInUseAtLoc.find(codePtr);
if (it == registersInUseAtLoc.end()) if (it == registersInUseAtLoc.end())
{
PanicAlert("BackPatch: no register use entry for address %p", codePtr); PanicAlert("BackPatch: no register use entry for address %p", codePtr);
return 0;
}
u32 registersInUse = it->second; u32 registersInUse = it->second;
if (!info.isMemoryWrite) if (!info.isMemoryWrite)
@ -235,7 +243,6 @@ const u8 *Jitx86Base::BackPatch(u8 *codePtr, u32 emAddress, void *ctx_void)
emitter.NOP(codePtr + info.instructionSize - emitter.GetCodePtr()); emitter.NOP(codePtr + info.instructionSize - emitter.GetCodePtr());
return start; return start;
} }
return 0;
#else #else
return 0; return 0;
#endif #endif

5
Source/Core/Core/Src/x64MemTools.cpp
View File

@ -65,6 +65,11 @@ bool DoFault(u64 bad_address, SContext *ctx)
{ {
ctx->CTX_PC = (u64) new_pc; ctx->CTX_PC = (u64) new_pc;
} }
else
{
// there was an error, give the debugger a chance
return false;
}
return true; return true;
} }