remove pc_system.h from iodev.h to speed-up compilation

Stanislav Shwartsman · Stanislav Shwartsman · commit 238b32e493cc · 2026-01-25T14:55:57.000+02:00
diff --git a/bochs/bx_debug/dbg_main.cc b/bochs/bx_debug/dbg_main.cc
@@ -29,6 +29,7 @@ extern "C" {
 #include "cpu/cpu.h"
 #include "cpu/decoder/ia_opcodes.h"
 #include "iodev/iodev.h"
+#include "pc_system.h"
 #if BX_DEBUGGER
 
 #define LOG_THIS genlog->
diff --git a/bochs/cpu/apic.cc b/bochs/cpu/apic.cc
@@ -28,6 +28,8 @@
 
 #include "apic.h"
 #include "scalar_arith.h"
+
+#include "pc_system.h"
 #include "iodev/iodev.h"
 
 extern bool simulate_xapic;
diff --git a/bochs/cpu/event.cc b/bochs/cpu/event.cc
@@ -34,6 +34,7 @@
 #endif
 
 #include "iodev/iodev.h"
+#include "pc_system.h"
 
 #include "bx_debug/debug.h"
 
diff --git a/bochs/cpu/exception.cc b/bochs/cpu/exception.cc
@@ -30,6 +30,7 @@
 #endif
 
 #include "param_names.h"
+#include "pc_system.h"
 #include "iodev/iodev.h"
 
 #include "bx_debug/debug.h"
diff --git a/bochs/cpu/io.cc b/bochs/cpu/io.cc
@@ -30,6 +30,7 @@
 #endif
 
 #include "iodev/iodev.h"
+#include "pc_system.h"
 
 //
 // Repeat Speedups methods
diff --git a/bochs/cpu/vmx.cc b/bochs/cpu/vmx.cc
@@ -34,7 +34,8 @@
 #include "apic.h"
 #endif
 
-#include "iodev/iodev.h"
+#include "pc_system.h"
+#include "gui/siminterface.h"
 
 #include "bx_debug/debug.h"
 
diff --git a/bochs/iodev/busmouse.cc b/bochs/iodev/busmouse.cc
@@ -28,6 +28,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 #include "busmouse.h"
 
 #if BX_SUPPORT_BUSMOUSE
diff --git a/bochs/iodev/dma.cc b/bochs/iodev/dma.cc
@@ -26,6 +26,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 #include "dma.h"
 
 #include "bx_debug/debug.h"
diff --git a/bochs/iodev/floppy.cc b/bochs/iodev/floppy.cc
@@ -106,6 +106,7 @@ extern "C" {
 }
 #endif
 #include "iodev.h"
+#include "pc_system.h"
 #include "hdimage/hdimage.h"
 
 #include "bx_debug/debug.h"
diff --git a/bochs/iodev/gameport.cc b/bochs/iodev/gameport.cc
@@ -28,6 +28,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 #include "gameport.h"
 
 #ifdef __linux__
diff --git a/bochs/iodev/harddrv.cc b/bochs/iodev/harddrv.cc
@@ -29,6 +29,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 #include "harddrv.h"
 #include "hdimage/hdimage.h"
 #include "hdimage/cdrom.h"
diff --git a/bochs/iodev/hpet.cc b/bochs/iodev/hpet.cc
@@ -32,6 +32,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI
 
diff --git a/bochs/iodev/iodev.h b/bochs/iodev/iodev.h
@@ -28,7 +28,6 @@
 #include "bochs.h"
 #include "plugin.h"
 #include "param_names.h"
-#include "pc_system.h"
 #include "memory/memory-bochs.h"
 #include "gui/siminterface.h"
 #include "gui/gui.h"
diff --git a/bochs/iodev/keyboard.cc b/bochs/iodev/keyboard.cc
@@ -47,6 +47,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 #include "gui/keymap.h"
 #include <math.h>
 #include "keyboard.h"
diff --git a/bochs/iodev/network/e1000.cc b/bochs/iodev/network/e1000.cc
@@ -35,6 +35,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 #if BX_SUPPORT_PCI && BX_SUPPORT_E1000
 
 #include "pci.h"
diff --git a/bochs/iodev/network/ne2k.cc b/bochs/iodev/network/ne2k.cc
@@ -28,6 +28,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_NE2K
 
diff --git a/bochs/iodev/pci.cc b/bochs/iodev/pci.cc
@@ -29,6 +29,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI
 
diff --git a/bochs/iodev/pci2isa.cc b/bochs/iodev/pci2isa.cc
@@ -29,6 +29,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI
 
diff --git a/bochs/iodev/pci_ide.cc b/bochs/iodev/pci_ide.cc
@@ -29,6 +29,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI
 
diff --git a/bochs/iodev/pic.cc b/bochs/iodev/pic.cc
@@ -25,6 +25,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 #include "pic.h"
 
 #include "bx_debug/debug.h"
diff --git a/bochs/iodev/serial.cc b/bochs/iodev/serial.cc
@@ -31,6 +31,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if !defined(WIN32) || defined(__CYGWIN__)
 #include <sys/types.h>
diff --git a/bochs/iodev/sound/es1370.cc b/bochs/iodev/sound/es1370.cc
@@ -32,6 +32,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 #if BX_SUPPORT_PCI && BX_SUPPORT_ES1370
 
 #include "soundlow.h"
diff --git a/bochs/iodev/sound/sb16.cc b/bochs/iodev/sound/sb16.cc
@@ -28,6 +28,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_SB16
 
diff --git a/bochs/iodev/speaker.cc b/bochs/iodev/speaker.cc
@@ -22,6 +22,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 #include "speaker.h"
 
 #if BX_SUPPORT_SOUNDLOW
diff --git a/bochs/iodev/usb/ohci_core.cc b/bochs/iodev/usb/ohci_core.cc
@@ -30,6 +30,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI && BX_SUPPORT_USB_OHCI
 
diff --git a/bochs/iodev/usb/scsi_device.cc b/bochs/iodev/usb/scsi_device.cc
@@ -33,6 +33,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI && BX_SUPPORT_PCIUSB
 #include "hdimage/hdimage.h"
diff --git a/bochs/iodev/usb/uhci_core.cc b/bochs/iodev/usb/uhci_core.cc
@@ -49,6 +49,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI && BX_SUPPORT_USB_UHCI
 
diff --git a/bochs/iodev/usb/usb_ehci.cc b/bochs/iodev/usb/usb_ehci.cc
@@ -39,6 +39,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI && BX_SUPPORT_USB_EHCI
 
diff --git a/bochs/iodev/usb/usb_floppy.cc b/bochs/iodev/usb/usb_floppy.cc
@@ -37,6 +37,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI && BX_SUPPORT_PCIUSB
 #include "usb_common.h"
diff --git a/bochs/iodev/usb/usb_hid.cc b/bochs/iodev/usb/usb_hid.cc
@@ -35,6 +35,7 @@
 #define BX_PLUGGABLE
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI && BX_SUPPORT_PCIUSB
 #include "usb_common.h"
diff --git a/bochs/iodev/usb/usb_pcap.cc b/bochs/iodev/usb/usb_pcap.cc
@@ -40,6 +40,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI && BX_SUPPORT_PCIUSB
 
diff --git a/bochs/iodev/usb/usb_xhci.cc b/bochs/iodev/usb/usb_xhci.cc
@@ -64,6 +64,7 @@
  */
 
 #include "iodev.h"
+#include "pc_system.h"
 
 #if BX_SUPPORT_PCI && BX_SUPPORT_USB_XHCI
 
diff --git a/bochs/main.cc b/bochs/main.cc
@@ -23,6 +23,7 @@
 #include "param_names.h"
 #include "cpu/cpu.h"
 #include "iodev/iodev.h"
+#include "pc_system.h"
 #include "iodev/hdimage/hdimage.h"
 #if BX_NETWORKING
 #include "iodev/network/netmod.h"
diff --git a/bochs/memory/Makefile.in b/bochs/memory/Makefile.in
@@ -76,10 +76,8 @@ memory.o: memory.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../logio.h \
  ../cpu/crregs.h ../cpu/descriptor.h ../cpu/decoder/instr.h \
  ../cpu/lazy_flags.h ../cpu/tlb.h ../cpu/icache.h ../cpu/xmm.h \
  ../cpu/vmx.h ../cpu/vmx_ctrls.h ../cpu/access.h ../iodev/iodev.h \
- ../plugin.h ../extplugin.h ../param_names.h ../pc_system.h \
- ../bx_debug/debug.h ../osdep.h ../cpu/decoder/decoder.h \
- ../memory/memory-bochs.h ../gui/siminterface.h ../gui/paramtree.h \
- ../gui/gui.h
+ ../plugin.h ../extplugin.h ../param_names.h ../memory/memory-bochs.h \
+ ../gui/siminterface.h ../gui/paramtree.h ../gui/gui.h ../pc_system.h
 memory_stub.o: memory_stub.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
  ../logio.h ../misc/bswap.h ../pc_system.h ../param_names.h ../cpu/cpu.h \
  ../cpu/decoder/decoder.h ../cpu/decoder/features.h \
@@ -90,13 +88,12 @@ memory_stub.o: memory_stub.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h \
  ../cpu/lazy_flags.h ../cpu/tlb.h ../cpu/icache.h ../cpu/xmm.h \
  ../cpu/vmx.h ../cpu/vmx_ctrls.h ../cpu/access.h ../memory/memory-bochs.h
 misc_mem.o: misc_mem.@CPP_SUFFIX@ ../bochs.h ../config.h ../osdep.h ../logio.h \
- ../misc/bswap.h ../param_names.h ../cpu/cpu.h ../cpu/decoder/decoder.h \
- ../cpu/decoder/features.h ../instrument/stubs/instrument.h ../cpu/i387.h \
+ ../misc/bswap.h memory-bochs.h ../param_names.h ../cpu/cpu.h \
+ ../cpu/decoder/decoder.h ../cpu/decoder/features.h \
+ ../instrument/stubs/instrument.h ../cpu/i387.h \
  ../cpu/softfloat3e/include/softfloat_types.h ../config.h \
  ../cpu/fpu/tag_w.h ../cpu/fpu/status_w.h ../cpu/fpu/control_w.h \
  ../cpu/crregs.h ../cpu/descriptor.h ../cpu/decoder/instr.h \
  ../cpu/lazy_flags.h ../cpu/tlb.h ../cpu/icache.h ../cpu/xmm.h \
- ../cpu/vmx.h ../cpu/vmx_ctrls.h ../cpu/access.h ../iodev/iodev.h \
- ../plugin.h ../extplugin.h ../pc_system.h ../bx_debug/debug.h ../osdep.h \
- ../cpu/decoder/decoder.h ../memory/memory-bochs.h ../gui/siminterface.h \
- ../gui/paramtree.h ../gui/gui.h
+ ../cpu/vmx.h ../cpu/vmx_ctrls.h ../cpu/access.h ../gui/siminterface.h \
+ ../gui/paramtree.h ../pc_system.h
diff --git a/bochs/memory/memory.cc b/bochs/memory/memory.cc
@@ -23,6 +23,7 @@
 #include "bochs.h"
 #include "cpu/cpu.h"
 #include "iodev/iodev.h"
+#include "pc_system.h"
 #define LOG_THIS BX_MEM_THIS
 
 //
diff --git a/bochs/memory/misc_mem.cc b/bochs/memory/misc_mem.cc
@@ -26,7 +26,8 @@
 #include "memory-bochs.h"
 #include "param_names.h"
 #include "cpu/cpu.h"
-#include "iodev/iodev.h"
+#include "gui/siminterface.h"
+#include "pc_system.h"
 #define LOG_THIS BX_MEM(0)->
 
 #define BX_MEM_HANDLERS   ((BX_CONST64(1) << BX_PHY_ADDRESS_WIDTH) >> 20) /* one per megabyte */
diff --git a/bochs/pc_system.cc b/bochs/pc_system.cc
@@ -22,6 +22,7 @@
 
 #include "bochs.h"
 #include "cpu/cpu.h"
+#include "pc_system.h"
 #include "iodev/iodev.h"
 #include "bx_debug/debug.h"
 #define LOG_THIS bx_pc_system.

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ extern "C" {`
`106`	`106`	`}`
`107`	`107`	`#endif`
`108`	`108`	`#include "iodev.h"`
	`109`	`+#include "pc_system.h"`
`109`	`110`	`#include "hdimage/hdimage.h"`
`110`	`111`
`111`	`112`	`#include "bx_debug/debug.h"`