Move evalCall align stack later to preserve VM state on throw

vshaxe · Oct 11, 2024 · fec14da · fec14da
1 parent 62a6a1a
commit fec14da
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/hld/Eval.hx b/hld/Eval.hx
@@ -362,11 +362,6 @@ class Eval {
 		var prevEax = api.readRegister(currentThread, Eax);
 		var eip = api.readRegister(currentThread, Eip);
 		var prevEsp = api.readRegister(currentThread, Esp);
-		// align stack
-		var stackValue = prevEsp;
-		stackValue = stackValue.offset(-0xFF);
-		stackValue = stackValue.offset((-stackValue.toInt() & 0xFF));
-		api.writeRegister(currentThread, Esp, stackValue);
 		// set registers
 		var asmOut = new haxe.io.BytesBuffer();
 
@@ -500,6 +495,12 @@ class Eval {
 		var isSingleStep = (api.readRegister(currentThread, EFlags).toInt() & 256) == 256;
 		if( isSingleStep )
 			setSingleStep(currentThread, false);
+		// align stack
+		var stackValue = prevEsp;
+		stackValue = stackValue.offset(-0xFF);
+		stackValue = stackValue.offset((-stackValue.toInt() & 0xFF));
+		api.writeRegister(currentThread, Esp, stackValue);
+		// run
 		resumeDebug();
 		if( isSingleStep )
 			setSingleStep(currentThread, true);