x64dbg
/
GleeBug
mirror of https://github.com/x64dbg/GleeBug
1
0
Fork 0
Code Releases Activity

Make bpgoto and NOP breakpoint MT-safe

This commit is contained in:
torusrxxx 2021-06-15 21:09:57 +08:00
parent 7fca84f656
commit 205f765e2b
No known key found for this signature in database
GPG Key ID: A795C73A0F1CFADD
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
GleeBug/Debugger.Loop.Exception.cpp
View File

@ -51,15 +51,6 @@ namespace GleeBug
//set back the instruction pointer //set back the instruction pointer
Registers(mThread->hThread, CONTEXT_CONTROL).Gip = info.address; Registers(mThread->hThread, CONTEXT_CONTROL).Gip = info.address;
//restore the original breakpoint byte and do an internal step
mProcess->MemWriteUnsafe(info.address, info.internal.software.oldbytes, info.internal.software.size);
mThread->StepInternal(std::bind([this, info]()
{
//only restore the bytes if the breakpoint still exists
if(mProcess->breakpoints.find({ BreakpointType::Software, info.address }) != mProcess->breakpoints.end())
mProcess->MemWriteUnsafe(info.address, info.internal.software.newbytes, info.internal.software.size);
}));
//call the generic callback //call the generic callback
cbBreakpoint(info); cbBreakpoint(info);
@ -71,6 +62,33 @@ namespace GleeBug
//delete the breakpoint if it is singleshoot //delete the breakpoint if it is singleshoot
if(info.singleshoot) if(info.singleshoot)
mProcess->DeleteGenericBreakpoint(info); mProcess->DeleteGenericBreakpoint(info);
else
{
auto Gip = Registers(mThread->hThread, CONTEXT_CONTROL).Gip.Get();
//Only restore the breakpoint if we need to resume from there. (make "bpgoto" MT-safe)
if(Gip >= info.address && Gip < info.address + info.internal.software.size)
{
//Deal with the NOP instruction (90 / 66 90). It doesn't need to be restored. (make the NOP breakpoint MT-safe)
if(((info.internal.software.oldbytes[0] == 0x90 && info.internal.software.size == 1) ||
(info.internal.software.oldbytes[0] == 0x66 && info.internal.software.oldbytes[1] == 0x90 && info.internal.software.size == 2)) &&
//We cannot use such shortcut if we need to produce a single step debug event this time.
!(mThread->isInternalStepping || mThread->isSingleStepping)) {
//Increment the instruction pointer without executing the original breakpoint instruction
Registers(mThread->hThread, CONTEXT_CONTROL).Gip = info.address + info.internal.software.size;
}
else
{
//restore the original breakpoint byte and do an internal step
mProcess->MemWriteUnsafe(info.address, info.internal.software.oldbytes, info.internal.software.size);
mThread->StepInternal(std::bind([this, info]()
{
//only restore the bytes if the breakpoint still exists
if(mProcess->breakpoints.find({ BreakpointType::Software, info.address }) != mProcess->breakpoints.end())
mProcess->MemWriteUnsafe(info.address, info.internal.software.newbytes, info.internal.software.size);
}));
}
}
}
} }
void Debugger::exceptionSingleStep(const EXCEPTION_RECORD & exceptionRecord, const bool firstChance) void Debugger::exceptionSingleStep(const EXCEPTION_RECORD & exceptionRecord, const bool firstChance)