remove siminterface.h from bochs.h and include it only where required

bochs/bochs.h

@@ -103,7 +103,7 @@ extern "C" {
 
 #include "osdep.h"       /* platform dependent includes and defines */
 #include "bx_debug/debug.h"
-#include "gui/siminterface.h"
+#include "gui/paramtree.h"
 
 // BX_SHARE_PATH should be defined by the makefile.  If not, give it
 // a value of NULL to avoid compile problems.
@@ -302,6 +302,20 @@ void CDECL bx_signal_handler(int signum);
 int bx_atexit(void);
 BOCHSAPI extern bx_debug_t bx_dbg;
 
+enum {
+#define bx_define_cpudb(model) bx_cpudb_##model,
+#include "cpudb.h"
+  bx_cpudb_model_last
+};
+#undef bx_define_cpudb
+
+#if BX_SUPPORT_SMP
+  #define BX_SMP_PROCESSORS (bx_cpu_count)
+#else
+  #define BX_SMP_PROCESSORS 1
+#endif
+
+BOCHSAPI extern Bit8u bx_cpu_count;
 #if BX_SUPPORT_APIC
 // determinted by XAPIC option
 BOCHSAPI extern Bit32u apic_id_mask;

bochs/cpu/cpudb/amd/phenomx3_8650_toliman.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "phenomx3_8650_toliman.h"
 

bochs/cpu/cpudb/amd/ryzen.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "ryzen.h"
 

bochs/cpu/cpudb/amd/trinity_apu.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "trinity_apu.h"
 

bochs/cpu/cpudb/amd/zambezi.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "zambezi.h"
 

bochs/cpu/cpudb/intel/atom_n270.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "atom_n270.h"
 

bochs/cpu/cpudb/intel/broadwell_ult.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "broadwell_ult.h"
 

bochs/cpu/cpudb/intel/core2_penryn_t9600.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "core2_penryn_t9600.h"
 

bochs/cpu/cpudb/intel/core_duo_t2400_yonah.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "core_duo_t2400_yonah.h"
 

bochs/cpu/cpudb/intel/corei3_cnl.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "corei3_cnl.h"
 

bochs/cpu/cpudb/intel/corei5_arrandale_m520.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "corei5_arrandale_m520.h"
 

bochs/cpu/cpudb/intel/corei5_lynnfield_750.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "corei5_lynnfield_750.h"
 

bochs/cpu/cpudb/intel/corei7_haswell_4770.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "corei7_haswell_4770.h"
 

bochs/cpu/cpudb/intel/corei7_icelake-u.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu/cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "corei7_icelake-u.h"
 

bochs/cpu/cpudb/intel/corei7_ivy_bridge_3770K.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "corei7_ivy_bridge_3770K.h"
 

bochs/cpu/cpudb/intel/corei7_sandy_bridge_2600K.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "corei7_sandy_bridge_2600K.h"
 

bochs/cpu/cpudb/intel/corei7_skylake-x.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "corei7_skylake-x.h"
 

bochs/cpu/cpudb/intel/tigerlake.cc

@@ -23,6 +23,7 @@
 
 #include "bochs.h"
 #include "cpu/cpu.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "tigerlake.h"
 

bochs/cpu/cpuid.cc

@@ -22,6 +22,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include "bochs.h"
+#include "gui/siminterface.h"
 #include "cpu.h"
 #include "param_names.h"
 #include "cpuid.h"

bochs/cpu/generic_cpuid.cc

@@ -22,6 +22,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include "bochs.h"
+#include "gui/siminterface.h"
 #include "cpu.h"
 #include "param_names.h"
 #include "generic_cpuid.h"

bochs/cpu/init.cc

@@ -25,6 +25,7 @@
 #include "cpu.h"
 #define LOG_THIS BX_CPU_THIS_PTR
 
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "cpustats.h"
 

bochs/cpu/mwait.cc

@@ -22,6 +22,7 @@
 
 #define NEED_CPU_REG_SHORTCUTS 1
 #include "bochs.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "cpu.h"
 #define LOG_THIS BX_CPU_THIS_PTR

bochs/gui/enh_dbg.cc

@@ -17,6 +17,7 @@
 #include <math.h>
 
 #include "bochs.h"
+#include "siminterface.h"
 #include "pc_system.h"
 #include "cpu/cpu.h"
 

bochs/gui/gtk_enh_dbg_osdep.cc

@@ -11,6 +11,7 @@
 //  Copyright (C) 2008-2021  The Bochs Project
 
 #include "bochs.h"
+#include "siminterface.h"
 #include "enh_dbg.h"
 
 #if BX_DEBUGGER && BX_DEBUGGER_GUI

bochs/gui/gui.h

@@ -18,6 +18,11 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+#ifndef BX_GUI_H
+#define BX_GUI_H
+
+#include "gui/siminterface.h"
+
 // header bar and status bar stuff
 #define BX_HEADER_BAR_Y 32
 
@@ -581,3 +586,5 @@ enum {
     }                                                                   \
     return(0); /* Success */                                            \
   }
+
+#endif

bochs/gui/paramtree.cc

@@ -21,6 +21,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include "bochs.h"
+#include "siminterface.h"
 #include "paramtree.h"
 
 /////////////////////////////////////////////////////////////////////////

bochs/gui/siminterface.h

@@ -19,6 +19,10 @@
 //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 /////////////////////////////////////////////////////////////////////////
+
+#ifndef BX_SIM_INTERFACE_H
+#define BX_SIM_INTERFACE_H
+
 //
 // Intro to siminterface by Bryce Denney:
 //
@@ -126,19 +130,6 @@
 // base value for generated new parameter id
 #define BXP_NEW_PARAM_ID 1001
 
-enum {
-#define bx_define_cpudb(model) bx_cpudb_##model,
-#include "cpudb.h"
-  bx_cpudb_model_last
-};
-#undef bx_define_cpudb
-
-#if BX_SUPPORT_SMP
-  #define BX_SMP_PROCESSORS (bx_cpu_count)
-#else
-  #define BX_SMP_PROCESSORS 1
-#endif
-
 typedef enum {
   BX_TOOLBAR_UNDEFINED,
   BX_TOOLBAR_FLOPPYA,
@@ -155,27 +146,6 @@ typedef enum {
   BX_TOOLBAR_USER
 } bx_toolbar_buttons;
 
-// Log level defines
-typedef enum {
-  LOGLEV_DEBUG = 0,
-  LOGLEV_INFO,
-  LOGLEV_ERROR,
-  LOGLEV_PANIC,
-  N_LOGLEV
-} bx_log_levels;
-
-// Log action defines
-typedef enum {
-  ACT_IGNORE = 0,
-  ACT_REPORT,
-  ACT_WARN,
-  ACT_ASK,
-  ACT_FATAL,
-  N_ACT
-} bx_log_actions;
-
-#define BX_NULL_PREFIX  "[      ]"
-
 // normally all action choices are available for all event types. The exclude
 // expression allows some choices to be eliminated if they don't make any
 // sense.  For example, it would be stupid to ignore a panic.
@@ -187,8 +157,7 @@ typedef enum {
    )
 
 // floppy / cdrom media status
-#define BX_EJECTED  0
-#define BX_INSERTED 1
+enum { BX_EJECTED = 0, BX_INSERTED = 1 };
 
 // boot devices (using the same values as the rombios)
 enum {
@@ -866,4 +835,5 @@ typedef struct BOCHSAPI {
 
 BOCHSAPI extern bx_startup_flags_t bx_startup_flags;
 BOCHSAPI extern bool bx_user_quit;
-BOCHSAPI extern Bit8u bx_cpu_count;
+
+#endif

bochs/gui/textconfig.cc

@@ -51,6 +51,7 @@ extern "C" {
 #include "osdep.h"
 #include "param_names.h"
 #include "textconfig.h"
+#include "logio.h"
 #include "siminterface.h"
 
 #define CI_PATH_LENGTH 512

bochs/gui/win32_enh_dbg_osdep.cc

@@ -11,6 +11,7 @@
 //  Copyright (C) 2008-2021  The Bochs Project
 
 #include "bochs.h"
+#include "siminterface.h"
 #include "win32dialog.h"
 #include "enh_dbg.h"
 

bochs/gui/win32paramdlg.cc

@@ -20,6 +20,7 @@
 
 #include "win32dialog.h"
 #include "bochs.h"
+#include "siminterface.h"
 #include "win32res.h"
 
 #if BX_USE_WIN32CONFIG

bochs/iodev/display/ddc.cc

@@ -26,6 +26,7 @@
 #define BX_PLUGGABLE
 
 #include "bochs.h"
+#include "gui/siminterface.h"
 #include "ddc.h"
 #include "param_names.h"
 

bochs/iodev/iodev.h

@@ -29,6 +29,7 @@
 #include "plugin.h"
 #include "param_names.h"
 #include "pc_system.h"
+#include "gui/siminterface.h"
 #include "gui/gui.h"
 
 /* number of IRQ lines supported.  In an ISA PC there are two

bochs/iodev/slowdown_timer.cc

@@ -22,6 +22,7 @@
 
 #include "bochs.h"
 #include "param_names.h"
+#include "gui/siminterface.h"
 #include "pc_system.h"
 #include "slowdown_timer.h"
 

bochs/iodev/virt_timer.cc

@@ -58,6 +58,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include "bochs.h"
+#include "gui/siminterface.h"
 #include "param_names.h"
 #include "virt_timer.h"
 

bochs/logio.cc

@@ -21,6 +21,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include "bochs.h"
+#include "gui/siminterface.h"
 #include "pc_system.h"
 #include "bxthread.h"
 #include "cpu/cpu.h"

bochs/logio.h

@@ -23,6 +23,25 @@
 #ifndef BX_LOGIO_H
 #define BX_LOGIO_H
 
+// Log level defines
+typedef enum {
+  LOGLEV_DEBUG = 0,
+  LOGLEV_INFO,
+  LOGLEV_ERROR,
+  LOGLEV_PANIC,
+  N_LOGLEV
+} bx_log_levels;
+
+// Log action defines
+typedef enum {
+  ACT_IGNORE = 0,
+  ACT_REPORT,
+  ACT_WARN,
+  ACT_ASK,
+  ACT_FATAL,
+  N_ACT
+} bx_log_actions;
+
 typedef class BOCHSAPI logfunctions
 {
   char *name;
@@ -146,4 +165,6 @@ typedef class iofunctions iofunc_t;
 BOCHSAPI extern iofunc_t *io;
 BOCHSAPI extern logfunc_t *genlog;
 
+#define BX_NULL_PREFIX  "[      ]"
+
 #endif