evalCall prevent singlestep, which can remove our breakpoints

vshaxe · Jun 18, 2024 · efd35a5 · efd35a5
1 parent fc4cc29
commit efd35a5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/hld/Debugger.hx b/hld/Debugger.hx
@@ -171,6 +171,7 @@ class Debugger {
 		this.api = api;
 		eval = new Eval(module, api, jit);
 		eval.resumeDebug = evalResumeDebug;
+		eval.setSingleStep = singleStep;
 		if( !api.start() )
 			return false;
 		wait(); // wait first break
@@ -289,7 +290,7 @@ class Debugger {
 		while( true ) {
 			cmd = api.wait(customTimeout == null ? 1000 : Math.ceil(customTimeout * 1000));
 
-			if( cmd.r == Breakpoint && (nextStep >= 0 || onStep) ) {
+			if( cmd.r == Breakpoint && !onEvalCall && (nextStep >= 0 || onStep) ) {
 				// On Linux, singlestep is not reset
 				cmd.r = SingleStep;
 				singleStep(cmd.tid,false);

diff --git a/hld/Eval.hx b/hld/Eval.hx
@@ -490,7 +490,12 @@ class Eval {
 		if( !api.write(eip, buffer, asmSize) )
 			throw "assert";
 		api.flush(eip, asmSize);
+		var isSingleStep = (api.readRegister(currentThread, EFlags).toInt() & 256) == 256;
+		if( isSingleStep )
+			setSingleStep(currentThread, false);
 		resumeDebug();
+		if( isSingleStep )
+			setSingleStep(currentThread, true);
 		// restore
 		api.write(eip, prevAsm, asmSize);
 		api.flush(eip, asmSize);
@@ -509,6 +514,10 @@ class Eval {
 		throw "Not implemented";
 	}
 
+	public dynamic function setSingleStep(tid : Int, set : Bool) {
+		throw "Not implemented";
+	}
+
 	function getNum( v : Value ) : Float {
 		return switch( v.v ) {
 		case VInt(i): i;