bochs-cvs Mailing List for Bochs x86 PC emulator

Revision: 14349
Author:   vruppert
Date:     2021-11-04 17:44:57 +0000 (Thu, 04 Nov 2021)
Log Message:
-----------
Updated / improved information about configure shortcut scripts.

Modified Paths:
--------------
    trunk/bochs/doc/docbook/user/user.dbk

Modified: trunk/bochs/doc/docbook/user/user.dbk
===================================================================
--- trunk/bochs/doc/docbook/user/user.dbk	2021-10-25 15:51:36 UTC (rev 14348)
+++ trunk/bochs/doc/docbook/user/user.dbk	2021-11-04 17:44:57 UTC (rev 14349)
@@ -1828,16 +1828,44 @@
   sh .conf.win32-vcpp
 </screen>
 
-These <filename>.conf.<replaceable>platform</replaceable></filename> have
-been tested in recent Bochs versions:
-<screen>
-  .conf.linux
-  .conf.sparc
-  .conf.macos
-  .conf.macosx
-  .conf.win32-vcpp
-  .conf.win32-cygwin
-</screen>
+These <filename>.conf.<replaceable>platform</replaceable></filename> scripts
+have been tested in recent Bochs versions:
+<table><title>Shortcut scripts</title>
+  <tgroup cols="2" align="left" colsep="1" rowsep="1">
+  <thead>
+    <row>
+      <entry>Name</entry>
+      <entry>Build environment</entry>
+    </row>
+  </thead>
+  <tbody>
+    <row>
+      <entry>.conf.linux</entry>
+      <entry>Linux (32/64 bit)</entry>
+    </row>
+    <row>
+      <entry>.conf.macosx</entry>
+      <entry>MacOS X</entry>
+    </row>
+    <row>
+      <entry>.conf.win32-cygwin</entry>
+      <entry>Windows with Cygwin or MinGW/MSYS</entry>
+    </row>
+    <row>
+      <entry>.conf.win32-vcpp</entry>
+      <entry>Windows with MSVC (32 bit)</entry>
+    </row>
+    <row>
+      <entry>.conf.win64-vcpp</entry>
+      <entry>Windows with MSVC (64 bit)</entry>
+    </row>
+    <row>
+      <entry>.conf.win64-cross-mingw32</entry>
+      <entry>Cross compiling on Linux for Windows</entry>
+    </row>
+  </tbody>
+  </tgroup>
+</table>
 </para>
 
 </section> <!-- end of Configure Shortcut Scripts -->

Revision: 14348
Author:   vruppert
Date:     2021-10-25 15:51:36 +0000 (Mon, 25 Oct 2021)
Log Message:
-----------
Updated developer doc: the legacy disassembler has been removed.

Modified Paths:
--------------
    trunk/bochs/doc/docbook/development/development.dbk

Modified: trunk/bochs/doc/docbook/development/development.dbk
===================================================================
--- trunk/bochs/doc/docbook/development/development.dbk	2021-10-24 15:32:23 UTC (rev 14347)
+++ trunk/bochs/doc/docbook/development/development.dbk	2021-10-25 15:51:36 UTC (rev 14348)
@@ -3593,7 +3593,6 @@
 lines in config.h to turn on the debugger and the enhanced debugger gui.
 <screen>
 #define BX_DEBUGGER 1
-#define BX_DISASM 1
 #define BX_DEBUGGER_GUI 1
 </screen>
 One of the optimization features must be turned off, since it is currently

Revision: 14347
Author:   vruppert
Date:     2021-10-24 15:32:23 +0000 (Sun, 24 Oct 2021)
Log Message:
-----------
Added variable CONFIGURE_ARGS to simplify adding/overriding options.

Modified Paths:
--------------
    trunk/bochs/.conf.win32-cygwin

Modified: trunk/bochs/.conf.win32-cygwin
===================================================================
--- trunk/bochs/.conf.win32-cygwin	2021-10-18 19:31:16 UTC (rev 14346)
+++ trunk/bochs/.conf.win32-cygwin	2021-10-24 15:32:23 UTC (rev 14347)
@@ -32,4 +32,5 @@
             --enable-es1370 \
             --enable-e1000 \
             --enable-show-ips \
-            --with-win32 --with-rfb --with-nogui
+            --with-win32 --with-rfb --with-nogui \
+            ${CONFIGURE_ARGS}

Revision: 14346
Author:   vruppert
Date:     2021-10-18 19:31:16 +0000 (Mon, 18 Oct 2021)
Log Message:
-----------
Some documentation fixes.

Modified Paths:
--------------
    trunk/bochs/CHANGES
    trunk/bochs/doc/docbook/development/development.dbk
    trunk/bochs/doc/docbook/user/user.dbk

Modified: trunk/bochs/CHANGES
===================================================================
--- trunk/bochs/CHANGES	2021-10-14 17:59:08 UTC (rev 14345)
+++ trunk/bochs/CHANGES	2021-10-18 19:31:16 UTC (rev 14346)
@@ -5,6 +5,8 @@
 - Fixed APIC MWAIT timer activation
 - APIC: Removed timer handles from save/restore list
 - Apply standard CPPFLAGS from environment in all makefiles
+- Fixed and improved PCI slot config error handling
+- Documentation fixes
 
 -------------------------------------------------------------------------
 Changes in 2.7 (August 1, 2021):

Modified: trunk/bochs/doc/docbook/development/development.dbk
===================================================================
--- trunk/bochs/doc/docbook/development/development.dbk	2021-10-14 17:59:08 UTC (rev 14345)
+++ trunk/bochs/doc/docbook/development/development.dbk	2021-10-18 19:31:16 UTC (rev 14346)
@@ -3569,11 +3569,12 @@
 
 <section><title>Building the release on win32</title>
 <para>
-These instructions require cygwin and MSVC++. Use the Bochs sources from
-the SVN checkout or unpack the TAR file.
+These instructions require cygwin or mingw32/mingw64 to prepare the sources and
+MSVC++ to build the binaries. Use the Bochs sources from the SVN checkout or
+unpack the TAR file.
 </para>
 <para>
-In Cygwin:
+In Cygwin or mingw32/mingw64:
 <screen>
   sh .conf.win32-vcpp         # runs configure
   make win32_snap             # unzip workspace, make a win32 source ZIP

Modified: trunk/bochs/doc/docbook/user/user.dbk
===================================================================
--- trunk/bochs/doc/docbook/user/user.dbk	2021-10-14 17:59:08 UTC (rev 14345)
+++ trunk/bochs/doc/docbook/user/user.dbk	2021-10-18 19:31:16 UTC (rev 14346)
@@ -10377,16 +10377,16 @@
 Labs<footnote>
 <para>
 To get it, go to <ulink url="http://creative.com">Creative Labs web
-site</ulink>, click on Support, then click Download Files.  You get to a screen
+site</ulink>, click on Support, then click Download Files. You get to a screen
 where you must select the operating system and the product for which you want
-the driver.  Choose DOS as the operating system, and "CD-ROM: 4x and above" as
+the driver. Choose DOS as the operating system, and "CD-ROM: 4x and above" as
 the product.  There are several choices, but you want
 <filename>sbide121.exe</filename> from April 15, 1997.  Version 2.0 does not
 work.  The download file is a self-extracting ZIP file, so on
 DOS or Windows you just run it; on other platforms you can try using
 the unzip command.  The driver is called SBIDE.SYS.  </para>
-</footnote> and OAKCDROM.SYS that comes with several versions of Windows.
-Copy the driver to your boot disk, and then set up the startup files as follows.
+</footnote>.
+Copy the driver to your boot disk, and then set up the startup files as follows:
 </para>
 <screen>
 config.sys:

Revision: 14345
Author:   vruppert
Date:     2021-10-14 17:59:08 +0000 (Thu, 14 Oct 2021)
Log Message:
-----------
Fixed and improved PCI slot config error handling.

Modified Paths:
--------------
    trunk/bochs/config.cc
    trunk/bochs/iodev/devices.cc

Modified: trunk/bochs/config.cc
===================================================================
--- trunk/bochs/config.cc	2021-09-12 15:47:28 UTC (rev 14344)
+++ trunk/bochs/config.cc	2021-10-14 17:59:08 UTC (rev 14345)
@@ -2967,12 +2967,15 @@
         if ((slot > 0) && (slot < 6)) {
           sprintf(tmpdev, "pci.slot.%d", slot);
           if (strlen(&params[i][6]) > 0) {
-            SIM->get_param_enum(tmpdev)->set_by_name(&params[i][6]);
+            if (!SIM->get_param_enum(tmpdev)->set_by_name(&params[i][6])) {
+              PARSE_ERR(("%s: unknown plugin '%s' at PCI slot #%d.",
+                         context, &params[i][6], slot));
+            }
           } else {
             SIM->get_param_enum(tmpdev)->set_by_name("none");
           }
         } else {
-          BX_ERROR(("%s: unknown pci slot number ignored.", context));
+          PARSE_ERR(("%s: unknown PCI slot number #%d.", context, slot));
         }
       } else if (!strncmp(params[i], "advopts=", 8)) {
         SIM->get_param_string(BXPN_PCI_ADV_OPTS)->set(&params[i][8]);

Modified: trunk/bochs/iodev/devices.cc
===================================================================
--- trunk/bochs/iodev/devices.cc	2021-09-12 15:47:28 UTC (rev 14344)
+++ trunk/bochs/iodev/devices.cc	2021-10-14 17:59:08 UTC (rev 14345)
@@ -373,7 +373,7 @@
     if ((chipset == BX_PCI_CHIPSET_I440BX) && is_agp_present()) {
       device = SIM->get_param_enum("pci.slot.5")->get_selected();
       if (strcmp(device, "none") && !pci.slot_used[4]) {
-        BX_PANIC(("Unknown plugin '%s' at AGP slot", device));
+        BX_PANIC(("Plugin '%s' at AGP slot not loaded", device));
       }
       max_pci_slots = 4;
     }
@@ -381,7 +381,7 @@
       sprintf(devname, "pci.slot.%d", i+1);
       device = SIM->get_param_enum(devname)->get_selected();
       if (strcmp(device, "none") && !pci.slot_used[i]) {
-        BX_PANIC(("Unknown plugin '%s' at PCI slot #%d", device, i+1));
+        BX_PANIC(("Plugin '%s' at PCI slot #%d not loaded", device, i+1));
       }
     }
   }

Revision: 14344
Author:   vruppert
Date:     2021-09-12 15:47:28 +0000 (Sun, 12 Sep 2021)
Log Message:
-----------
Added changes after release.

Modified Paths:
--------------
    trunk/bochs/CHANGES

Modified: trunk/bochs/CHANGES
===================================================================
--- trunk/bochs/CHANGES	2021-09-12 15:13:20 UTC (rev 14343)
+++ trunk/bochs/CHANGES	2021-09-12 15:47:28 UTC (rev 14344)
@@ -1,3 +1,11 @@
+Changes after 2.7:
+
+- Fixed Voodoo device compilation for big endian architectures
+- Fixed memory handling in volatile BIOS write support
+- Fixed APIC MWAIT timer activation
+- APIC: Removed timer handles from save/restore list
+- Apply standard CPPFLAGS from environment in all makefiles
+
 -------------------------------------------------------------------------
 Changes in 2.7 (August 1, 2021):
 

Revision: 14343
Author:   vruppert
Date:     2021-09-12 15:13:20 +0000 (Sun, 12 Sep 2021)
Log Message:
-----------
Removed APIC timer handles from save/restore list. They are set by the
constructor and should not be modified. Timer activation after restore is not
necessary.

Modified Paths:
--------------
    trunk/bochs/cpu/apic.cc

Modified: trunk/bochs/cpu/apic.cc
===================================================================
--- trunk/bochs/cpu/apic.cc	2021-09-10 16:54:54 UTC (rev 14342)
+++ trunk/bochs/cpu/apic.cc	2021-09-12 15:13:20 UTC (rev 14343)
@@ -188,7 +188,7 @@
   timer_handle = bx_pc_system.register_timer_ticks(this,
             bx_local_apic_c::periodic_smf, 0, 0, 0, "lapic");
   timer_active = 0;
-  
+
 #if BX_SUPPORT_VMX >= 2
   // Register a non-active timer for VMX preemption timer.
   vmx_timer_handle = bx_pc_system.register_timer_ticks(this,
@@ -500,7 +500,7 @@
   if (apic_reg >= 0x400 && !cpu->is_cpu_extension_supported(BX_ISA_XAPIC_EXT))
     apic_reg = 0xffffffff; // choose some obviosly invalid register if extended xapic is not supported
 #endif
-  
+
   switch(apic_reg) {
     case BX_LAPIC_TPR: // task priority
       set_tpr(value & 0xff);
@@ -1222,7 +1222,7 @@
 }
 
 #endif
-  
+
 #if BX_CPU_LEVEL >= 6
 // return false when x2apic is not supported/not readable
 bool bx_local_apic_c::read_x2apic(unsigned index, Bit64u *val_64)
@@ -1439,12 +1439,10 @@
   BXRS_HEX_PARAM_SIMPLE(lapic, timer_current);
   BXRS_HEX_PARAM_SIMPLE(lapic, timer_divconf);
   BXRS_DEC_PARAM_SIMPLE(lapic, timer_divide_factor);
-  BXRS_DEC_PARAM_SIMPLE(lapic, timer_handle);
   BXRS_PARAM_BOOL(lapic, timer_active, timer_active);
   BXRS_HEX_PARAM_SIMPLE(lapic, ticksInitial);
 
 #if BX_SUPPORT_VMX >= 2
-  BXRS_DEC_PARAM_SIMPLE(lapic, vmx_timer_handle);
   BXRS_HEX_PARAM_SIMPLE(lapic, vmx_preemption_timer_initial);
   BXRS_HEX_PARAM_SIMPLE(lapic, vmx_preemption_timer_fire);
   BXRS_HEX_PARAM_SIMPLE(lapic, vmx_preemption_timer_value);

Revision: 14342
Author:   vruppert
Date:     2021-09-10 16:54:54 +0000 (Fri, 10 Sep 2021)
Log Message:
-----------
MWAIT timer fixes (to be completed).
- Fixed MWAIT timer activation.
- A timer handle should not appear in the save/restore list.
- TODO: Activate MWAIT timer after restore if necessary.

Modified Paths:
--------------
    trunk/bochs/cpu/apic.cc

Modified: trunk/bochs/cpu/apic.cc
===================================================================
--- trunk/bochs/cpu/apic.cc	2021-09-10 15:33:22 UTC (rev 14341)
+++ trunk/bochs/cpu/apic.cc	2021-09-10 16:54:54 UTC (rev 14342)
@@ -2,7 +2,7 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (c) 2002-2019 Zwane Mwaikambo, Stanislav Shwartsman
+//  Copyright (c) 2002-2021 Zwane Mwaikambo, Stanislav Shwartsman
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -1202,7 +1202,7 @@
 void bx_local_apic_c::set_mwaitx_timer(Bit32u value)
 {
   BX_DEBUG(("MWAITX timer: value = %u", value));
-  bx_pc_system.activate_timer_ticks(mwaitx_timer_active, value, 0);
+  bx_pc_system.activate_timer_ticks(mwaitx_timer_handle, value, 0);
   mwaitx_timer_active = 1;
 }
 
@@ -1453,7 +1453,6 @@
 #endif
 
 #if BX_SUPPORT_MONITOR_MWAIT
-  BXRS_DEC_PARAM_SIMPLE(lapic, mwaitx_timer_handle);
   BXRS_PARAM_BOOL(lapic, mwaitx_timer_active, mwaitx_timer_active);
 #endif
 }

Revision: 14341
Author:   vruppert
Date:     2021-09-10 15:33:22 +0000 (Fri, 10 Sep 2021)
Log Message:
-----------
Applied two patches from Debian.
- Apply standard flags from environment everywhere (SF patch #546).
- Allow overriding ld and objcopy for building bios on non-x86 platforms.

Modified Paths:
--------------
    trunk/bochs/Makefile.in
    trunk/bochs/bios/Makefile.in
    trunk/bochs/bx_debug/Makefile.in
    trunk/bochs/cpu/Makefile.in
    trunk/bochs/cpu/cpudb/Makefile.in
    trunk/bochs/gui/Makefile.in
    trunk/bochs/host/linux/pcidev/Makefile.in
    trunk/bochs/instrument/example0/Makefile.in
    trunk/bochs/instrument/example1/Makefile.in
    trunk/bochs/instrument/example2/Makefile.in
    trunk/bochs/instrument/stubs/Makefile.in
    trunk/bochs/iodev/Makefile.in
    trunk/bochs/iodev/display/Makefile.in
    trunk/bochs/iodev/hdimage/Makefile.in
    trunk/bochs/iodev/network/Makefile.in
    trunk/bochs/iodev/sound/Makefile.in
    trunk/bochs/iodev/usb/Makefile.in
    trunk/bochs/memory/Makefile.in
    trunk/bochs/misc/Makefile.in

Modified: trunk/bochs/Makefile.in
===================================================================
--- trunk/bochs/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -86,6 +86,7 @@
 CXX = @CXX@
 CFLAGS = @CFLAGS@ @GUI_CFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) @DEFINE_PLUGIN_PATH@ -DBX_SHARE_PATH='"$(sharedir)"'
 CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@ $(MCH_CFLAGS) $(FLA_FLAGS) @DEFINE_PLUGIN_PATH@ -DBX_SHARE_PATH='"$(sharedir)"'
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -164,9 +165,9 @@
 
 
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c $(BX_INCDIRS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 .c.o:
-	$(CC) @DASH@c $(BX_INCDIRS) $(CFLAGS) $(FPU_FLAGS) $< @OFP@$@
+	$(CC) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CFLAGS) $(FPU_FLAGS) $< @OFP@$@
 
 
 all: @PRIMARY_TARGET@ @PLUGIN_TARGET@ bximage@EXE@ @OPTIONAL_TARGET@ @BUILD_DOCBOOK_VAR@
@@ -256,39 +257,39 @@
 # compile with console CXXFLAGS, not gui CXXFLAGS
 misc/bximage.o: $(srcdir)/misc/bximage.cc $(srcdir)/misc/bswap.h \
   $(srcdir)/misc/bxcompat.h $(srcdir)/iodev/hdimage/hdimage.h
-	$(CXX) @DASH@c $(BX_INCDIRS) $(CXXFLAGS_CONSOLE) $(srcdir)/misc/bximage.cc @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS_CONSOLE) $(srcdir)/misc/bximage.cc @OFP@$@
 
 misc/hdimage.o: $(srcdir)/iodev/hdimage/hdimage.cc \
   $(srcdir)/iodev/hdimage/hdimage.h $(srcdir)/misc/bxcompat.h
-	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/hdimage.cc @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CPPFLAGS) $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/hdimage.cc @OFP@$@
 
 misc/vmware3.o: $(srcdir)/iodev/hdimage/vmware3.cc $(srcdir)/iodev/hdimage/vmware3.h \
   $(srcdir)/iodev/hdimage/hdimage.h $(srcdir)/misc/bxcompat.h
-	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vmware3.cc @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CPPFLAGS) $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vmware3.cc @OFP@$@
 
 misc/vmware4.o: $(srcdir)/iodev/hdimage/vmware4.cc $(srcdir)/iodev/hdimage/vmware4.h \
   $(srcdir)/iodev/hdimage/hdimage.h $(srcdir)/misc/bxcompat.h
-	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vmware4.cc @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CPPFLAGS) $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vmware4.cc @OFP@$@
 
 misc/vpc.o: $(srcdir)/iodev/hdimage/vpc.cc $(srcdir)/iodev/hdimage/vpc.h \
   $(srcdir)/iodev/hdimage/hdimage.h $(srcdir)/misc/bxcompat.h
-	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vpc.cc @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CPPFLAGS) $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vpc.cc @OFP@$@
 
 misc/vbox.o: $(srcdir)/iodev/hdimage/vbox.cc $(srcdir)/iodev/hdimage/vbox.h \
   $(srcdir)/iodev/hdimage/hdimage.h $(srcdir)/misc/bxcompat.h
-	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vbox.cc @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) @BXIMAGE_FLAG@ $(CPPFLAGS) $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/hdimage/vbox.cc @OFP@$@
 
 misc/bxhub.o: $(srcdir)/misc/bxhub.cc $(srcdir)/iodev/network/netmod.h \
   $(srcdir)/iodev/network/netutil.h $(srcdir)/misc/bxcompat.h
-	$(CC) @DASH@c $(BX_INCDIRS) $(CXXFLAGS_CONSOLE) $(srcdir)/misc/bxhub.cc @OFP@$@
+	$(CC) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS_CONSOLE) $(srcdir)/misc/bxhub.cc @OFP@$@
 
 misc/netutil.o: $(srcdir)/iodev/network/netutil.cc $(srcdir)/iodev/network/netutil.h \
   $(srcdir)/iodev/network/netmod.h $(srcdir)/misc/bxcompat.h
-	$(CXX) @DASH@c $(BX_INCDIRS) @BXHUB_FLAG@ $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/network/netutil.cc @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) @BXHUB_FLAG@ $(CPPFLAGS) $(CXXFLAGS_CONSOLE) $(srcdir)/iodev/network/netutil.cc @OFP@$@
 
 # compile with console CFLAGS, not gui CXXFLAGS
 misc/niclist.o: $(srcdir)/misc/niclist.c
-	$(CC) @DASH@c $(BX_INCDIRS) $(CFLAGS_CONSOLE) $(srcdir)/misc/niclist.c @OFP@$@
+	$(CC) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CFLAGS_CONSOLE) $(srcdir)/misc/niclist.c @OFP@$@
 
 $(BX_OBJS): $(BX_INCLUDES)
 

Modified: trunk/bochs/bios/Makefile.in
===================================================================
--- trunk/bochs/bios/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/bios/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -28,6 +28,7 @@
 
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -36,6 +37,8 @@
 BCC = bcc
 GCC = gcc
 GCC32 = gcc -m32 -march=i386 -fno-stack-protector
+LD32 = ld
+OBJCOPY32 = objcopy
 AS86 = as86
 IASL = @IASL@
 
@@ -51,7 +54,7 @@
 
 
 .@CPP_SUFFIX@.o:
-	$(CXX) -c $(BX_INCDIRS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) -c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 bios: biossums BIOS-bochs-latest BIOS-bochs-legacy
@@ -90,11 +93,11 @@
 	@RMCOMMAND@ _rombios_.s
 
 rombios32.bin: rombios32.out rombios.h
-	objcopy -O binary $< $@
+	$(OBJCOPY32) -O binary $< $@
 	./biossums -pad $@
 
 rombios32.out: rombios32start.o rombios32.o rombios32.ld
-	ld -o $@ -T $(srcdir)/rombios32.ld rombios32start.o rombios32.o
+	$(LD32) -o $@ -T $(srcdir)/rombios32.ld rombios32start.o rombios32.o
 
 rombios32.o: rombios32.c acpi-dsdt.hex rombios.h
 	$(GCC32) -O2 -Wall -c -o $@ $<

Modified: trunk/bochs/bx_debug/Makefile.in
===================================================================
--- trunk/bochs/bx_debug/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/bx_debug/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -31,6 +31,7 @@
 CFLAGS = @CFLAGS@ @GUI_CFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -64,11 +65,11 @@
 all: libdebug.a
 
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c $(BX_INCDIRS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 .c.o:
-	$(CC) @DASH@c $(BX_INCDIRS) $(CFLAGS) @CFP@$< @OFP@$@
+	$(CC) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CFLAGS) @CFP@$< @OFP@$@
 
 
 

Modified: trunk/bochs/cpu/Makefile.in
===================================================================
--- trunk/bochs/cpu/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/cpu/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -28,6 +28,7 @@
 
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -143,7 +144,7 @@
 all: libcpu.a
 
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c $(BX_INCDIRS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 libcpu.a: $(OBJS) @OBJS64@

Modified: trunk/bochs/cpu/cpudb/Makefile.in
===================================================================
--- trunk/bochs/cpu/cpudb/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/cpu/cpudb/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -28,6 +28,7 @@
 
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -69,7 +70,7 @@
 all: libcpudb.a
 
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c $(BX_INCDIRS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 libcpudb.a: $(CPUDB_OBJS)

Modified: trunk/bochs/gui/Makefile.in
===================================================================
--- trunk/bochs/gui/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/gui/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -40,6 +40,7 @@
 
 CXX = @CXX@
 CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@  @GUI_CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 LOCAL_CXXFLAGS = @TOOLKIT_CXXFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -116,54 +117,54 @@
 
 # standard compile rule for C++ files
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c  $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c  $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
 
 ##### building plugins with libtool
 %.lo: %.@CPP_SUFFIX@
-	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
+	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
 
 libbx_%_gui.la: %.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 libbx_x_gui.la: x.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_X)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_X)
 
 libbx_sdl_gui.la: sdl.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SDL)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SDL)
 
 libbx_sdl2_gui.la: sdl2.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SDL2)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_SDL2)
 
 libbx_rfb_gui.la: rfb.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_RFB)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_RFB)
 
 libbx_vncsrv_gui.la: vncsrv.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_VNCSRV)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_VNCSRV)
 
 libbx_amigaos_gui.la: amigaos.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_AMIGAOS)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_AMIGAOS)
 
 libbx_win32_gui.la: win32.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_WIN32)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_WIN32)
 
 libbx_macos_gui.la: macos.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_MACOS)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_MACOS)
 
 libbx_carbon_gui.la: carbon.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_CARBON)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_CARBON)
 
 libbx_nogui_gui.la: nogui.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_NOGUI)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_NOGUI)
 
 libbx_term_gui.la: term.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_TERM)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH) $(GUI_LINK_OPTS_TERM)
 
 libbx_textconfig.la: textconfig.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 # special link rules for plugins that require more than one object file
 libbx_wx_gui.la: $(GUI_OBJS_WX:.o=.lo) $(GUI_OBJS_WX_SUPPORT:.o=.lo)
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $(GUI_OBJS_WX:.o=.lo) $(GUI_OBJS_WX_SUPPORT:.o=.lo) -o $@ -rpath $(PLUGIN_PATH)  $(GUI_LINK_OPTS_WX)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $(GUI_OBJS_WX:.o=.lo) $(GUI_OBJS_WX_SUPPORT:.o=.lo) -o $@ -rpath $(PLUGIN_PATH)  $(GUI_LINK_OPTS_WX)
 
 #### building DLLs for win32 (Cygwin and MinGW/MSYS)
 bx_%_gui.dll: %.o

Modified: trunk/bochs/host/linux/pcidev/Makefile.in
===================================================================
--- trunk/bochs/host/linux/pcidev/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/host/linux/pcidev/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -17,7 +17,7 @@
 
 PCIDEV_MODULE_MAKE_ALL = @PCIDEV_MODULE_MAKE_ALL@
 
-CFLAGS = -Wstrict-prototypes -Wno-trigraphs -g -fno-strict-aliasing -fno-common -D__KERNEL__ -DMODULE -I$(KERNELDIR)/include -O -Wall
+CFLAGS = @CFLAGS@ -Wstrict-prototypes -Wno-trigraphs -g -fno-strict-aliasing -fno-common -D__KERNEL__ -DMODULE -I$(KERNELDIR)/include -O -Wall
 
 
 .PHONY : all

Modified: trunk/bochs/instrument/example0/Makefile.in
===================================================================
--- trunk/bochs/instrument/example0/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/instrument/example0/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -28,6 +28,7 @@
 CFLAGS = @CFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -47,11 +48,11 @@
 BX_INCDIRS = -I../.. -I$(srcdir)/../.. -I. -I$(srcdir)/.
 
 .@CPP_SUFFIX@.o:
-	$(CXX) -c $(CXXFLAGS) $(BX_INCDIRS) @CXXFP@$< @OFP@$@
+	$(CXX) -c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(BX_INCDIRS) @CFP@$< @OFP@$@
+	$(CC) -c $(BX_INCDIRS) $(CPPFLAGS) $(CFLAGS) @CFP@$< @OFP@$@
 
 
 

Modified: trunk/bochs/instrument/example1/Makefile.in
===================================================================
--- trunk/bochs/instrument/example1/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/instrument/example1/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -29,6 +29,7 @@
 CFLAGS = @CFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -48,11 +49,11 @@
 BX_INCDIRS = -I../.. -I$(srcdir)/../.. -I. -I$(srcdir)/.
 
 .@CPP_SUFFIX@.o:
-	$(CXX) -c $(CXXFLAGS) $(BX_INCDIRS) @CXXFP@$< @OFP@$@
+	$(CXX) -c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(BX_INCDIRS) @CFP@$< @OFP@$@
+	$(CC) -c $(BX_INCDIRS) $(CPPFLAGS) $(CFLAGS) @CFP@$< @OFP@$@
 
 
 

Modified: trunk/bochs/instrument/example2/Makefile.in
===================================================================
--- trunk/bochs/instrument/example2/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/instrument/example2/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -29,6 +29,7 @@
 CFLAGS = @CFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -48,11 +49,11 @@
 BX_INCDIRS = -I../.. -I$(srcdir)/../.. -I. -I$(srcdir)/.
 
 .@CPP_SUFFIX@.o:
-	$(CXX) -c $(CXXFLAGS) $(BX_INCDIRS) @CXXFP@$< @OFP@$@
+	$(CXX) -c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(BX_INCDIRS) @CFP@$< @OFP@$@
+	$(CC) -c $(BX_INCDIRS) $(CPPFLAGS) $(CFLAGS) @CFP@$< @OFP@$@
 
 
 

Modified: trunk/bochs/instrument/stubs/Makefile.in
===================================================================
--- trunk/bochs/instrument/stubs/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/instrument/stubs/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -29,6 +29,7 @@
 CFLAGS = @CFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -48,11 +49,11 @@
 BX_INCDIRS = -I../.. -I$(srcdir)/../.. -I. -I$(srcdir)/.
 
 .@CPP_SUFFIX@.o:
-	$(CXX) -c $(CXXFLAGS) $(BX_INCDIRS) @CXXFP@$< @OFP@$@
+	$(CXX) -c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 .c.o:
-	$(CC) -c $(CFLAGS) $(BX_INCDIRS) @CFP@$< @OFP@$@
+	$(CC) -c $(BX_INCDIRS) $(CPPFLAGS) $(CFLAGS) @CFP@$< @OFP@$@
 
 
 

Modified: trunk/bochs/iodev/Makefile.in
===================================================================
--- trunk/bochs/iodev/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/iodev/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -39,7 +39,8 @@
 @SET_MAKE@
 
 CXX = @CXX@
-CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@ @GUI_CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = $(BX_INCDIRS) @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -111,30 +112,30 @@
 
 # standard compile rule for C++ files
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c  $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c  $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
 
 pcidev.o : pcidev.@CPP_SUFFIX@
-	$(CXX) @DASH@c  $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(PCIDEV_CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c  $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(PCIDEV_CXXFLAGS) @CXXFP@$< @OFP@$@
 
 ##### building plugins with libtool
 %.lo: %.@CPP_SUFFIX@
-	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
+	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
 
 pcidev.lo : pcidev.@CPP_SUFFIX@
-	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(PCIDEV_CXXFLAGS) $< -o $@
+	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) $(PCIDEV_CXXFLAGS) $< -o $@
 
 libbx_%.la: %.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 # special link rules for plugins that require more than one object file
 libbx_keyboard.la: keyboard.lo scancodes.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module keyboard.lo scancodes.lo -o libbx_keyboard.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module keyboard.lo scancodes.lo -o libbx_keyboard.la -rpath $(PLUGIN_PATH)
 
 libbx_pit.la: pit82c54.lo pit.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module pit82c54.lo pit.lo -o libbx_pit.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module pit82c54.lo pit.lo -o libbx_pit.la -rpath $(PLUGIN_PATH)
 
 libbx_serial.la: serial.lo serial_raw.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module serial.lo serial_raw.lo -o libbx_serial.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module serial.lo serial_raw.lo -o libbx_serial.la -rpath $(PLUGIN_PATH)
 
 #### building DLLs for win32 (Cygwin and MinGW/MSYS)
 bx_%.dll: %.o

Modified: trunk/bochs/iodev/display/Makefile.in
===================================================================
--- trunk/bochs/iodev/display/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/iodev/display/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -83,24 +83,24 @@
 
 # standard compile rule for C++ files
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c  $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c  $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
 
 ##### building plugins with libtool
 %.lo: %.@CPP_SUFFIX@
-	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
+	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
 
 libbx_%.la: %.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 # special link rules for plugins that require more than one object file
 libbx_vga.la: vga.lo vgacore.lo ddc.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module vga.lo vgacore.lo ddc.lo -o libbx_vga.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module vga.lo vgacore.lo ddc.lo -o libbx_vga.la -rpath $(PLUGIN_PATH)
 
 libbx_svga_cirrus.la: svga_cirrus.lo vgacore.lo ddc.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module svga_cirrus.lo vgacore.lo ddc.lo -o libbx_svga_cirrus.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module svga_cirrus.lo vgacore.lo ddc.lo -o libbx_svga_cirrus.la -rpath $(PLUGIN_PATH)
 
 libbx_voodoo.la: voodoo.lo banshee.lo vgacore.lo ddc.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module voodoo.lo banshee.lo vgacore.lo ddc.lo -o libbx_voodoo.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module voodoo.lo banshee.lo vgacore.lo ddc.lo -o libbx_voodoo.la -rpath $(PLUGIN_PATH)
 
 #### building DLLs for win32 (Cygwin and MinGW/MSYS)
 bx_%.dll: %.o

Modified: trunk/bochs/iodev/hdimage/Makefile.in
===================================================================
--- trunk/bochs/iodev/hdimage/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/iodev/hdimage/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -39,7 +39,8 @@
 @SET_MAKE@
 
 CXX = @CXX@
-CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@ @GUI_CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = $(BX_INCDIRS) @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -84,14 +85,14 @@
 
 # standard compile rule for C++ files
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c  $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
 
 ##### building plugins with libtool
 %.lo: %.@CPP_SUFFIX@
-	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
+	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
 
 libbx_%_img.la: %.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 #### building DLLs for win32 (Cygwin and MinGW/MSYS)
 bx_%_img.dll: %.o

Modified: trunk/bochs/iodev/network/Makefile.in
===================================================================
--- trunk/bochs/iodev/network/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/iodev/network/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -39,7 +39,8 @@
 @SET_MAKE@
 
 CXX = @CXX@
-CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@ @GUI_CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = $(BX_INCDIRS) @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -109,21 +110,21 @@
 
 # standard compile rule for C++ files
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c  $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c  $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
 
 ##### building plugins with libtool
 %.lo: %.@CPP_SUFFIX@
-	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
+	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
 
 libbx_%.la: %.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 # special link rules for plugins that require more than one object file
 libbx_eth_slirp.la: eth_slirp.lo $(SLIRP_OBJS:.o=.lo)
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module eth_slirp.lo $(SLIRP_OBJS:.o=.lo) -o libbx_eth_slirp.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module eth_slirp.lo $(SLIRP_OBJS:.o=.lo) -o libbx_eth_slirp.la -rpath $(PLUGIN_PATH)
 
 libbx_eth_vnet.la: eth_vnet.lo netutil.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module eth_vnet.lo netutil.lo -o libbx_eth_vnet.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module eth_vnet.lo netutil.lo -o libbx_eth_vnet.la -rpath $(PLUGIN_PATH)
 
 #### building DLLs for win32 (Cygwin and MinGW/MSYS)
 bx_%.dll: %.o

Modified: trunk/bochs/iodev/sound/Makefile.in
===================================================================
--- trunk/bochs/iodev/sound/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/iodev/sound/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -39,7 +39,8 @@
 @SET_MAKE@
 
 CXX = @CXX@
-CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@ @GUI_CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = $(BX_INCDIRS) @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -88,24 +89,24 @@
 
 # standard compile rule for C++ files
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c  $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c  $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
 
 ##### building plugins with libtool
 %.lo: %.@CPP_SUFFIX@
-	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
+	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
 
 libbx_%.la: %.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 # special link rules for plugins that require more than one object file
 libbx_sb16.la: sb16.lo opl.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module sb16.lo opl.lo -o libbx_sb16.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module sb16.lo opl.lo -o libbx_sb16.la -rpath $(PLUGIN_PATH)
 
 libbx_soundalsa.la: soundalsa.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module soundalsa.lo -o libbx_soundalsa.la -rpath $(PLUGIN_PATH) $(ALSA_SOUND_LINK_OPTS)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module soundalsa.lo -o libbx_soundalsa.la -rpath $(PLUGIN_PATH) $(ALSA_SOUND_LINK_OPTS)
 
 libbx_soundsdl.la: soundsdl.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module soundsdl.lo -o libbx_soundsdl.la -rpath $(PLUGIN_PATH) $(SDL_SOUND_LINK_OPTS)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module soundsdl.lo -o libbx_soundsdl.la -rpath $(PLUGIN_PATH) $(SDL_SOUND_LINK_OPTS)
 
 #### building DLLs for win32 (Cygwin and MinGW/MSYS)
 bx_%.dll: %.o

Modified: trunk/bochs/iodev/usb/Makefile.in
===================================================================
--- trunk/bochs/iodev/usb/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/iodev/usb/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -39,7 +39,8 @@
 @SET_MAKE@
 
 CXX = @CXX@
-CXXFLAGS = $(BX_INCDIRS) @CXXFLAGS@ @GUI_CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = $(BX_INCDIRS) @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -88,24 +89,24 @@
 
 # standard compile rule for C++ files
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c  $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c  $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) @CXXFP@$< @OFP@$@
 
 ##### building plugins with libtool
 %.lo: %.@CPP_SUFFIX@
-	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
+	$(LIBTOOL) --mode=compile --tag CXX $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $(LOCAL_CXXFLAGS) $< -o $@
 
 libbx_%.la: %.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 # special link rules for plugins that require more than one object file
 libbx_usb_msd.la: usb_msd.lo scsi_device.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module usb_msd.lo scsi_device.lo -o libbx_usb_msd.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module usb_msd.lo scsi_device.lo -o libbx_usb_msd.la -rpath $(PLUGIN_PATH)
 
 libbx_usb_uhci.la: usb_uhci.lo uhci_core.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module usb_uhci.lo uhci_core.lo -o libbx_usb_uhci.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module usb_uhci.lo uhci_core.lo -o libbx_usb_uhci.la -rpath $(PLUGIN_PATH)
 
 libbx_usb_ehci.la: usb_ehci.lo uhci_core.lo
-	$(LIBTOOL) --mode=link --tag CXX $(CXX) -module usb_ehci.lo uhci_core.lo -o libbx_usb_ehci.la -rpath $(PLUGIN_PATH)
+	$(LIBTOOL) --mode=link --tag CXX $(CXX) $(LDFLAGS) -module usb_ehci.lo uhci_core.lo -o libbx_usb_ehci.la -rpath $(PLUGIN_PATH)
 
 #### building DLLs for win32 (Cygwin and MinGW/MSYS)
 bx_%.dll: %.o

Modified: trunk/bochs/memory/Makefile.in
===================================================================
--- trunk/bochs/memory/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/memory/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -28,6 +28,7 @@
 
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -46,7 +47,7 @@
 all: libmemory.a
 
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c $(BX_INCDIRS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c $(BX_INCDIRS) $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 libmemory.a: $(BX_OBJS)

Modified: trunk/bochs/misc/Makefile.in
===================================================================
--- trunk/bochs/misc/Makefile.in	2021-08-25 17:42:08 UTC (rev 14340)
+++ trunk/bochs/misc/Makefile.in	2021-09-10 15:33:22 UTC (rev 14341)
@@ -28,6 +28,7 @@
 CXX = @CXX@
 CFLAGS = @CFLAGS@ @GUI_CFLAGS@
 CXXFLAGS = @CXXFLAGS@ @GUI_CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
 
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
@@ -36,7 +37,7 @@
 
 
 .@CPP_SUFFIX@.o:
-	$(CXX) @DASH@c $(CXXFLAGS) @CXXFP@$< @OFP@$@
+	$(CXX) @DASH@c $(CPPFLAGS) $(CXXFLAGS) @CXXFP@$< @OFP@$@
 
 
 all: make_cmos_image

Revision: 14340
Author:   sshwarts
Date:     2021-08-25 17:42:08 +0000 (Wed, 25 Aug 2021)
Log Message:
-----------
merge memory handling fix by Nikolai Zhubr

Modified Paths:
--------------
    trunk/bochs/memory/memory.cc

Modified: trunk/bochs/memory/memory.cc
===================================================================
--- trunk/bochs/memory/memory.cc	2021-08-24 19:06:01 UTC (rev 14339)
+++ trunk/bochs/memory/memory.cc	2021-08-25 17:42:08 UTC (rev 14340)
@@ -180,23 +180,10 @@
           *(BX_MEM_THIS get_vector(a20addr)) = *data_ptr;
         } else if ((area >= BX_MEM_AREA_E0000) && BX_MEM_THIS bios_write_enabled) {
           // volatile BIOS write support
-#ifdef BX_LITTLE_ENDIAN
-          data_ptr = (Bit8u *) data;
-#else // BX_BIG_ENDIAN
-          data_ptr = (Bit8u *) data + (len - 1);
-#endif
-          for (unsigned i = 0; i < len; i++) {
-            if (BX_MEM_THIS flash_type > 0) {
-              BX_MEM_THIS flash_write(BIOS_MAP_LAST128K(a20addr), *data_ptr);
-            } else {
-              BX_MEM_THIS rom[BIOS_MAP_LAST128K(a20addr)] = *data_ptr;
-            }
-            a20addr++;
-#ifdef BX_LITTLE_ENDIAN
-            data_ptr++;
-#else // BX_BIG_ENDIAN
-            data_ptr--;
-#endif
+          if (BX_MEM_THIS flash_type > 0) {
+            BX_MEM_THIS flash_write(BIOS_MAP_LAST128K(a20addr), *data_ptr);
+          } else {
+            BX_MEM_THIS rom[BIOS_MAP_LAST128K(a20addr)] = *data_ptr;
           }
         } else {
           // Writes to ROM, Inhibit

Revision: 14339
Author:   vruppert
Date:     2021-08-24 19:06:01 +0000 (Tue, 24 Aug 2021)
Log Message:
-----------
Fixed compilation for big endian architectures (SF patch #563).

Modified Paths:
--------------
    trunk/bochs/iodev/display/voodoo_func.h

Modified: trunk/bochs/iodev/display/voodoo_func.h
===================================================================
--- trunk/bochs/iodev/display/voodoo_func.h	2021-08-08 16:03:16 UTC (rev 14338)
+++ trunk/bochs/iodev/display/voodoo_func.h	2021-08-24 19:06:01 UTC (rev 14339)
@@ -1627,7 +1627,7 @@
     if (rgbfmt & 1) {
       BX_ERROR(("Voodoo bitBLT: color order other than RGB not supported yet"));
     }
-#if BX_BIG_ENDIAN
+#ifdef BX_BIG_ENDIAN
     data = bx_bswap32(data);
 #endif
     src_ptr = (Bit8u*)&data;

Revision: 14338
Author:   vruppert
Date:     2021-08-08 16:03:16 +0000 (Sun, 08 Aug 2021)
Log Message:
-----------
Added missing updates after release.

Modified Paths:
--------------
    trunk/bochs/build/win32/bochs.manifest
    trunk/bochs/configure
    trunk/bochs/configure.in

Modified: trunk/bochs/build/win32/bochs.manifest
===================================================================
--- trunk/bochs/build/win32/bochs.manifest	2021-08-06 18:15:21 UTC (rev 14337)
+++ trunk/bochs/build/win32/bochs.manifest	2021-08-08 16:03:16 UTC (rev 14338)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
-    version="2.7.0.0"
+    version="2.7.0.1"
     processorArchitecture="*"
     name="Bochs.Bochs.Bochs"
     type="win32"

Modified: trunk/bochs/configure
===================================================================
(Binary files differ)

Modified: trunk/bochs/configure.in
===================================================================
--- trunk/bochs/configure.in	2021-08-06 18:15:21 UTC (rev 14337)
+++ trunk/bochs/configure.in	2021-08-08 16:03:16 UTC (rev 14338)
@@ -8,7 +8,7 @@
 
 dnl // Put Bochs version information right here so that it gets substituted
 dnl // into all the right places.
-VERSION="2.7"
+VERSION="2.7.svn"
 VER_MAJOR=2
 VER_MINOR=7
 dnl // this should be > 90 for pre-release of next version otherwise revision level

Revision: 14337
Author:   vruppert
Date:     2021-08-06 18:15:21 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
Forgot some updates.

Modified Paths:
--------------
    trunk/sfsite/getcurrent.html

Modified: trunk/sfsite/getcurrent.html
===================================================================
--- trunk/sfsite/getcurrent.html	2021-08-06 17:57:45 UTC (rev 14336)
+++ trunk/sfsite/getcurrent.html	2021-08-06 18:15:21 UTC (rev 14337)
@@ -41,13 +41,13 @@
  </ul>
 </ul>
 
-<a href="https://svn.code.sf.net/p/bochs/code/tags/REL_2_6_11_FINAL/bochs/CHANGES">
-Details on what has changed since version 2.6.10
+<a href="https://svn.code.sf.net/p/bochs/code/tags/REL_2_7_FINAL/bochs/CHANGES">
+Details on what has changed since version 2.6.11
 </a>
 
 <BR/><BR/>
 
- <BR><font face="arial, helvetica" color="#1e029a" size="4"><b>Previous release:</b> Bochs 2.6.10</font><BR><BR>
+ <BR><font face="arial, helvetica" color="#1e029a" size="4"><b>Previous release:</b> Bochs 2.6.11</font><BR><BR>
 
 Bochs 2.6.11 is a bugfix release. Here is the summary of changes :
 

Revision: 14336
Author:   vruppert
Date:     2021-08-06 17:57:45 +0000 (Fri, 06 Aug 2021)
Log Message:
-----------
Finished website update after release.

Modified Paths:
--------------
    trunk/sfsite/getcurrent.html
    trunk/sfsite/includes/header.txt

Modified: trunk/sfsite/getcurrent.html
===================================================================
--- trunk/sfsite/getcurrent.html	2021-08-01 21:45:35 UTC (rev 14335)
+++ trunk/sfsite/getcurrent.html	2021-08-06 17:57:45 UTC (rev 14336)
@@ -7,35 +7,19 @@
  <!--content starts here-->
  <img src="images/logo.png" alt="A Window, Tux, and the BSD Daemon" width="160" height="175" align="right">
 
- <BR><font face="arial, helvetica" color="#1e029a" size="4"><b>Latest release:</b> Bochs 2.6.11</font><BR><BR>
+ <BR><font face="arial, helvetica" color="#1e029a" size="4"><b>Latest release:</b> Bochs 2.7</font><BR><BR>
 
-Bochs 2.6.11 is a bugfix release. Here is the summary of changes :
+Bochs 2.7 is the latest major release. Here is the brief summary of changes :
 
 <ul>
-<li>General
- <ul>
- <li>Added 64-bit support to the NSIS installer script
- <li>Several fixes in the build system based on Debian patches
- </ul>
-<li>CPU / CPUDB
- <ul>
- <li>Bugfixes for CPU emulation correctness
- <li>Many critical bugfixes for Protection Keys, AVX512*, VMX/SVM, SHA, GFNI emulation
- <li>! Implemented CET (Control Flow Enforcement Technology) emulation according to Intel SDM rev071
- </ul>
-<li>I/O Devices
- <ul>
- <li>Added missing Cirrus SVGA bitblt feature "transparent color compare"
- <li>Some fixes in HPET emulation (patch by Oleg)
- <li>Fixed disk image lock mechanism in the USB MSD case
- </ul>
-<li>BIOS / VGABIOS
- <ul>
- <li>LGPL'd VGABIOS updated to version 0.7b (Fixed VESA extension 'read EDID' for Bochs VBE and Cirrus)
- <li>Updated SeaBIOS ROM image to current version 1.13.0
- <li>Added SeaVGABIOS ROM image for the Cirrus adapter
- <li>Bochs BIOS built to work with CPU level 5 again
- </ul>
+<li>Bugfixes for CPU emulation correctness (CPUID/VMX/SVM fixes to support Windows Hyper-V as guest in Bochs)
+<li>Improvements for the plugin handling to simplify Bochs extensions
+<li>Added "multiple NICs" support to the NE2000 and E1000 devices
+<li>Added experimental FTP service for networking modules 'vnet' and 'socket'
+<li>Fixes and improvements for all supported Voodoo graphics adapters
+<li>Added USB keyboard emulation with most of the keys supported
+<li>GUI "cmdmode": create a headerbar event with key combo starting with F7
+<li>LGPL'd VGABIOS updated to version 0.8a (new VGABIOS for Voodoo Banshee)
 </ul>
 
 The binary packages for Linux and Windows are built with these features :
@@ -65,24 +49,39 @@
 
  <BR><font face="arial, helvetica" color="#1e029a" size="4"><b>Previous release:</b> Bochs 2.6.10</font><BR><BR>
 
-Bochs 2.6.10 is an intermediate (bugfix+) release. Here is the summary of changes :
+Bochs 2.6.11 is a bugfix release. Here is the summary of changes :
 
 <ul>
-<li>CPU: Bugfixes for CPU emulation correctness (critical bugfixes for PCID, ADCX/ADOX, MOVBE, AVX/AVX-512 and VMX emulation)
-<li>CPU: implemented AVX-512 VBMI2/VNNI/BITALG, VAES, VPCLMULQDQ / GFNI instructions emulation
-<li>VMX: Implement EPT-Based Sub-Page Protection
-<li>CPUID: Added new CPU models Skylake-X, Cannonlake and Icelake-U
-<li>CPUID: Implemented side-channel attack prevention reporting and corresponding MSR registers, enabled for Icelake-U
-<li>Added basic support for the i440BX PCI/AGP chipset
-<li>Added basic Voodoo Banshee / Voodoo3 emulation support
-<li>Added basic DDC support for the VGA-compatible adapters
-<li>Implemented HPET emulation (ported from Qemu)
+<li>General
+ <ul>
+ <li>Added 64-bit support to the NSIS installer script
+ <li>Several fixes in the build system based on Debian patches
+ </ul>
+<li>CPU / CPUDB
+ <ul>
+ <li>Bugfixes for CPU emulation correctness
+ <li>Many critical bugfixes for Protection Keys, AVX512*, VMX/SVM, SHA, GFNI emulation
+ <li>! Implemented CET (Control Flow Enforcement Technology) emulation according to Intel SDM rev071
+ </ul>
+<li>I/O Devices
+ <ul>
+ <li>Added missing Cirrus SVGA bitblt feature "transparent color compare"
+ <li>Some fixes in HPET emulation (patch by Oleg)
+ <li>Fixed disk image lock mechanism in the USB MSD case
+ </ul>
+<li>BIOS / VGABIOS
+ <ul>
+ <li>LGPL'd VGABIOS updated to version 0.7b (Fixed VESA extension 'read EDID' for Bochs VBE and Cirrus)
+ <li>Updated SeaBIOS ROM image to current version 1.13.0
+ <li>Added SeaVGABIOS ROM image for the Cirrus adapter
+ <li>Bochs BIOS built to work with CPU level 5 again
+ </ul>
 </ul>
 
 <BR>
 
-<a href="https://svn.code.sf.net/p/bochs/code/tags/REL_2_6_10_FINAL/bochs/CHANGES">
-Details on what has changed since version 2.6.9
+<a href="https://svn.code.sf.net/p/bochs/code/tags/REL_2_6_11_FINAL/bochs/CHANGES">
+Details on what has changed since version 2.6.10
 </a>
 
  <BR><BR>
@@ -89,11 +88,10 @@
  <BR><font face="arial, helvetica" color="#1e029a" size="4"><b>Bochs Binary and Source Releases</b></font><BR><BR>
 The latest release of Bochs is available in these file formats :<BR>
 <ul>
-<li> Win32 + Win64 binary NSIS installer package (EXE)
-<li> Win32 binary with P4 CPU + SMP support (ZIP) - Bochs installation is required
+<li> Win64 binary NSIS installer package (EXE)
 <li> Linux binary RPM (64 bit)
 <li> Platform independant source package (TAR.GZ)
-<li> Win32 specific source package prepared for MSVC (ZIP)
+<li> Win32 specific source package prepared for VS2019 (ZIP)
 <li> Linux source RPM
 </ul>
 You can download any release since March 2001 on the 

Modified: trunk/sfsite/includes/header.txt
===================================================================
--- trunk/sfsite/includes/header.txt	2021-08-01 21:45:35 UTC (rev 14335)
+++ trunk/sfsite/includes/header.txt	2021-08-06 17:57:45 UTC (rev 14336)
@@ -27,7 +27,7 @@
 <BODY BGCOLOR="#FFFFFF" VLINK="#000000" ALINK="#000000" LINK="#000000" TOPMARGIN="0" LEFTMARGIN="0" MARGINWIDTH="0" MARGINHEIGHT="0">
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr><td width="140" bgcolor="#aacbff">&nbsp;</td><td bgcolor="#6d95d7" width="400"><font face="arial, helvetica" size="2" color="#1e029a"><center><b>T H E&nbsp;&nbsp;&nbsp;C R O S S&nbsp;&nbsp;&nbsp;P L A T F O R M&nbsp;&nbsp;&nbsp;I A - 3 2&nbsp;&nbsp;&nbsp;E M U L A T O R</b></center></font></td><td width="100%"><table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td bgcolor="#4079d6" width="50%">&nbsp;</td><td bgcolor="#1e029a" width="50%">&nbsp;</td></tr></table></td></tr>
-<tr><td width="140" bgcolor="#6d95d7"><font face="arial, helvetica"><center><b>Current Release:</b><BR><a href="<!--#include virtual="release.txt" -->" class="sidebar"><i><u>Bochs 2.6.11</u></i></a></font></center></td><td width="400" height="130"><img src="https://bochs.sourceforge.io/images/lgban.png" width="400" height="130" alt="bochs: think inside the bochs."></td><td>&nbsp;</td></tr>
+<tr><td width="140" bgcolor="#6d95d7"><font face="arial, helvetica"><center><b>Current Release:</b><BR><a href="<!--#include virtual="release.txt" -->" class="sidebar"><i><u>Bochs 2.7</u></i></a></font></center></td><td width="400" height="130"><img src="https://bochs.sourceforge.io/images/lgban.png" width="400" height="130" alt="bochs: think inside the bochs."></td><td>&nbsp;</td></tr>
 <tr><td colspan="3" bgcolor="#4079d6" height="1">
 <img src="https://bochs.sourceforge.io/images/smblue.png" width="1" height="1"></td></tr>
 <tr><td bgcolor="#4079d6" width="140" valign="top">

Revision: 14335
Author:   vruppert
Date:     2021-08-01 21:45:35 +0000 (Sun, 01 Aug 2021)
Log Message:
-----------
Regenerated configure script.

Modified Paths:
--------------
    trunk/bochs/configure

Modified: trunk/bochs/configure
===================================================================
(Binary files differ)

Revision: 14334
Author:   vruppert
Date:     2021-08-01 21:44:37 +0000 (Sun, 01 Aug 2021)
Log Message:
-----------
Updates after release.

Modified Paths:
--------------
    trunk/bochs/configure.in
    trunk/bochs/doc/docbook/user/user.dbk

Modified: trunk/bochs/configure.in
===================================================================
--- trunk/bochs/configure.in	2021-08-01 17:24:57 UTC (rev 14333)
+++ trunk/bochs/configure.in	2021-08-01 21:44:37 UTC (rev 14334)
@@ -14,8 +14,8 @@
 dnl // this should be > 90 for pre-release of next version otherwise revision level
 VER_REVISION=0
 dnl // this should be 0 for release and 1 for svn version
-VER_SVN=0
-REL_STRING="Built from SVN snapshot on August  1, 2021"
+VER_SVN=1
+REL_STRING="Built from SVN snapshot after release 2.7"
 REL_TIMESTAMP=`grep "Updated:" $srcdir/README | sed 's/Updated: //'`
 
 changequote(<<, >>)

Modified: trunk/bochs/doc/docbook/user/user.dbk
===================================================================
--- trunk/bochs/doc/docbook/user/user.dbk	2021-08-01 17:24:57 UTC (rev 14333)
+++ trunk/bochs/doc/docbook/user/user.dbk	2021-08-01 21:44:37 UTC (rev 14334)
@@ -1163,6 +1163,11 @@
     </thead>
     <tbody>
       <row>
+        <entry>2.7</entry>
+        <entry>REL_2_7_FINAL</entry>
+        <entry>14332</entry>
+      </row>
+      <row>
         <entry>2.6.11 (bugfix)</entry>
         <entry>REL_2_6_11_FINAL</entry>
         <entry>13774</entry>

Revision: 14333
Author:   vruppert
Date:     2021-08-01 17:24:57 +0000 (Sun, 01 Aug 2021)
Log Message:
-----------
Started website update after release.

Modified Paths:
--------------
    trunk/sfsite/includes/cright.txt
    trunk/sfsite/includes/header.txt
    trunk/sfsite/index.html
    trunk/sfsite/news.html

Modified: trunk/sfsite/includes/cright.txt
===================================================================
--- trunk/sfsite/includes/cright.txt	2021-08-01 08:16:55 UTC (rev 14332)
+++ trunk/sfsite/includes/cright.txt	2021-08-01 17:24:57 UTC (rev 14333)
@@ -1,2 +1,2 @@
-&copy; 2001-2020 The Bochs Project. See the project <a href="https://sourceforge.net/projects/bochs/files/stats/timeline">statistics</a> here.</font></td></tr>
+&copy; 2001-2021 The Bochs Project. See the project <a href="https://sourceforge.net/projects/bochs/files/stats/timeline">statistics</a> here.</font></td></tr>
 </table>

Modified: trunk/sfsite/includes/header.txt
===================================================================
--- trunk/sfsite/includes/header.txt	2021-08-01 08:16:55 UTC (rev 14332)
+++ trunk/sfsite/includes/header.txt	2021-08-01 17:24:57 UTC (rev 14333)
@@ -18,7 +18,7 @@
 <META NAME="resource-type" CONTENT="document">
 <META NAME="distribution" CONTENT="GLOBAL">
 <META NAME="description" CONTENT="Bochs IA-32 Emulator provides a virtual PC that can run operating systems such as Windows, Linux, and BSD.">
-<META NAME="copyright" CONTENT="Copyright 2001-2020 The Bochs Project.">
+<META NAME="copyright" CONTENT="Copyright 2001-2021 The Bochs Project.">
 <META NAME="keywords" CONTENT="pc emulation, vmware, win4lin, netraverse, trelos, x86 emulation, emulator,insignia, softpc, connectix, virtualpc, fx!32, freemware, plex86, dynamic translation,open source, gnu, linux, windows, bsd">
 <META NAME="Author" CONTENT="Timothy R. Butler">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html;CHARSET=iso-8859-1">

Modified: trunk/sfsite/index.html
===================================================================
--- trunk/sfsite/index.html	2021-08-01 08:16:55 UTC (rev 14332)
+++ trunk/sfsite/index.html	2021-08-01 17:24:57 UTC (rev 14333)
@@ -29,20 +29,13 @@
 <tr>
 <td> <img src="images/bochs2_7.png" alt="Bochs 2.7"></td>
 <td>
-<font face="arial, helvetica" color="#1e029a" size="4"><b>Bochs 2.7 is coming soon !</b></font><BR>
-The first pre-release of the new Bochs version is now available. You can download
-it from the <a href="https://sourceforge.net/projects/bochs/files/bochs/2.7.pre1">Bochs project page on SourceForge</a>.
-See the <a href="https://svn.code.sf.net/p/bochs/code/tags/REL_2_7_pre1_FINAL/bochs/CHANGES">
+<font face="arial, helvetica" color="#1e029a" size="4"><b>Bochs 2.7 released on August 1, 2021 !</b></font><BR>
+The final release of the new Bochs version is now available. You can download
+it from the <a href="https://sourceforge.net/projects/bochs/files/bochs/2.7">Bochs project page on SourceForge</a>.
+See the <a href="https://svn.code.sf.net/p/bochs/code/tags/REL_2_7_FINAL/bochs/CHANGES">
 CHANGES</a> file for details on what has changed since release 2.6.11<BR>
 </td></tr></table><hr>
 
-<font face="arial, helvetica" color="#1e029a" size="4"><b>Bochs 2.6.11 released on January 5, 2020 !</b></font><BR>
-New Bochs 2.6.11 release is now available. You can download it from the
-<a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.11/">SourceForge project page</a>.<BR>
-See the <a href="https://svn.code.sf.net/p/bochs/code/tags/REL_2_6_11_FINAL/bochs/CHANGES">
-CHANGES</a> file for details on what has changed since release 2.6.10<BR>
-<hr>
-
 <BR><BR>
 <font face="arial, helvetica" color="#1e029a" size="4"><b>Bochs IRC Chat Transcripts</b></font><BR>
 The Bochs community held an IRC open discussion chat on Sunday, February 1, 2004.
@@ -85,6 +78,7 @@
 <BR><BR>
 <font face="arial, helvetica" color="#1e029a" size="4"><b>Older News</b></font><BR>
 <ul>
+  <li><b>January 5, 2020:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.11/">Bochs 2.6.11</a> is now available.
   <li><b>December 1, 2019:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.10/">Bochs 2.6.10</a> is now available.
   <li><b>April 9, 2017:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.9/">Bochs 2.6.9</a> is now available.
   <li><b>May 3, 2015:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.8/">Bochs 2.6.8</a> is now available.
@@ -95,8 +89,7 @@
   <li><b>April 7, 2013:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.1/">Bochs 2.6.1</a> is now available.
   <li><b>September 2, 2012:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6/">Bochs 2.6</a> is now available.
   <li><b>January 6, 2012:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.5.1/">Bochs 2.5.1</a> is now available.
-  <li><b>November 27, 2011:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.5/">Bochs 2.5</a> is now available.
-  <li><b>February 23, 2011:</b> Bochs project moved to Subversion source control. Bochs 2.4.6 is the last release available from CVS !
+  <li><b>November 27, 2011:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.5/">Bochs 2.5</a> is now available (first release from SVN).
 </ul>
 <BR><BR>
 <a href="news.html"><i>More News...</i></a>

Modified: trunk/sfsite/news.html
===================================================================
--- trunk/sfsite/news.html	2021-08-01 08:16:55 UTC (rev 14332)
+++ trunk/sfsite/news.html	2021-08-01 17:24:57 UTC (rev 14333)
@@ -8,6 +8,7 @@
  <BR><font face="arial, helvetica" color="#1e029a" size="4"><b>Bochs News</b></font><BR>
 
   <UL>
+  <li><b>January 5, 2020:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.11/">Bochs 2.6.11</a> is now available.
   <li><b>December 1, 2019:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.10/">Bochs 2.6.10</a> is now available.
   <li><b>April 9, 2017:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.9/">Bochs 2.6.9</a> is now available.
   <li><b>May 3, 2015:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.7/">Bochs 2.6.8</a> is now available.
@@ -18,8 +19,8 @@
   <li><b>April 7, 2013:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6.1/">Bochs 2.6.1</a> is now available.
   <li><b>September 2, 2012:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.6/">Bochs 2.6</a> is now available.
   <li><b>January 6, 2012:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.5.1/">Bochs 2.5.1</a> is now available.
-  <li><b>November 27, 2011:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.5/">Bochs 2.5</a> is now available.
-  <li><b>February 23, 2011:</b> Bochs project moved to Subversion source control. Bochs 2.4.6 is the last release available from CVS !
+  <li><b>November 27, 2011:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.5/">Bochs 2.5</a> is now available (first release from SVN).
+  <li><b>February 23, 2011:</b> Bochs project moved to Subversion (SVN) source control.
   <li><b>February 22, 2011:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.4.6/">Bochs 2.4.6</a> is now available.
   <li><b>April, 2010:</b> After long time Bochs is back to top 25 of SourceForce projects !
   <li><b>April 25, 2010:</b> <a href="https://sourceforge.net/projects/bochs/files/bochs/2.4.5/">Bochs 2.4.5</a> is now available.

Revision: 14332
Author:   vruppert
Date:     2021-08-01 08:16:55 +0000 (Sun, 01 Aug 2021)
Log Message:
-----------
Created release tag for version 2.7.

Added Paths:
-----------
    tags/REL_2_7_FINAL/
    tags/REL_2_7_FINAL/bochs/

Revision: 14331
Author:   vruppert
Date:     2021-08-01 08:12:28 +0000 (Sun, 01 Aug 2021)
Log Message:
-----------
Regenerated configure script and recompiled BIOS images for release.

Modified Paths:
--------------
    trunk/bochs/bios/BIOS-bochs-latest
    trunk/bochs/bios/BIOS-bochs-legacy
    trunk/bochs/configure

Modified: trunk/bochs/bios/BIOS-bochs-latest
===================================================================
(Binary files differ)

Modified: trunk/bochs/bios/BIOS-bochs-legacy
===================================================================
(Binary files differ)

Modified: trunk/bochs/configure
===================================================================
(Binary files differ)

Revision: 14330
Author:   vruppert
Date:     2021-08-01 08:07:38 +0000 (Sun, 01 Aug 2021)
Log Message:
-----------
Preparing final release 2.7.

Modified Paths:
--------------
    trunk/bochs/CHANGES
    trunk/bochs/README
    trunk/bochs/build/win32/bochs.manifest
    trunk/bochs/configure.in

Modified: trunk/bochs/CHANGES
===================================================================
--- trunk/bochs/CHANGES	2021-08-01 07:40:18 UTC (rev 14329)
+++ trunk/bochs/CHANGES	2021-08-01 08:07:38 UTC (rev 14330)
@@ -1,8 +1,9 @@
 -------------------------------------------------------------------------
-Changes in 2.7 (Not yet released):
+Changes in 2.7 (August 1, 2021):
 
 Brief summary :
-  - Bugfixes for CPU emulation correctness (CPUID/VMX/SVM fixes to support Windows Hyper-V as guest in Bochs)
+  - Bugfixes for CPU emulation correctness (CPUID/VMX/SVM fixes to support
+    Windows Hyper-V as guest in Bochs)
   - Improvements for the plugin handling to simplify Bochs extensions
   - Added "multiple NICs" support to the NE2000 and E1000 devices
   - Added experimental FTP service for networking modules 'vnet' and 'socket'

Modified: trunk/bochs/README
===================================================================
--- trunk/bochs/README	2021-08-01 07:40:18 UTC (rev 14329)
+++ trunk/bochs/README	2021-08-01 08:07:38 UTC (rev 14330)
@@ -1,6 +1,6 @@
 Bochs - The cross platform IA-32 (x86) emulator
-Updated: Sun Jun 13 07:15:00 CEST 2021
-Version: 2.7.pre1
+Updated: Sun Aug  1 10:07:00 CEST 2021
+Version: 2.7
 
 WHAT IS BOCHS?
 
@@ -81,7 +81,9 @@
 
 CHANGES
 
-Brief summary of changes in 2.7.pre1:
+Brief summary of changes in 2.7:
+  - Bugfixes for CPU emulation correctness (CPUID/VMX/SVM fixes to support
+    Windows Hyper-V as guest in Bochs)
   - Improvements for the plugin handling to simplify Bochs extensions
   - Added "multiple NICs" support to the NE2000 and E1000 devices
   - Added experimental FTP service for networking modules 'vnet' and 'socket'

Modified: trunk/bochs/build/win32/bochs.manifest
===================================================================
--- trunk/bochs/build/win32/bochs.manifest	2021-08-01 07:40:18 UTC (rev 14329)
+++ trunk/bochs/build/win32/bochs.manifest	2021-08-01 08:07:38 UTC (rev 14330)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
-    version="2.6.91.0"
+    version="2.7.0.0"
     processorArchitecture="*"
     name="Bochs.Bochs.Bochs"
     type="win32"

Modified: trunk/bochs/configure.in
===================================================================
--- trunk/bochs/configure.in	2021-08-01 07:40:18 UTC (rev 14329)
+++ trunk/bochs/configure.in	2021-08-01 08:07:38 UTC (rev 14330)
@@ -8,14 +8,14 @@
 
 dnl // Put Bochs version information right here so that it gets substituted
 dnl // into all the right places.
-VERSION="2.7.pre1.svn"
+VERSION="2.7"
 VER_MAJOR=2
-VER_MINOR=6
+VER_MINOR=7
 dnl // this should be > 90 for pre-release of next version otherwise revision level
-VER_REVISION=91
+VER_REVISION=0
 dnl // this should be 0 for release and 1 for svn version
-VER_SVN=1
-REL_STRING="Built from SVN snapshot after release 2.7.pre1"
+VER_SVN=0
+REL_STRING="Built from SVN snapshot on August  1, 2021"
 REL_TIMESTAMP=`grep "Updated:" $srcdir/README | sed 's/Updated: //'`
 
 changequote(<<, >>)

Revision: 14329
Author:   vruppert
Date:     2021-08-01 07:40:18 +0000 (Sun, 01 Aug 2021)
Log Message:
-----------
Fixed two external links.

Modified Paths:
--------------
    trunk/bochs/doc/docbook/user/user.dbk

Modified: trunk/bochs/doc/docbook/user/user.dbk
===================================================================
--- trunk/bochs/doc/docbook/user/user.dbk	2021-07-27 19:18:34 UTC (rev 14328)
+++ trunk/bochs/doc/docbook/user/user.dbk	2021-08-01 07:40:18 UTC (rev 14329)
@@ -8823,9 +8823,9 @@
 critical sizes, it
 became necessary to translate the CHS geometry (cylinders, heads, sectors per track)
 between the BIOS (int 13h) and the ATA interface. Please refer to the
-<ulink url="http://burks.brighton.ac.uk/burks/pcinfo/hardware/atafaq/atafq.htm">ATA-FAQ</ulink>
+<ulink url="https://web.archive.org/web/20090428202027/http://burks.brighton.ac.uk/burks/pcinfo/hardware/atafaq/atafq.htm">ATA-FAQ</ulink>
 and
-<ulink url="http://www.ata-atapi.com/hiwchs.htm">Hale Landis' document</ulink>
+<ulink url="https://web.archive.org/web/20080412092242/http://www.ata-atapi.com/hiwchs.htm">Hale Landis' document</ulink>
 for a complete discussion of the problem.
         </para>
         <para>

Revision: 14328
Author:   vruppert
Date:     2021-07-27 19:18:34 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
Fixed some MSVC warnings in the cpu code (unsafe use of bool type).

Modified Paths:
--------------
    trunk/bochs/cpu/paging.cc

Modified: trunk/bochs/cpu/paging.cc
===================================================================
--- trunk/bochs/cpu/paging.cc	2021-07-27 18:13:26 UTC (rev 14327)
+++ trunk/bochs/cpu/paging.cc	2021-07-27 19:18:34 UTC (rev 14328)
@@ -2,7 +2,7 @@
 // $Id$
 /////////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2001-2019  The Bochs Project
+//  Copyright (C) 2001-2021  The Bochs Project
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -824,7 +824,7 @@
 
     unsigned priv_index = (BX_CPU_THIS_PTR cr0.get_WP() << 4) | // bit 4
                           (user<<3) |                           // bit 3
-                          (combined_access | isWrite);          // bit 2,1,0
+                          (combined_access | (unsigned)isWrite);// bit 2,1,0
 
     if (!priv_check[priv_index] || nx_fault)
       page_fault(ERROR_PROTECTION, laddr, user, rw);
@@ -1071,7 +1071,7 @@
 
     unsigned priv_index = (BX_CPU_THIS_PTR cr0.get_WP() << 4) | // bit 4
                           (user<<3) |                           // bit 3
-                          (combined_access | isWrite);          // bit 2,1,0
+                          (combined_access | (unsigned)isWrite);// bit 2,1,0
 
     if (!priv_check[priv_index] || nx_fault)
       page_fault(ERROR_PROTECTION, laddr, user, rw);
@@ -1221,7 +1221,7 @@
         (BX_CPU_THIS_PTR cr0.get_WP() << 4) |   // bit 4
 #endif
         (user<<3) |                             // bit 3
-        (combined_access | isWrite);            // bit 2,1,0
+        (combined_access | (unsigned)isWrite);  // bit 2,1,0
 
     if (!priv_check[priv_index])
       page_fault(ERROR_PROTECTION, laddr, user, rw);

Revision: 14327
Author:   vruppert
Date:     2021-07-27 18:13:26 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
Trailing '../\' breaks compilation with MSVC nmake. Regenerated dependencies.

Modified Paths:
--------------
    trunk/bochs/iodev/display/Makefile.in
    trunk/bochs/iodev/hdimage/Makefile.in
    trunk/bochs/iodev/network/Makefile.in
    trunk/bochs/iodev/sound/Makefile.in
    trunk/bochs/iodev/usb/Makefile.in

Modified: trunk/bochs/iodev/display/Makefile.in
===================================================================
--- trunk/bochs/iodev/display/Makefile.in	2021-07-27 15:36:11 UTC (rev 14326)
+++ trunk/bochs/iodev/display/Makefile.in	2021-07-27 18:13:26 UTC (rev 14327)
@@ -135,7 +135,7 @@
 # building plugins.
 ###########################################
 banshee.o: banshee.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -143,11 +143,10 @@
  ../pci.h vgacore.h ddc.h voodoo.h ../virt_timer.h ../../bxthread.h \
  bitblt.h voodoo_types.h voodoo_data.h voodoo_main.h
 ddc.o: ddc.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h \
- ../../gui/siminterface.h ddc.h ../../param_names.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../gui/siminterface.h ddc.h ../../param_names.h
 svga_cirrus.o: svga_cirrus.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -154,14 +153,13 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  vgacore.h bitblt.h ddc.h svga_cirrus.h ../virt_timer.h
 vga.o: vga.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  vgacore.h ddc.h vga.h ../virt_timer.h
 vgacore.o: vgacore.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -168,15 +166,14 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  vgacore.h ../virt_timer.h
 voodoo.o: voodoo.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h vgacore.h ddc.h voodoo.h ../virt_timer.h ../../bxthread.h \
  bitblt.h voodoo_types.h voodoo_data.h voodoo_main.h voodoo_func.h
 banshee.lo: banshee.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -184,11 +181,10 @@
  ../pci.h vgacore.h ddc.h voodoo.h ../virt_timer.h ../../bxthread.h \
  bitblt.h voodoo_types.h voodoo_data.h voodoo_main.h
 ddc.lo: ddc.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h \
- ../../gui/siminterface.h ddc.h ../../param_names.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../gui/siminterface.h ddc.h ../../param_names.h
 svga_cirrus.lo: svga_cirrus.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -195,14 +191,13 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  vgacore.h bitblt.h ddc.h svga_cirrus.h ../virt_timer.h
 vga.lo: vga.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  vgacore.h ddc.h vga.h ../virt_timer.h
 vgacore.lo: vgacore.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -209,10 +204,9 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  vgacore.h ../virt_timer.h
 voodoo.lo: voodoo.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h vgacore.h ddc.h voodoo.h ../virt_timer.h ../../bxthread.h \
  bitblt.h voodoo_types.h voodoo_data.h voodoo_main.h voodoo_func.h

Modified: trunk/bochs/iodev/hdimage/Makefile.in
===================================================================
--- trunk/bochs/iodev/hdimage/Makefile.in	2021-07-27 15:36:11 UTC (rev 14326)
+++ trunk/bochs/iodev/hdimage/Makefile.in	2021-07-27 18:13:26 UTC (rev 14327)
@@ -131,94 +131,76 @@
 # building plugins.
 ###########################################
 cdrom_amigaos.o: cdrom_amigaos.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h scsi_commands.h \
  cdrom.h cdrom_amigaos.h
 cdrom.o: cdrom.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h cdrom.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h cdrom.h
 cdrom_misc.o: cdrom_misc.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h cdrom.h \
- cdrom_misc.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h cdrom.h cdrom_misc.h
 cdrom_osx.o: cdrom_osx.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h cdrom.h \
- cdrom_osx.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h cdrom.h cdrom_osx.h
 cdrom_win32.o: cdrom_win32.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h cdrom.h \
- cdrom_win32.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h cdrom.h cdrom_win32.h
 hdimage.o: hdimage.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h \
- ../../gui/siminterface.h ../../gui/paramtree.h ../../param_names.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../gui/siminterface.h ../../param_names.h \
  ../../plugin.h ../../extplugin.h cdrom.h cdrom_amigaos.h cdrom_misc.h \
  cdrom_osx.h cdrom_win32.h hdimage.h
 vbox.o: vbox.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h hdimage.h vbox.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h hdimage.h vbox.h
 vmware3.o: vmware3.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h hdimage.h vmware3.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h hdimage.h vmware3.h
 vmware4.o: vmware4.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h hdimage.h vmware4.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h hdimage.h vmware4.h
 vpc.o: vpc.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h hdimage.h vpc.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h hdimage.h vpc.h
 vvfat.o: vvfat.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../gui/siminterface.h ../../gui/paramtree.h \
- hdimage.h vvfat.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h \
+ ../../gui/siminterface.h hdimage.h vvfat.h
 cdrom_amigaos.lo: cdrom_amigaos.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h scsi_commands.h \
  cdrom.h cdrom_amigaos.h
 cdrom.lo: cdrom.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h cdrom.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h cdrom.h
 cdrom_misc.lo: cdrom_misc.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h cdrom.h \
- cdrom_misc.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h cdrom.h cdrom_misc.h
 cdrom_osx.lo: cdrom_osx.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h cdrom.h \
- cdrom_osx.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h cdrom.h cdrom_osx.h
 cdrom_win32.lo: cdrom_win32.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h cdrom.h \
- cdrom_win32.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h cdrom.h cdrom_win32.h
 hdimage.lo: hdimage.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h \
- ../../gui/siminterface.h ../../gui/paramtree.h ../../param_names.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../gui/siminterface.h ../../param_names.h \
  ../../plugin.h ../../extplugin.h cdrom.h cdrom_amigaos.h cdrom_misc.h \
  cdrom_osx.h cdrom_win32.h hdimage.h
 vbox.lo: vbox.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h hdimage.h vbox.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h hdimage.h vbox.h
 vmware3.lo: vmware3.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h hdimage.h vmware3.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h hdimage.h vmware3.h
 vmware4.lo: vmware4.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h hdimage.h vmware4.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h hdimage.h vmware4.h
 vpc.lo: vpc.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h hdimage.h vpc.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h hdimage.h vpc.h
 vvfat.lo: vvfat.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../gui/siminterface.h ../../gui/paramtree.h \
- hdimage.h vvfat.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h \
+ ../../gui/siminterface.h hdimage.h vvfat.h

Modified: trunk/bochs/iodev/network/Makefile.in
===================================================================
--- trunk/bochs/iodev/network/Makefile.in	2021-07-27 15:36:11 UTC (rev 14326)
+++ trunk/bochs/iodev/network/Makefile.in	2021-07-27 18:13:26 UTC (rev 14327)
@@ -174,74 +174,70 @@
 # building plugins.
 ###########################################
 e1000.o: e1000.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h netmod.h e1000.h
 eth_fbsd.o: eth_fbsd.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_linux.o: eth_linux.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_null.o: eth_null.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_slirp.o: eth_slirp.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h slirp/slirp.h \
- ../../config.h slirp/slirp_config.h slirp/debug.h slirp/libslirp.h \
- slirp/compat.h ../../qemu-queue.h slirp/ip.h slirp/tcp.h slirp/tcp_var.h \
- slirp/tcpip.h slirp/tcp_timer.h slirp/udp.h slirp/ip_icmp.h slirp/mbuf.h \
- slirp/sbuf.h slirp/socket.h slirp/if.h slirp/main.h slirp/misc.h \
- slirp/bootp.h slirp/tftp.h slirp/libslirp.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h slirp/slirp.h ../../config.h slirp/slirp_config.h slirp/debug.h \
+ slirp/libslirp.h slirp/compat.h ../../qemu-queue.h slirp/ip.h \
+ slirp/tcp.h slirp/tcp_var.h slirp/tcpip.h slirp/tcp_timer.h slirp/udp.h \
+ slirp/ip_icmp.h slirp/mbuf.h slirp/sbuf.h slirp/socket.h slirp/if.h \
+ slirp/main.h slirp/misc.h slirp/bootp.h slirp/tftp.h slirp/libslirp.h
 eth_socket.o: eth_socket.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_tap.o: eth_tap.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_tuntap.o: eth_tuntap.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_vde.o: eth_vde.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_vnet.o: eth_vnet.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h netutil.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h netutil.h
 eth_win32.o: eth_win32.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 ne2k.o: ne2k.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h ne2k.h netmod.h
 netmod.o: netmod.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../gui/siminterface.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h \
+ ../../gui/siminterface.h netmod.h
 netutil.o: netutil.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../pc_system.h \
- netmod.h netutil.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../pc_system.h netmod.h netutil.h
 pcipnic.o: pcipnic.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -280,11 +276,10 @@
  slirp/udp.h slirp/ip_icmp.h slirp/mbuf.h slirp/sbuf.h slirp/socket.h \
  slirp/if.h slirp/main.h slirp/misc.h slirp/bootp.h slirp/tftp.h \
  ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../osdep.h ../../memory/memory-bochs.h \
- ../../gui/siminterface.h ../../gui/gui.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../osdep.h \
+ ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h
 slirp/ip_icmp.o: slirp/ip_icmp.@CPP_SUFFIX@ slirp/slirp.h ../../config.h \
  slirp/slirp_config.h slirp/debug.h slirp/libslirp.h slirp/compat.h \
  ../../qemu-queue.h slirp/ip.h slirp/tcp.h slirp/tcp_var.h slirp/tcpip.h \
@@ -324,11 +319,10 @@
  slirp/udp.h slirp/ip_icmp.h slirp/mbuf.h slirp/sbuf.h slirp/socket.h \
  slirp/if.h slirp/main.h slirp/misc.h slirp/bootp.h slirp/tftp.h \
  ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../osdep.h ../../memory/memory-bochs.h \
- ../../gui/siminterface.h ../../gui/gui.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../osdep.h \
+ ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h
 slirp/socket.o: slirp/socket.@CPP_SUFFIX@ slirp/slirp.h ../../config.h \
  slirp/slirp_config.h slirp/debug.h slirp/libslirp.h slirp/compat.h \
  ../../qemu-queue.h slirp/ip.h slirp/tcp.h slirp/tcp_var.h slirp/tcpip.h \
@@ -370,74 +364,70 @@
  slirp/udp.h slirp/ip_icmp.h slirp/mbuf.h slirp/sbuf.h slirp/socket.h \
  slirp/if.h slirp/main.h slirp/misc.h slirp/bootp.h slirp/tftp.h
 e1000.lo: e1000.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h netmod.h e1000.h
 eth_fbsd.lo: eth_fbsd.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_linux.lo: eth_linux.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_null.lo: eth_null.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_slirp.lo: eth_slirp.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h slirp/slirp.h \
- ../../config.h slirp/slirp_config.h slirp/debug.h slirp/libslirp.h \
- slirp/compat.h ../../qemu-queue.h slirp/ip.h slirp/tcp.h slirp/tcp_var.h \
- slirp/tcpip.h slirp/tcp_timer.h slirp/udp.h slirp/ip_icmp.h slirp/mbuf.h \
- slirp/sbuf.h slirp/socket.h slirp/if.h slirp/main.h slirp/misc.h \
- slirp/bootp.h slirp/tftp.h slirp/libslirp.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h slirp/slirp.h ../../config.h slirp/slirp_config.h slirp/debug.h \
+ slirp/libslirp.h slirp/compat.h ../../qemu-queue.h slirp/ip.h \
+ slirp/tcp.h slirp/tcp_var.h slirp/tcpip.h slirp/tcp_timer.h slirp/udp.h \
+ slirp/ip_icmp.h slirp/mbuf.h slirp/sbuf.h slirp/socket.h slirp/if.h \
+ slirp/main.h slirp/misc.h slirp/bootp.h slirp/tftp.h slirp/libslirp.h
 eth_socket.lo: eth_socket.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_tap.lo: eth_tap.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_tuntap.lo: eth_tuntap.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_vde.lo: eth_vde.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 eth_vnet.lo: eth_vnet.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h netutil.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h netutil.h
 eth_win32.lo: eth_win32.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ netmod.h
 ne2k.lo: ne2k.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h ne2k.h netmod.h
 netmod.lo: netmod.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../gui/siminterface.h netmod.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h \
+ ../../gui/siminterface.h netmod.h
 netutil.lo: netutil.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../pc_system.h \
- netmod.h netutil.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../pc_system.h netmod.h netutil.h
 pcipnic.lo: pcipnic.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -476,11 +466,10 @@
  slirp/udp.h slirp/ip_icmp.h slirp/mbuf.h slirp/sbuf.h slirp/socket.h \
  slirp/if.h slirp/main.h slirp/misc.h slirp/bootp.h slirp/tftp.h \
  ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../osdep.h ../../memory/memory-bochs.h \
- ../../gui/siminterface.h ../../gui/gui.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../osdep.h \
+ ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h
 slirp/ip_icmp.lo: slirp/ip_icmp.@CPP_SUFFIX@ slirp/slirp.h ../../config.h \
  slirp/slirp_config.h slirp/debug.h slirp/libslirp.h slirp/compat.h \
  ../../qemu-queue.h slirp/ip.h slirp/tcp.h slirp/tcp_var.h slirp/tcpip.h \
@@ -520,11 +509,10 @@
  slirp/udp.h slirp/ip_icmp.h slirp/mbuf.h slirp/sbuf.h slirp/socket.h \
  slirp/if.h slirp/main.h slirp/misc.h slirp/bootp.h slirp/tftp.h \
  ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../osdep.h ../../memory/memory-bochs.h \
- ../../gui/siminterface.h ../../gui/gui.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../osdep.h \
+ ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h
 slirp/socket.lo: slirp/socket.@CPP_SUFFIX@ slirp/slirp.h ../../config.h \
  slirp/slirp_config.h slirp/debug.h slirp/libslirp.h slirp/compat.h \
  ../../qemu-queue.h slirp/ip.h slirp/tcp.h slirp/tcp_var.h slirp/tcpip.h \

Modified: trunk/bochs/iodev/sound/Makefile.in
===================================================================
--- trunk/bochs/iodev/sound/Makefile.in	2021-07-27 15:36:11 UTC (rev 14326)
+++ trunk/bochs/iodev/sound/Makefile.in	2021-07-27 18:13:26 UTC (rev 14327)
@@ -146,126 +146,112 @@
 # building plugins.
 ###########################################
 es1370.o: es1370.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  soundlow.h ../../bxthread.h soundmod.h ../pci.h es1370.h
 opl.o: opl.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  opl.h
 sb16.o: sb16.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  soundlow.h ../../bxthread.h soundmod.h sb16.h opl.h
 soundalsa.o: soundalsa.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h \
- soundmod.h soundalsa.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h soundmod.h soundalsa.h
 sounddummy.o: sounddummy.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h soundlow.h ../../bxthread.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h soundlow.h \
+ ../../bxthread.h
 soundfile.o: soundfile.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h soundlow.h ../../bxthread.h soundmod.h soundfile.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h soundlow.h \
+ ../../bxthread.h soundmod.h soundfile.h
 soundlow.o: soundlow.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h
 soundmod.o: soundmod.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../gui/siminterface.h ../../param_names.h \
- soundmod.h soundlow.h ../../bxthread.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h \
+ ../../gui/siminterface.h ../../param_names.h soundmod.h soundlow.h \
+ ../../bxthread.h
 soundoss.o: soundoss.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h \
- soundmod.h soundoss.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h soundmod.h soundoss.h
 soundosx.o: soundosx.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h soundlow.h ../../bxthread.h soundmod.h soundosx.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h soundlow.h \
+ ../../bxthread.h soundmod.h soundosx.h
 soundsdl.o: soundsdl.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h \
- soundmod.h soundsdl.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h soundmod.h soundsdl.h
 soundwin.o: soundwin.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h \
- soundmod.h soundwin.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h soundmod.h soundwin.h
 es1370.lo: es1370.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  soundlow.h ../../bxthread.h soundmod.h ../pci.h es1370.h
 opl.lo: opl.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  opl.h
 sb16.lo: sb16.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../param_names.h ../../pc_system.h \
- ../../bx_debug/debug.h ../../config.h ../../osdep.h \
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../param_names.h \
+ ../../pc_system.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  soundlow.h ../../bxthread.h soundmod.h sb16.h opl.h
 soundalsa.lo: soundalsa.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h \
- soundmod.h soundalsa.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h soundmod.h soundalsa.h
 sounddummy.lo: sounddummy.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h soundlow.h ../../bxthread.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h soundlow.h \
+ ../../bxthread.h
 soundfile.lo: soundfile.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h soundlow.h ../../bxthread.h soundmod.h soundfile.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h soundlow.h \
+ ../../bxthread.h soundmod.h soundfile.h
 soundlow.lo: soundlow.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h
 soundmod.lo: soundmod.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../gui/siminterface.h ../../param_names.h \
- soundmod.h soundlow.h ../../bxthread.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h \
+ ../../gui/siminterface.h ../../param_names.h soundmod.h soundlow.h \
+ ../../bxthread.h
 soundoss.lo: soundoss.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h \
- soundmod.h soundoss.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h soundmod.h soundoss.h
 soundosx.lo: soundosx.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h soundlow.h ../../bxthread.h soundmod.h soundosx.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h soundlow.h \
+ ../../bxthread.h soundmod.h soundosx.h
 soundsdl.lo: soundsdl.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h \
- soundmod.h soundsdl.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h soundmod.h soundsdl.h
 soundwin.lo: soundwin.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
- ../../gui/paramtree.h ../../logio.h ../\
- ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
- ../../extplugin.h ../../pc_system.h soundlow.h ../../bxthread.h \
- soundmod.h soundwin.h
+ ../../gui/paramtree.h ../../logio.h ../../instrument/stubs/instrument.h \
+ ../../misc/bswap.h ../../plugin.h ../../extplugin.h ../../pc_system.h \
+ soundlow.h ../../bxthread.h soundmod.h soundwin.h

Modified: trunk/bochs/iodev/usb/Makefile.in
===================================================================
--- trunk/bochs/iodev/usb/Makefile.in	2021-07-27 15:36:11 UTC (rev 14326)
+++ trunk/bochs/iodev/usb/Makefile.in	2021-07-27 18:13:26 UTC (rev 14327)
@@ -158,7 +158,7 @@
 # building plugins.
 ###########################################
 scsi_device.o: scsi_device.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -165,7 +165,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../hdimage/hdimage.h ../hdimage/cdrom.h scsi_device.h
 uhci_core.o: uhci_core.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -172,7 +172,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h usb_common.h usb_pcap.h uhci_core.h
 usb_common.o: usb_common.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -179,7 +179,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_pcap.h usb_common.h
 usb_ehci.o: usb_ehci.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -187,7 +187,7 @@
  ../pci.h usb_common.h usb_pcap.h uhci_core.h ../../qemu-queue.h \
  usb_ehci.h
 usb_floppy.o: usb_floppy.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -194,7 +194,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_common.h usb_pcap.h ../hdimage/hdimage.h usb_floppy.h
 usb_hid.o: usb_hid.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -201,7 +201,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_common.h usb_pcap.h usb_hid.h
 usb_hub.o: usb_hub.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -208,7 +208,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_common.h usb_pcap.h usb_hub.h
 usb_msd.o: usb_msd.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -216,7 +216,7 @@
  usb_common.h usb_pcap.h ../hdimage/cdrom.h ../hdimage/hdimage.h \
  scsi_device.h usb_msd.h
 usb_ohci.o: usb_ohci.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -223,7 +223,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h usb_common.h usb_pcap.h usb_ohci.h
 usb_pcap.o: usb_pcap.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -230,7 +230,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_pcap.h usb_common.h
 usb_printer.o: usb_printer.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -237,7 +237,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_common.h usb_pcap.h usb_printer.h
 usb_uhci.o: usb_uhci.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -244,7 +244,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h usb_common.h usb_pcap.h uhci_core.h usb_uhci.h
 usb_xhci.o: usb_xhci.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -251,7 +251,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h usb_common.h usb_pcap.h usb_xhci.h
 scsi_device.lo: scsi_device.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -258,7 +258,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../hdimage/hdimage.h ../hdimage/cdrom.h scsi_device.h
 uhci_core.lo: uhci_core.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -265,7 +265,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h usb_common.h usb_pcap.h uhci_core.h
 usb_common.lo: usb_common.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -272,7 +272,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_pcap.h usb_common.h
 usb_ehci.lo: usb_ehci.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -280,7 +280,7 @@
  ../pci.h usb_common.h usb_pcap.h uhci_core.h ../../qemu-queue.h \
  usb_ehci.h
 usb_floppy.lo: usb_floppy.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -287,7 +287,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_common.h usb_pcap.h ../hdimage/hdimage.h usb_floppy.h
 usb_hid.lo: usb_hid.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -294,7 +294,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_common.h usb_pcap.h usb_hid.h
 usb_hub.lo: usb_hub.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -301,7 +301,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_common.h usb_pcap.h usb_hub.h
 usb_msd.lo: usb_msd.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -309,7 +309,7 @@
  usb_common.h usb_pcap.h ../hdimage/cdrom.h ../hdimage/hdimage.h \
  scsi_device.h usb_msd.h
 usb_ohci.lo: usb_ohci.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -316,7 +316,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  ../pci.h usb_common.h usb_pcap.h usb_ohci.h
 usb_pcap.lo: usb_pcap.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -323,7 +323,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_pcap.h usb_common.h
 usb_printer.lo: usb_printer.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
@@ -330,7 +330,7 @@
  ../../memory/memory-bochs.h ../../gui/siminterface.h ../../gui/gui.h \
  usb_common.h usb_pcap.h usb_printer.h
 usb_uhci.lo: usb_uhci.@CPP_SUFFIX@ ../iodev.h ../../bochs.h ../../config.h \
- ../../osdep.h ../../gui/paramtree.h ../../logio.h ../\
+ ../../osdep.h ../../gui/paramtree.h ../../logio.h \
  ../../instrument/stubs/instrument.h ../../misc/bswap.h ../../plugin.h \
  ../../extplugin.h ../../param_names.h ../../pc_system.h \
  ../../bx_debug/debug.h ../../con...
 
[truncated message content]

Revision: 14326
Author:   vruppert
Date:     2021-07-27 15:36:11 +0000 (Tue, 27 Jul 2021)
Log Message:
-----------
Fixed two compiler warnings in the cpu code.

Modified Paths:
--------------
    trunk/bochs/cpu/xsave.cc

Modified: trunk/bochs/cpu/xsave.cc
===================================================================
--- trunk/bochs/cpu/xsave.cc	2021-07-25 18:21:41 UTC (rev 14325)
+++ trunk/bochs/cpu/xsave.cc	2021-07-27 15:36:11 UTC (rev 14326)
@@ -154,7 +154,7 @@
 #endif
   }
 
-  BX_DEBUG(("%s: save processor state XCR0=0x%08x XSS=%08x", i->getIaOpcodeNameShort(), BX_CPU_THIS_PTR xcr0.get32(), BX_CPU_THIS_PTR msr.ia32_xss));
+  BX_DEBUG(("%s: save processor state XCR0=0x%08x XSS=" FMT_LL "x", i->getIaOpcodeNameShort(), BX_CPU_THIS_PTR xcr0.get32(), BX_CPU_THIS_PTR msr.ia32_xss));
 
   bx_address eaddr = BX_CPU_RESOLVE_ADDR(i);
   bx_address laddr = get_laddr(i->seg(), eaddr);
@@ -257,7 +257,7 @@
 #endif
   }
 
-  BX_DEBUG(("%s: restore processor state XCR0=0x%08x XSS=%08x", i->getIaOpcodeNameShort(), BX_CPU_THIS_PTR xcr0.get32(), BX_CPU_THIS_PTR msr.ia32_xss));
+  BX_DEBUG(("%s: restore processor state XCR0=0x%08x XSS=" FMT_LL "x", i->getIaOpcodeNameShort(), BX_CPU_THIS_PTR xcr0.get32(), BX_CPU_THIS_PTR msr.ia32_xss));
 
   bx_address eaddr = BX_CPU_RESOLVE_ADDR(i);
   bx_address laddr = get_laddr(i->seg(), eaddr);

Revision: 14325
Author:   sshwarts
Date:     2021-07-25 18:21:41 +0000 (Sun, 25 Jul 2021)
Log Message:
-----------
remove cpudb.h from some Makefile dependencies.  it should be only in cpu/init.cc and config.cc

Modified Paths:
--------------
    trunk/bochs/cpu/avx/Makefile.in

Modified: trunk/bochs/cpu/avx/Makefile.in
===================================================================
--- trunk/bochs/cpu/avx/Makefile.in	2021-07-25 18:10:39 UTC (rev 14324)
+++ trunk/bochs/cpu/avx/Makefile.in	2021-07-25 18:21:41 UTC (rev 14325)
@@ -94,7 +94,7 @@
 avx.o: avx.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -103,7 +103,7 @@
 avx2.o: avx2.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -112,7 +112,7 @@
 avx512.o: avx512.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -121,7 +121,7 @@
 avx512_bitalg.o: avx512_bitalg.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
  ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -130,7 +130,7 @@
 avx512_broadcast.o: avx512_broadcast.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
  ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -139,7 +139,7 @@
 avx512_cvt.o: avx512_cvt.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -148,7 +148,7 @@
 avx512_fma.o: avx512_fma.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -157,7 +157,7 @@
 avx512_mask16.o: avx512_mask16.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
  ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -165,7 +165,7 @@
 avx512_mask32.o: avx512_mask32.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
  ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -173,7 +173,7 @@
 avx512_mask64.o: avx512_mask64.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
  ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -181,7 +181,7 @@
 avx512_mask8.o: avx512_mask8.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
  ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -189,7 +189,7 @@
 avx512_move.o: avx512_move.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -198,7 +198,7 @@
 avx512_pfp.o: avx512_pfp.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -208,7 +208,7 @@
 avx512_rcp14.o: avx512_rcp14.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
  ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -218,7 +218,7 @@
 avx512_rsqrt14.o: avx512_rsqrt14.@CPP_SUFFIX@ ../../bochs.h ../../config.h \
  ../../osdep.h ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -228,7 +228,7 @@
 avx_cvt.o: avx_cvt.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -236,7 +236,7 @@
 avx_fma.o: avx_fma.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -245,7 +245,7 @@
 avx_pfp.o: avx_pfp.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -255,7 +255,7 @@
 gather.o: gather.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -263,7 +263,7 @@
 tbm32.o: tbm32.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -272,7 +272,7 @@
 tbm64.o: tbm64.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -281,7 +281,7 @@
 vnni.o: vnni.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \
@@ -290,7 +290,7 @@
 xop.o: xop.@CPP_SUFFIX@ ../../bochs.h ../../config.h ../../osdep.h \
  ../../bx_debug/debug.h ../../config.h ../../osdep.h \
  ../../cpu/decoder/decoder.h ../../gui/paramtree.h ../../logio.h \
- ../../cpudb.h ../../instrument/stubs/instrument.h ../cpu.h \
+ ../../instrument/stubs/instrument.h ../cpu.h \
  ../decoder/decoder.h ../i387.h ../fpu/softfloat.h ../fpu/tag_w.h \
  ../fpu/status_w.h ../fpu/control_w.h ../crregs.h ../descriptor.h \
  ../decoder/instr.h ../lazy_flags.h ../tlb.h ../icache.h ../apic.h \