From d74635f15c2c5950c4546cc7c0f335236769793c Mon Sep 17 00:00:00 2001
From: Sjoerd van der Berg <harekiet@users.sourceforge.net>
Date: Sat, 18 Jan 2003 11:29:23 +0000
Subject: [PATCH] Changed location of instructions.h Only enable heavy_debug if
 normal debug is enabled.

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@637
---
 src/cpu/core_16/support.h            | 3 +--
 src/cpu/{core_16 => }/instructions.h | 0
 src/cpu/slow_16.cpp                  | 4 +++-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename src/cpu/{core_16 => }/instructions.h (100%)

diff --git a/src/cpu/core_16/support.h b/src/cpu/core_16/support.h
index 5f540a0a..085f03f5 100644
--- a/src/cpu/core_16/support.h
+++ b/src/cpu/core_16/support.h
@@ -98,7 +98,6 @@ static INLINE Bit32u Pop_32() {
 #include "helpers.h"
 #include "table_ea.h"
 #include "../modrm.h"
-#include "instructions.h"
 
 
 static Bit8s table_df_8[2]={1,-1};
@@ -355,7 +354,7 @@ rep_again:
 	default:
 		IPPoint--;
 		LOG_DEBUG("Unhandled REP Prefix %X",Fetchb());
-
+		goto normalexit;
 	}
 	/* If we end up here it's because the CPU_Cycles counter is 0, so restart instruction */
 	IPPoint-=(prefix.count+2);		/* Rep instruction and whatever string instruction */
diff --git a/src/cpu/core_16/instructions.h b/src/cpu/instructions.h
similarity index 100%
rename from src/cpu/core_16/instructions.h
rename to src/cpu/instructions.h
diff --git a/src/cpu/slow_16.cpp b/src/cpu/slow_16.cpp
index 40146a3b..299895ec 100644
--- a/src/cpu/slow_16.cpp
+++ b/src/cpu/slow_16.cpp
@@ -63,6 +63,7 @@ extern Bitu cycle_count;
 #endif
 
 
+#include "instructions.h"
 #include "core_16/support.h"
 static Bitu CPU_Real_16_Slow_Decode_Trap(void);
 
@@ -71,10 +72,10 @@ static Bitu CPU_Real_16_Slow_Decode(void) {
 	while (CPU_Cycles>0) {
 #if C_DEBUG
 		cycle_count++;		
-#endif
 #if C_HEAVY_DEBUG
 		SAVEIP;
 		if (DEBUG_HeavyIsBreakpoint()) return 1;
+#endif
 #endif
 		#include "core_16/main.h"
 		if (prefix.count) {
@@ -103,6 +104,7 @@ static Bitu CPU_Real_16_Slow_Decode_Trap(void) {
 	return CBRET_NONE;
 }
 
+
 void CPU_Real_16_Slow_Start(void) {
 	cpudecoder=&CPU_Real_16_Slow_Decode;
 	EAPrefixTable[0]=&GetEA_16_n;