Merge branch 'master' into cpu/fred

Author: stlintel

.gitattributes

@@ -1,2 +1,7 @@
 * text=auto eol=lf
-configure binary
+configure binary
+
+# Explicitly enforce LF on frequently-edited generated/interop files.
+bochs/iodev/fw_cfg.cc text eol=lf
+bochs/iodev/fw_cfg.h  text eol=lf
+bochs/iodev/acpi_dsdt_aml.h text eol=lf

.gitignore

@@ -47,6 +47,10 @@ bochs-msvc-src.zip
 /bochs/bios/rombios*.txt
 /bochs/bios/rombios*.bin
 /bochs/bios/rombios32.out
+/bochs/bios/acpi-dsdt-preprocessed.*
+
+# ACPI DSDT generation temporary outputs (bochs/tools/gen_acpi_dsdt_aml.py)
+/bochs/tools/_acpi_dsdt_aml.*
 
 # /bochs/build/linux/
 /bochs/build/linux/DOC-linux.html

bochs/.bochsrc

@@ -490,6 +490,8 @@ mouse: enabled=0
 #  original i440FX doesn't support them. The options 'noacpi' and 'nohpet' make
 #  it possible to disable them. The option 'noagp' disables the incomplete AGP
 #  subsystem of the i440BX chipset.
+#  If PCI is enabled, the 'nofloppy' option disables the FDC if no floppy drive
+#  is configured.
 #
 # Example:
 #   pci: enabled=1, chipset=i440fx, slot1=pcivga, slot2=ne2k, advopts=noacpi
@@ -582,6 +584,7 @@ private_colormap: enabled=0
 #   floppya: image=path, status=inserted  (guess media type from image size)
 #   floppya: 1_44=vvfat:path, status=inserted  (use directory as VFAT media)
 #   floppya: type=1_44                    (1.44M 3.5" floppy drive, no media)
+#   floppya: type=none                    (no floppy, to be used with pci: advopts=nofloppy)
 #
 # The path should be the name of a disk image file.  On Unix, you can use a raw
 # device name such as /dev/fd0 on Linux.  On win32 platforms, use drive letters
@@ -592,6 +595,7 @@ private_colormap: enabled=0
 # The optional parameter 'write_protected' can be used to control the media
 # write protect switch. By default it is turned off.
 #=======================================================================
+#floppya: type=none
 floppya: 1_44=/dev/fd0, status=inserted
 #floppya: image=../1.44, status=inserted
 #floppya: 1_44=/dev/fd0H1440, status=inserted
@@ -604,6 +608,7 @@ floppya: 1_44=/dev/fd0, status=inserted
 # FLOPPYB:
 # See FLOPPYA above for syntax
 #=======================================================================
+#floppyb: type=none
 #floppyb: 1_44=b:, status=inserted
 #floppyb: 1_44=b.img, status=inserted
 

bochs/CHANGES

@@ -34,12 +34,33 @@ Detailed change log :
 - Config interface
   - On Windows make sure file name parameters use backslash as separator
   - Removed backward compatibility mode for USB device options
+  - Increased maximum host memory size to 8192 MB (was 2048 MB)
 
 - Memory
+  - PCI hole support for >3GB RAM (NEW)
+    Added guest physical address translation for systems with more than 3GB RAM.
+    RAM from 3GB-4GB is remapped above 4GB to make room for PCI MMIO space.
+    The bx_translate_gpa_to_linear() helper handles the remapping transparently.
+    Works correctly with 2GB, 4GB, 8GB, 12GB, 16GB, and larger RAM configurations.
+
   - Added support for overlapping r/o memory handlers (used for PCI ROM)
   - Added support for mapping PCI ROM to expansion ROM space
 
 - I/O Devices
+  - fw_cfg (NEW)
+    Added QEMU-compatible fw_cfg device for UEFI/OVMF firmware support.
+    Provides system configuration to firmware via I/O ports 0x510-0x51B:
+    - E820 memory map with PCI hole (3GB-4GB reserved for MMIO)
+    - ACPI tables (RSDP, XSDT, FADT, FACS, DSDT, MADT, HPET)
+    - RAM size and CPU count information
+    - DMA protocol for table loading
+    This enables booting UEFI operating systems including Windows Server 2025
+    and modern Linux distributions with OVMF firmware.
+  - ACPI Tables
+    Added dynamic ACPI table generation for UEFI firmware compatibility.
+    Tables are compatible with PIIX4 PM/ACPI and include proper DSDT.
+    The generated DSDT is aligned with the default PCI/PIIX device model.
+
   - GeForce (NEW)
     Added basic support for three GeForce models. Most of the 2D features are present,
     but 3D is still WIP. Several Windows versions up to Win 7 have been reported to
@@ -3133,7 +3154,7 @@ Detailed change log :
  [1021758] GNU/k*BSD host support by Robert Millan
   [969967] int 15/ah=87h clearing cr0 by Ben Lunt
  [1048327] Russian Keymap by Dmitry Soshnikov
-  [851332] DESTDIR support for install_dlx by Ville Skytt�
+  [851332] DESTDIR support for install_dlx by Ville Skytt�
   [970929] gdbstub support for MinGW tool chains by Muranaka Masaki
  [1021740] Turn gdb stub into a runtime option by Charles Duffy
  [1063329] RFB key press/release bug fix by Remko van der Vossen

bochs/build/win32/vs2019-workspace/vs2019-plugins/iodev.vcxproj

@@ -215,11 +215,16 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\iodev\acpi_tables.cc" />
     <ClCompile Include="..\iodev\devices.cc" />
+    <ClCompile Include="..\iodev\fw_cfg.cc" />
     <ClCompile Include="..\iodev\slowdown_timer.cc" />
     <ClCompile Include="..\iodev\virt_timer.cc" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\iodev\acpi_dsdt_aml.h" />
+    <ClInclude Include="..\iodev\acpi_tables.h" />
+    <ClInclude Include="..\iodev\fw_cfg.h" />
     <ClInclude Include="..\iodev\iodev.h" />
     <ClInclude Include="..\iodev\slowdown_timer.h" />
     <ClInclude Include="..\iodev\virt_timer.h" />

bochs/build/win32/vs2019-workspace/vs2019/iodev.vcxproj

@@ -216,13 +216,15 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\iodev\acpi.cc" />
+    <ClCompile Include="..\iodev\acpi_tables.cc" />
     <ClCompile Include="..\iodev\biosdev.cc" />
     <ClCompile Include="..\iodev\busmouse.cc" />
     <ClCompile Include="..\iodev\cmos.cc" />
     <ClCompile Include="..\iodev\devices.cc" />
     <ClCompile Include="..\iodev\dma.cc" />
     <ClCompile Include="..\iodev\extfpuirq.cc" />
     <ClCompile Include="..\iodev\floppy.cc" />
+    <ClCompile Include="..\iodev\fw_cfg.cc" />
     <ClCompile Include="..\iodev\gameport.cc" />
     <ClCompile Include="..\iodev\harddrv.cc" />
     <ClCompile Include="..\iodev\hpet.cc" />
@@ -246,12 +248,15 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\iodev\acpi.h" />
+    <ClInclude Include="..\iodev\acpi_dsdt_aml.h" />
+    <ClInclude Include="..\iodev\acpi_tables.h" />
     <ClInclude Include="..\iodev\biosdev.h" />
     <ClInclude Include="..\iodev\busmouse.h" />
     <ClInclude Include="..\iodev\cmos.h" />
     <ClInclude Include="..\iodev\dma.h" />
     <ClInclude Include="..\iodev\extfpuirq.h" />
     <ClInclude Include="..\iodev\floppy.h" />
+    <ClInclude Include="..\iodev\fw_cfg.h" />
     <ClInclude Include="..\iodev\gameport.h" />
     <ClInclude Include="..\iodev\harddrv.h" />
     <ClInclude Include="..\iodev\hpet.h" />

bochs/config.cc

@@ -519,7 +519,7 @@ void bx_init_options()
   bx_param_bool_c *enabled, *readonly;
   bx_param_enum_c *mode, *type, *toggle, *status;
   bx_param_filename_c *path;
-  char name[BX_PATHNAME_LEN], descr[512], label[512];
+  char name[BX_PATHNAME_LEN], descr[512], label[512], bxshare[BX_PATHNAME_LEN];
 
   bx_param_c *root_param = SIM->get_param(".");
 
@@ -726,7 +726,7 @@ void bx_init_options()
       "host",
       "Host allocated memory size (megabytes)",
       "Amount of host allocated memory in megabytes",
-      1, 2048,
+      1, 8192,
       BX_DEFAULT_MEM_MEGS);
   host_ramsize->set_ask_format("Enter host memory size (MB): [%d] ");
   ram->set_options(ram->SERIES_ASK);
@@ -735,8 +735,8 @@ void bx_init_options()
       "block_size",
       "Memory block granularity (kilobytes)",
       "Granularity of host memory allocation",
-      4, 8192,
-      128);
+      0, 8192,
+      0);
   mem_block_size->set_ask_format("Enter memory block size (KB): [%d] ");
   ram->set_options(ram->SERIES_ASK);
 
@@ -746,7 +746,8 @@ void bx_init_options()
       "Pathname of ROM image to load",
       "", BX_PATHNAME_LEN);
   path->set_format("Name of ROM BIOS image: %s");
-  sprintf(name, "%s" DIRECTORY_SEPARATOR "BIOS-bochs-latest", (char *)get_builtin_variable("BXSHARE"));
+  get_bxshare_path(bxshare);
+  sprintf(name, "%s" DIRECTORY_SEPARATOR "BIOS-bochs-latest", bxshare);
   path->set_initial_val(name);
   bx_param_num_c *romaddr = new bx_param_num_c(rom,
       "address",
@@ -775,7 +776,7 @@ void bx_init_options()
       "Pathname of VGA ROM image to load",
       "", BX_PATHNAME_LEN);
   path->set_format("Name of VGA BIOS image: %s");
-  sprintf(name, "%s" DIRECTORY_SEPARATOR "VGABIOS-lgpl-latest.bin", get_builtin_variable("BXSHARE"));
+  sprintf(name, "%s" DIRECTORY_SEPARATOR "VGABIOS-lgpl-latest.bin", bxshare);
   path->set_initial_val(name);
   vgarom->set_options(vgarom->SERIES_ASK);
 
@@ -1626,6 +1627,14 @@ void bx_init_options()
       "Debug messages written to i/o port 0xE9 from ring3 will be displayed on console",
       0);
 
+    // fw_cfg device (UEFI/OVMF support)
+    bx_list_c *fw_cfg = new bx_list_c(misc, "fw_cfg", "QEMU fw_cfg device (UEFI/OVMF support)");
+    new bx_param_bool_c(fw_cfg,
+      "enabled",
+      "Enable fw_cfg device",
+      "Enables the QEMU-compatible fw_cfg device used by UEFI/OVMF firmware",
+      0);
+
 #if BX_SUPPORT_IODEBUG
 // iodebug all rings
   new bx_param_bool_c(misc,
@@ -3187,6 +3196,12 @@ static int parse_line_formatted(const char *context, int num_params, char *param
         PARSE_ERR(("%s: port_e9_hack directive malformed.", context));
       }
     }
+  } else if (!strcmp(params[0], "fw_cfg")) {
+    for (i=1; i<num_params; i++) {
+      if (bx_parse_param_from_list(context, params[i], (bx_list_c*) SIM->get_param(BXPN_FW_CFG_ROOT)) < 0) {
+        PARSE_ERR(("%s: fw_cfg directive malformed.", context));
+      }
+    }
   } else if (!strcmp(params[0], "iodebug")) {
 #if BX_SUPPORT_IODEBUG
     if (num_params != 2) {
@@ -3582,6 +3597,7 @@ int bx_write_configuration(const char *rc, int overwrite)
   fprintf(fp, "print_timestamps: enabled=%d\n", bx_dbg.print_timestamps);
   bx_write_debugger_options(fp);
   bx_write_param_list(fp, (bx_list_c*) SIM->get_param(BXPN_PORT_E9_HACK_ROOT), NULL, 0);
+  bx_write_param_list(fp, (bx_list_c*) SIM->get_param(BXPN_FW_CFG_ROOT), NULL, 0);
 #if BX_SUPPORT_IODEBUG
   fprintf(fp, "iodebug: all_rings=%d\n", SIM->get_param_bool(BXPN_IODEBUG_ALL_RINGS)->get());
 #endif

bochs/cpu/cpu.cc

@@ -308,7 +308,7 @@ bxICacheEntry_c* BX_CPU_C::getICacheEntry(void)
     bxInstruction_c *i = entry->i;
     if (i->getIaOpcode() != (long64_mode() ? BX_IA_ENDBRANCH64 : BX_IA_ENDBRANCH32) && i->getIaOpcode() != BX_IA_INT3) {
       if (LegacyEndbranchTreatment(CPL)) {
-        BX_ERROR(("Endbranch is expected for CPL=%d", CPL));
+        BX_ERROR(("#CP(ENDBRANCH): Endbranch is expected for CPL=%d", CPL));
         exception(BX_CP_EXCEPTION, BX_CP_ENDBRANCH);
       }
     }

bochs/cpu/paging.cc

@@ -2617,6 +2617,12 @@ bool BX_CPU_C::check_addr_in_tlb_buffers(const Bit8u *addr, const Bit8u *end)
   }
 #endif
 
+  if (((const bx_hostpageaddr_t)BX_CPU_THIS_PTR eipFetchPtr >= (const bx_hostpageaddr_t)addr) &&
+      ((const bx_hostpageaddr_t)BX_CPU_THIS_PTR eipFetchPtr  < (const bx_hostpageaddr_t)end)) return true;
+
+  if (((const bx_hostpageaddr_t)BX_CPU_THIS_PTR espHostPtr >= (const bx_hostpageaddr_t)addr) &&
+      ((const bx_hostpageaddr_t)BX_CPU_THIS_PTR espHostPtr  < (const bx_hostpageaddr_t)end)) return true;
+
   for (unsigned tlb_entry_num=0; tlb_entry_num < BX_DTLB_SIZE; tlb_entry_num++) {
     bx_TLB_entry *tlbEntry = &BX_CPU_THIS_PTR DTLB.entry[tlb_entry_num];
     if (tlbEntry->valid()) {

bochs/doc/docbook/user/user.dbk

@@ -3180,7 +3180,29 @@ Bochs must be set up to use system and VGA BIOS like this:
 We recommend to use the ROM images distributed with Bochs or one of the latest
 <ulink url="http://www.seabios.org/">SeaBIOS</ulink> images. BIOS images designed
 for real hardware mostly do not work properly. Please see the <xref linkend="bochsopt-romimage">
-for more information.
+</para>
+
+<para>
+<emphasis>UEFI Firmware Support:</emphasis> Bochs supports UEFI boot using OVMF
+(Open Virtual Machine Firmware) from the TianoCore EDK2 project. To use UEFI:
+<screen>
+  romimage: file=OVMF.fd, address=0xffc00000
+</screen>
+UEFI boot requires the fw_cfg device which provides system configuration to the
+firmware via I/O ports 0x510-0x51B. This includes the E820 memory map, ACPI tables,
+RAM size, and CPU count. Enable it with:
+<screen>
+  fw_cfg: enabled=1
+</screen>
+For best results with OVMF graphics output, configure VGA as a PCI device:
+<screen>
+  pci: enabled=1, chipset=i440fx, slot1=pcivga
+</screen>
+The ACPI DSDT AML is built into Bochs and generated from the Bochs DSDT DSL
+source using the ACPICA iasl compiler.
+For developers, bochs/tools/gen_acpi_dsdt_aml.py can regenerate the embedded
+AML header.
+UEFI boot has been tested with Windows Server 2025 and modern Linux distributions.
 </para>
 
 <para>
@@ -3923,7 +3945,8 @@ PCI chipset. These options can be specified as comma-separated values.
 By default, the "Bochs i440FX" chipset enables the ACPI and HPET devices, but
 original i440FX doesn't support them. The options 'noacpi' and 'nohpet' make
 it possible to disable them. The option 'noagp' disables the incomplete AGP
-subsystem of the i440BX chipset.
+subsystem of the i440BX chipset. If PCI is enabled, the 'nofloppy' option
+disables the FDC if no floppy drive is configured.
 </para>
 </section>