From 925ae93e22eaca0e4ee408e32b77c1c9e1dd7461 Mon Sep 17 00:00:00 2001
From: Stanislav Shwartsman <sshwarts@users.sourceforge.net>
Date: Tue, 26 Sep 2006 19:16:10 +0000
Subject: [PATCH] Reveer back changes for debug.h removal from bochs.h

---
 bochs/bochs.h              | 3 ++-
 bochs/bx_debug/dbg_main.cc | 3 +--
 bochs/bx_debug/linux.cc    | 3 +--
 bochs/bx_debug/symbols.cc  | 3 +--
 bochs/cpu/cpu.cc           | 3 +--
 bochs/cpu/debugstuff.cc    | 3 +--
 bochs/cpu/exception.cc     | 3 +--
 bochs/gui/siminterface.cc  | 3 +--
 8 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/bochs/bochs.h b/bochs/bochs.h
index a58dddb31..f696d6219 100644
--- a/bochs/bochs.h
+++ b/bochs/bochs.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: bochs.h,v 1.200 2006-09-25 20:13:51 sshwarts Exp $
+// $Id: bochs.h,v 1.201 2006-09-26 19:16:09 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2002  MandrakeSoft S.A.
@@ -93,6 +93,7 @@ extern "C" {
 #endif
 
 #include "osdep.h"       /* platform dependent includes and defines */ 
+#include "bx_debug/debug.h"
 #include "bxversion.h"
 
 #include "gui/siminterface.h"
diff --git a/bochs/bx_debug/dbg_main.cc b/bochs/bx_debug/dbg_main.cc
index 24c7fc0e6..b9e400b6c 100644
--- a/bochs/bx_debug/dbg_main.cc
+++ b/bochs/bx_debug/dbg_main.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: dbg_main.cc,v 1.79 2006-09-25 20:13:51 sshwarts Exp $
+// $Id: dbg_main.cc,v 1.80 2006-09-26 19:16:09 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -30,7 +30,6 @@ extern "C" {
 }
 
 #include "bochs.h"
-#include "debug.h"
 #include "cpu/cpu.h"
 #include "iodev/iodev.h"
 #if BX_DEBUGGER
diff --git a/bochs/bx_debug/linux.cc b/bochs/bx_debug/linux.cc
index 57a6574af..8390aa24d 100644
--- a/bochs/bx_debug/linux.cc
+++ b/bochs/bx_debug/linux.cc
@@ -1,11 +1,10 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: linux.cc,v 1.6 2006-09-25 20:13:51 sshwarts Exp $
+// $Id: linux.cc,v 1.7 2006-09-26 19:16:10 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 #include <stdio.h>
 
 #include "bochs.h"
-#include "bx_debug/debug.h"
 #include "cpu/cpu.h"
 
 #if BX_DEBUGGER
diff --git a/bochs/bx_debug/symbols.cc b/bochs/bx_debug/symbols.cc
index f1c983e0f..ecfed0367 100755
--- a/bochs/bx_debug/symbols.cc
+++ b/bochs/bx_debug/symbols.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: symbols.cc,v 1.5 2006-09-25 20:13:51 sshwarts Exp $
+// $Id: symbols.cc,v 1.6 2006-09-26 19:16:10 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -26,7 +26,6 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include "bochs.h"
-#include "debug.h"
 #include "cpu/cpu.h"
 
 #if !((BX_HAVE_HASH_MAP || BX_HAVE_HASH_MAP_H) && (BX_HAVE_SET || BX_HAVE_SET_H))
diff --git a/bochs/cpu/cpu.cc b/bochs/cpu/cpu.cc
index 7a8cf5192..06766c708 100644
--- a/bochs/cpu/cpu.cc
+++ b/bochs/cpu/cpu.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: cpu.cc,v 1.167 2006-09-25 20:13:51 sshwarts Exp $
+// $Id: cpu.cc,v 1.168 2006-09-26 19:16:10 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -27,7 +27,6 @@
 
 #define NEED_CPU_REG_SHORTCUTS 1
 #include "bochs.h"
-#include "bx_debug/debug.h"
 #include "cpu.h"
 #define LOG_THIS BX_CPU_THIS_PTR
 
diff --git a/bochs/cpu/debugstuff.cc b/bochs/cpu/debugstuff.cc
index 2e5f44239..0824e77eb 100644
--- a/bochs/cpu/debugstuff.cc
+++ b/bochs/cpu/debugstuff.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: debugstuff.cc,v 1.75 2006-09-25 20:13:51 sshwarts Exp $
+// $Id: debugstuff.cc,v 1.76 2006-09-26 19:16:10 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -27,7 +27,6 @@
 
 #define NEED_CPU_REG_SHORTCUTS 1
 #include "bochs.h"
-#include "bx_debug/debug.h"
 #include "cpu.h"
 #define LOG_THIS BX_CPU_THIS_PTR
 
diff --git a/bochs/cpu/exception.cc b/bochs/cpu/exception.cc
index 723190f1f..7d732bf5a 100644
--- a/bochs/cpu/exception.cc
+++ b/bochs/cpu/exception.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: exception.cc,v 1.84 2006-09-25 20:13:51 sshwarts Exp $
+// $Id: exception.cc,v 1.85 2006-09-26 19:16:10 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001  MandrakeSoft S.A.
@@ -27,7 +27,6 @@
 
 #define NEED_CPU_REG_SHORTCUTS 1
 #include "bochs.h"
-#include "bx_debug/debug.h"
 #include "cpu.h"
 #define LOG_THIS BX_CPU_THIS_PTR
 
diff --git a/bochs/gui/siminterface.cc b/bochs/gui/siminterface.cc
index 22c16c25c..4fe6d5086 100644
--- a/bochs/gui/siminterface.cc
+++ b/bochs/gui/siminterface.cc
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: siminterface.cc,v 1.170 2006-09-25 20:13:52 sshwarts Exp $
+// $Id: siminterface.cc,v 1.171 2006-09-26 19:16:10 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 // See siminterface.h for description of the siminterface concept.
@@ -7,7 +7,6 @@
 // the configuration user interface, and allows them to talk to each other.
 
 #include "bochs.h"
-#include "bx_debug/debug.h"
 #include "iodev.h"
 
 bx_simulator_interface_c *SIM = NULL;