From bf8aff71b2bf1be76bc29a6851ed02cc878fe0ee Mon Sep 17 00:00:00 2001
From: EdwardNutting_cp <4a0e5eaa1e4f1b941b4d24194acb591771a0e595xmSctDn6>
Date: Wed, 15 Jan 2014 22:29:49 +0000
Subject: [PATCH] Fixed the Locals bug properly now :)

---
 source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.asm | 6 ------
 source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.xs  | 5 -----
 source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.asm  | 4 +---
 source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.xs   | 4 +---
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.asm b/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.asm
index 43fe5b045..b902c9181 100644
--- a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.asm
+++ b/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.asm
@@ -73,12 +73,6 @@ Call DebugStub_Ping
 Call DebugStub_AckCommand
 Jmp DebugStub_ProcessCommand_Exit
 DebugStub_ProcessCommand_Block10_End:
-Cmp AL, DebugStub_Const_Vs2Ds_AsmStepInto
-JNE DebugStub_ProcessCommand_Block11_End
-Call DebugStub_SetINT1_TrapFLAG
-Call DebugStub_AckCommand
-Jmp DebugStub_ProcessCommand_Exit
-DebugStub_ProcessCommand_Block11_End:
 
 
 DebugStub_ProcessCommand_Exit:
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.xs b/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.xs
index 7b64430f7..e7a4be136 100644
--- a/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.xs
+++ b/source2/Compiler/Cosmos.Compiler.DebugStub/CmdProcess.xs
@@ -71,11 +71,6 @@ function ProcessCommand {
 		AckCommand()
 		return
 	}
-	if AL = #Vs2Ds_AsmStepInto {
-		SetINT1_TrapFLAG()
-		AckCommand()
-		return
-	}
 
 
 Exit:
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.asm b/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.asm
index cab7f6b47..fd149a53b 100644
--- a/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.asm
+++ b/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.asm
@@ -40,9 +40,6 @@ MOV DR6, EAX
 
 Call DebugStub_ResetINT1_TrapFLAG
 
-Mov AL, 21
-Call DebugStub_ComWriteAL
-
 Call DebugStub_Break
 Jmp DebugStub_Executing_Normal
 DebugStub_Executing_Block1_End:
@@ -124,6 +121,7 @@ JE DebugStub_Break_Done
 
 Cmp AL, DebugStub_Const_Vs2Ds_AsmStepInto
 JNE DebugStub_Break_Block1_End
+Call DebugStub_SetINT1_TrapFLAG
 Jmp DebugStub_Break_Done
 DebugStub_Break_Block1_End:
 
diff --git a/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.xs b/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.xs
index 14f38edf4..a93fd0983 100644
--- a/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.xs
+++ b/source2/Compiler/Cosmos.Compiler.DebugStub/DebugStub.xs
@@ -64,9 +64,6 @@ function Executing {
 	   
 	   ResetINT1_TrapFLAG()
 
-	   AL = 21
-	   ComWriteAL()
-
 	   Break()
 	   goto Normal
 	 }
@@ -175,6 +172,7 @@ WaitCmd:
 
 	//If Asm step into, we need to continue execution
 	if AL = #Vs2Ds_AsmStepInto {
+		SetINT1_TrapFLAG()
 		goto Done
 	}