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

resolved issue #44 (by removing the push ss, pop ss 'fix') + fixed SingleStep

This commit is contained in:
Mr. eXoDia 2014-12-08 23:37:59 +01:00
parent d572dd2bfc
commit c541b9d764
4 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TitanEngine/Global.Debugger.cpp
View File

@ -30,7 +30,7 @@ DWORD ProcessExitCode = 0;
HANDLE DBGFileHandle; HANDLE DBGFileHandle;
std::vector<ULONG_PTR> tlsCallBackList; std::vector<ULONG_PTR> tlsCallBackList;
std::vector<PROCESS_ITEM_DATA> hListProcess; std::vector<PROCESS_ITEM_DATA> hListProcess;
int engineStepCount = INFINITE; DWORD engineStepCount = 0;
LPVOID engineStepCallBack = NULL; LPVOID engineStepCallBack = NULL;
bool engineStepActive = false; bool engineStepActive = false;
bool engineProcessIsNowDetached = false; bool engineProcessIsNowDetached = false;

2
TitanEngine/Global.Debugger.h
View File

@ -29,7 +29,7 @@ extern DWORD ProcessExitCode;
extern HANDLE DBGFileHandle; extern HANDLE DBGFileHandle;
extern std::vector<ULONG_PTR> tlsCallBackList; extern std::vector<ULONG_PTR> tlsCallBackList;
extern std::vector<PROCESS_ITEM_DATA> hListProcess; extern std::vector<PROCESS_ITEM_DATA> hListProcess;
extern int engineStepCount; extern DWORD engineStepCount;
extern LPVOID engineStepCallBack; extern LPVOID engineStepCallBack;
extern bool engineStepActive; extern bool engineStepActive;
extern bool engineProcessIsNowDetached; extern bool engineProcessIsNowDetached;

34
TitanEngine/TitanEngine.Debugger.Control.cpp
View File

@ -50,27 +50,20 @@ __declspec(dllexport) void TITCALL ForceClose()
__declspec(dllexport) void TITCALL StepInto(LPVOID StepCallBack) __declspec(dllexport) void TITCALL StepInto(LPVOID StepCallBack)
{ {
ULONG_PTR ueCurrentPosition = GetContextData(UE_CIP); ULONG_PTR ueCurrentPosition = GetContextData(UE_CIP);
unsigned char instr[32]; //two instructions unsigned char instr[16];
MemoryReadSafe(dbgProcessInformation.hProcess, (void*)ueCurrentPosition, instr, sizeof(instr), 0); MemoryReadSafe(dbgProcessInformation.hProcess, (void*)ueCurrentPosition, instr, sizeof(instr), 0);
char* DisassembledString = (char*)StaticDisassembleEx(ueCurrentPosition, (LPVOID)instr); char* DisassembledString = (char*)StaticDisassembleEx(ueCurrentPosition, (LPVOID)instr);
if(strstr(DisassembledString, "PUSHF")) if(strstr(DisassembledString, "PUSHF"))
StepOver(StepCallBack); StepOver(StepCallBack);
else else
{ {
int len = StaticLengthDisassemble((LPVOID)instr); ULONG_PTR ueContext = NULL;
DisassembledString = (char*)StaticDisassembleEx(ueCurrentPosition + len, (LPVOID)(instr + len)); ueContext = (ULONG_PTR)GetContextData(UE_EFLAGS);
if(strstr(DisassembledString, "PUSHF")) //we wanna land on PUSHF safely (to prevent 'PUSH SS, POP SS' problems ueContext |= UE_TRAP_FLAG;
SetBPX(ueCurrentPosition + len, UE_BREAKPOINT_TYPE_INT3 + UE_SINGLESHOOT, StepCallBack); SetContextData(UE_EFLAGS, ueContext);
else engineStepActive = true;
{ engineStepCallBack = StepCallBack;
ULONG_PTR ueContext = NULL; engineStepCount = 0;
ueContext = (ULONG_PTR)GetContextData(UE_EFLAGS);
ueContext |= UE_TRAP_FLAG;
SetContextData(UE_EFLAGS, ueContext);
engineStepActive = true;
engineStepCallBack = StepCallBack;
engineStepCount = NULL;
}
} }
} }
@ -98,15 +91,8 @@ __declspec(dllexport) void TITCALL StepOut(LPVOID StepOut, bool StepFinal)
__declspec(dllexport) void TITCALL SingleStep(DWORD StepCount, LPVOID StepCallBack) __declspec(dllexport) void TITCALL SingleStep(DWORD StepCount, LPVOID StepCallBack)
{ {
ULONG_PTR ueContext = NULL; StepInto(StepCallBack);
engineStepCount = StepCount - 1; //We already stepped once
ueContext = (ULONG_PTR)GetContextData(UE_EFLAGS);
ueContext |= UE_TRAP_FLAG;
SetContextData(UE_EFLAGS, ueContext);
engineStepActive = true;
engineStepCount = (int)StepCount;
engineStepCallBack = StepCallBack;
engineStepCount--;
} }
__declspec(dllexport) void TITCALL SetNextDbgContinueStatus(DWORD SetDbgCode) __declspec(dllexport) void TITCALL SetNextDbgContinueStatus(DWORD SetDbgCode)

8
TitanEngine/TitanEngine.Debugger.DebugLoop.cpp
View File

@ -681,7 +681,7 @@ __declspec(dllexport) void TITCALL DebugLoop()
ResetBPX = false; ResetBPX = false;
if(engineStepActive) if(engineStepActive)
{ {
if(engineStepCount == NULL) if(engineStepCount == 0)
{ {
myCustomBreakPoint = (fCustomBreakPoint)(engineStepCallBack); myCustomBreakPoint = (fCustomBreakPoint)(engineStepCallBack);
__try __try
@ -717,7 +717,7 @@ __declspec(dllexport) void TITCALL DebugLoop()
SetHardwareBreakPoint(DebugRegisterX.DrxBreakAddress, DebugRegisterXId, DebugRegisterX.DrxBreakPointType, DebugRegisterX.DrxBreakPointSize, (LPVOID)DebugRegisterX.DrxCallBack); SetHardwareBreakPoint(DebugRegisterX.DrxBreakAddress, DebugRegisterXId, DebugRegisterX.DrxBreakPointType, DebugRegisterX.DrxBreakPointSize, (LPVOID)DebugRegisterX.DrxCallBack);
if(engineStepActive) if(engineStepActive)
{ {
if(engineStepCount == NULL) if(engineStepCount == 0)
{ {
myCustomBreakPoint = (fCustomBreakPoint)(engineStepCallBack); myCustomBreakPoint = (fCustomBreakPoint)(engineStepCallBack);
__try __try
@ -746,7 +746,7 @@ __declspec(dllexport) void TITCALL DebugLoop()
VirtualProtectEx(dbgProcessInformation.hProcess, (LPVOID)ResetMemBPXAddress, ResetMemBPXSize, NewProtect, &OldProtect); VirtualProtectEx(dbgProcessInformation.hProcess, (LPVOID)ResetMemBPXAddress, ResetMemBPXSize, NewProtect, &OldProtect);
if(engineStepActive) if(engineStepActive)
{ {
if(engineStepCount == NULL) if(engineStepCount == 0)
{ {
myCustomBreakPoint = (fCustomBreakPoint)(engineStepCallBack); myCustomBreakPoint = (fCustomBreakPoint)(engineStepCallBack);
__try __try
@ -898,7 +898,7 @@ __declspec(dllexport) void TITCALL DebugLoop()
if(engineStepActive) if(engineStepActive)
{ {
DBGCode = DBG_CONTINUE; DBGCode = DBG_CONTINUE;
if(engineStepCount == NULL) if(engineStepCount == 0)
{ {
myCustomBreakPoint = (fCustomBreakPoint)(engineStepCallBack); myCustomBreakPoint = (fCustomBreakPoint)(engineStepCallBack);
__try __try