From 813c012c4f4623dd508248a57a74c62b0aeae60d Mon Sep 17 00:00:00 2001
From: Ulf Wohlers <finsterr@users.sourceforge.net>
Date: Sun, 17 Nov 2002 12:27:17 +0000
Subject: [PATCH] Changes for debugger

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@526
---
 src/cpu/slow_16.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/cpu/slow_16.cpp b/src/cpu/slow_16.cpp
index 57edf9be..5f997f98 100644
--- a/src/cpu/slow_16.cpp
+++ b/src/cpu/slow_16.cpp
@@ -70,7 +70,7 @@ static Bitu CPU_Real_16_Slow_Decode(void) {
 #endif
 #if C_HEAVY_DEBUG
 		SAVEIP;
-		if (DEBUG_HeavyIsBreakpoint()) return CBRET_NONE;
+		if (DEBUG_HeavyIsBreakpoint()) return 1;
 #endif
 		#include "core_16/main.h"
 //		if (prefix.count) LOG_DEBUG("Prefix for non prefixed instruction");
@@ -82,16 +82,19 @@ static Bitu CPU_Real_16_Slow_Decode(void) {
 
 static Bitu CPU_Real_16_Slow_Decode_Trap(void) {
 
+	Bits oldCycles = CPU_Cycles;
+	CPU_Cycles = 1;
 	CPU_Real_16_Slow_Decode();
-
-	LOG_DEBUG("TRAP: Trap Flag executed");
+	
+//	LOG_DEBUG("TRAP: Trap Flag executed");
 	INTERRUPT(1);
-	cpudecoder=&CPU_Real_16_Slow_Decode;
+	
+	CPU_Cycles = oldCycles-1;
+	cpudecoder = &CPU_Real_16_Slow_Decode;
 
 	return CBRET_NONE;
 }
 
-
 void CPU_Real_16_Slow_Start(void) {
 	cpudecoder=&CPU_Real_16_Slow_Decode;
 	EAPrefixTable[0]=&GetEA_16_n;