x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

Revert "DBG: do not step if there is an enable breakpoint at CIP" 

This reverts commit 9804400df6.
This commit is contained in:
Duncan Ogilvie 2018-09-02 00:53:05 +02:00
parent 863f83df49
commit 7aab39f8e1
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dbg/breakpoint.h
View File

@ -5,11 +5,11 @@
#include "jansson/jansson_x64dbg.h"
#define TITANSETDRX(titantype, drx) titantype &= 0x0FF; titantype |= (drx<<8)
#define TITANGETDRX(titantype) ((titantype >> 8) & 0xF)
#define TITANGETDRX(titantype) (titantype >> 8) & 0xF
#define TITANSETTYPE(titantype, type) titantype &= 0xF0F; titantype |= (type<<4)
#define TITANGETTYPE(titantype) ((titantype >> 4) & 0xF)
#define TITANGETTYPE(titantype) (titantype >> 4) & 0xF
#define TITANSETSIZE(titantype, size) titantype &= 0xFF0; titantype |= size;
#define TITANGETSIZE(titantype) (titantype & 0xF)
#define TITANGETSIZE(titantype) titantype & 0xF
enum BP_TYPE
{

8
src/dbg/debugger.cpp
View File

@ -1142,14 +1142,6 @@ void cbStep()
{
hActiveThread = ThreadGetHandle(((DEBUG_EVENT*)GetDebugData())->dwThreadId);
duint CIP = GetContextDataEx(hActiveThread, UE_CIP);
// Do not step if there is an enable breakpoint at CIP
BREAKPOINT bp;
if((BpGet(CIP, BPNORMAL, nullptr, &bp) && bp.enabled))
return;
if(BpGet(CIP, BPHARDWARE, nullptr, &bp) && bp.enabled && TITANGETTYPE(bp.titantype) == UE_HARDWARE_EXECUTE)
return;
if(!stepRepeat || !--stepRepeat)
{
DebugUpdateGuiSetStateAsync(CIP, true);

2
src/dbg/symbolsourcedia.cpp
View File

@ -312,7 +312,7 @@ uint32_t SymbolSourceDIA::findSourceFile(const std::string & fileName) const
for(uint32_t n = 0; n < _sourceFiles.size(); n++)
{
const String & str = _sourceFiles[n];
if(_stricmp(str.c_str(), fileName.c_str()) == 0)
if(stricmp(str.c_str(), fileName.c_str()) == 0)
{
idx = n;
break;