2.6.11

Author: lubomyr

.bochsrc

@@ -159,7 +159,7 @@
 #  IGNORE_BAD_MSRS:
 #    Ignore MSR references that Bochs does not understand; print a warning
 #    message instead of generating #GP exception. This option is enabled
-#    by default but will not be avaiable if configurable MSRs are enabled.
+#    by default but will not be available if configurable MSRs are enabled.
 #
 #  MWAIT_IS_NOP:
 #    When this option is enabled MWAIT will not put the CPU into a sleep state.
@@ -371,16 +371,17 @@ memory: guest=512, host=256
 # boot menu delay.
 #=======================================================================
 romimage: file=$BXSHARE/BIOS-bochs-latest, options=fastboot
-#romimage: file=$BXSHARE/bios.bin-1.7.5 # http://www.seabios.org/SeaBIOS
+#romimage: file=$BXSHARE/bios.bin-1.13.0 # http://www.seabios.org/SeaBIOS
 #romimage: file=mybios.bin, address=0xfff80000 # 512k at memory top
 
 #=======================================================================
 # VGAROMIMAGE
 # You now need to load a VGA ROM BIOS into C0000.
 #=======================================================================
-#vgaromimage: file=bios/VGABIOS-elpin-2.40
 vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
 #vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus
+#vgaromimage: file=$BXSHARE/vgabios-cirrus.bin-1.13.0 # http://www.seabios.org/SeaVGABIOS
+#vgaromimage: file=bios/VGABIOS-elpin-2.40
 
 #=======================================================================
 # OPTROMIMAGE[1-4]:
@@ -435,7 +436,7 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
 # This defines the Voodoo Graphics emulation (experimental). Currently
 # supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'. The
 # Voodoo2 support is not yet complete, but almost usable. The Banshee and
-# Voodoo3 support is under construction, but basicly usable. The 2D/3D cards
+# Voodoo3 support is under construction, but basically usable. The 2D/3D cards
 # require an external VGA BIOS the vga extension option to be set to 'voodoo'.
 # If the i440BX PCI chipset is selected, they can be assigned to AGP (slot #5).
 # The gui screen update timing for all models is controlled by the related 'vga'
@@ -1118,7 +1119,7 @@ speaker: enabled=1, mode=sound
 # The optionsX parameter can be used to assign specific options to the device
 # connected to the corresponding USB port. Currently this feature is used to
 # set the speed reported by device ('low', 'full', 'high' or 'super'). The
-# availabe speed choices depend on both HC and device. The option 'debug' turns
+# available speed choices depend on both HC and device. The option 'debug' turns
 # on debug output for the device at connection time.
 # For the USB 'disk' device the optionsX parameter can be used to specify an
 # alternative redolog file (journal) of some image modes. For 'vvfat' mode USB

.gitignore

@@ -1,3 +1,27 @@
+Changes in 2.6.11 (January 5, 2020):
+
+- General
+  - Added 64-bit support to the NSIS installer script
+  - Several fixes in the build system based on Debian patches
+
+- CPU / CPUDB
+  - Bugfixes for CPU emulation correctness
+    - Many critical bugfixes for Protection Keys, AVX512*, VMX/SVM, SHA, GFNI emulation
+  ! Implemented CET (Control Flow Enforcement Technology) emulation according to Intel SDM rev071
+
+- I/O Devices
+  - Added missing Cirrus SVGA bitblt feature "transparent color compare"
+  - Some fixes in HPET emulation (patch by Oleg)
+  - Fixed disk image lock mechanism in the USB MSD case
+
+- BIOS / VGABIOS
+  - LGPL'd VGABIOS updated to version 0.7b (Fixed VESA extension 'read EDID'
+    for Bochs VBE and Cirrus)
+  - Updated SeaBIOS ROM image to current version 1.13.0
+  - Added SeaVGABIOS ROM image for the Cirrus adapter
+  - Bochs BIOS built to work with CPU level 5 again
+
+-------------------------------------------------------------------------
 Changes in 2.6.10 (December 1, 2019):
 
 Brief summary :
@@ -53,7 +77,7 @@ Detailed change log :
     - Voodoo2 model now working after some fixes and implementation of the
       CMDFIFO (using FIFO thread) and one of the bitBLT functions.
     - Added Voodoo Banshee / Voodoo3 emulation support (still under construction,
-      but basicly usable). The AGP models are available if chipset is i440BX.
+      but basically usable). The AGP models are available if chipset is i440BX.
   - Display (general)
     - Added basic DDC support for Bochs VBE, Cirrus and Voodoo Banshee / Voodoo3
       adapters (reporting plug&play monitor "Bochs Screen").
@@ -1103,7 +1127,7 @@ Detailed change log :
  [2905385] Bochs crash
  [2901481] Instruction SYSRET and SS(PL)
  [2900632] Broken long mode RETF to outer priviledge with null SS
- [1429011] Use bx_phyaddr_t for physaddr vars and bx_adress for lin adr
+ [1429011] Use bx_phyaddr_t for physaddr vars and bx_address for lin adr
 
 - these S.F. feature requests were closed/implemented
  [2955911] RPM preuninstall scriptlet removes /core
@@ -2010,7 +2034,7 @@ Detailed change log :
 
 - CPU
   - fixed XMM registers restore in FXRSTOR instruction (Andrej Palkovsky)
-  - print registers dump to the log if tripple fault occured
+  - print registers dump to the log if tripple fault occurred
   - fixed PANIC in LTR instruction (Stanislav)
   - added virtual 8086 mode extensions (VME) implementation, to enable
     configure with --enable-vme (Stanislav)
@@ -2528,7 +2552,7 @@ Detailed change log :
  #1112836 PGE-Bit crashes Bochs
   #947586 The specification difference in x86-64 emulation
  #1117145 Push reset Button, APIC0 Error occur
- #1123043 fpu stack pointer changed *despite* fault occured (e.g. #pf)
+ #1123043 fpu stack pointer changed *despite* fault occurred (e.g. #pf)
  #1122066 PANIC: iret: IP > descriptor limit when installing os/2 warp
   #809574 rm -f segfaults
   #593952 SuSE rm segfaults
@@ -2706,7 +2730,7 @@ Changes in 2.1.1 (February 8, 2004):
 - notify display libraries on change of bpp (Volker)
 - fix bug in int13h function 0x10 (Volker)
 - fix floppy dialog error on win2k (Volker)
-- fix adress check in TSS IO permission bitmap (Christophe)
+- fix address check in TSS IO permission bitmap (Christophe)
 - fix buffer overflow vulnerability pointed out by SeSoX (Christophe)
 - updates for MacOS compile (Daniel Gimpelevich)
 

CHANGES

@@ -41,14 +41,14 @@ VERSION=@VERSION@
 REL_STRING=@REL_STRING@
 MAN_PAGE_1_LIST=bochs bximage bochs-dlx
 MAN_PAGE_5_LIST=bochsrc
-INSTALL_LIST_SHARE=bios/BIOS-bochs-* bios/VGABIOS* bios/SeaBIOS* bios/bios.bin-* @INSTALL_LIST_FOR_PLATFORM@
+INSTALL_LIST_SHARE=bios/BIOS-bochs-* bios/VGABIOS* bios/SeaBIOS* bios/bios.bin-* bios/vgabios-cirrus.bin-* @INSTALL_LIST_FOR_PLATFORM@
 INSTALL_LIST_DOC=CHANGES COPYING LICENSE README TODO misc/slirp.conf
 INSTALL_LIST_BIN=bochs@EXE@ bximage@EXE@
 INSTALL_LIST_BIN_OPTIONAL=bochsdbg@EXE@ @OPTIONAL_TARGET@
 INSTALL_LIST_WIN32=$(INSTALL_LIST_SHARE) $(INSTALL_LIST_DOC) $(INSTALL_LIST_BIN) $(INSTALL_LIST_BIN_OPTIONAL)
 INSTALL_LIST_MACOSX=$(INSTALL_LIST_SHARE) $(INSTALL_LIST_DOC) bochs.scpt
 # for win32 and macosx, these files get renamed to *.txt in install process
-TEXT_FILE_LIST=README CHANGES COPYING LICENSE TODO VGABIOS-elpin-LICENSE VGABIOS-lgpl-README SeaBIOS-README
+TEXT_FILE_LIST=README CHANGES COPYING LICENSE TODO VGABIOS-elpin-LICENSE VGABIOS-lgpl-README SeaBIOS-README SeaVGABIOS-README
 CP=cp
 CAT=cat
 RM=rm

Makefile.in

@@ -1,6 +1,6 @@
 Bochs - The cross platform IA-32 (x86) emulator
-Updated: Sun Dec  1 08:45:00 CET 2019
-Version: 2.6.10
+Updated: Sun Jan  5 08:36:00 CET 2020
+Version: 2.6.11
 
 WHAT IS BOCHS?
 
@@ -81,18 +81,23 @@ many ways you could help out.  For example:
 
 CHANGES
 
-Brief summary of changes in 2.6.10:
-  - CPU: Bugfixes for CPU emulation correctness (critical bugfixes for
-    PCID, ADCX/ADOX, MOVBE, AVX/AVX-512 and VMX emulation)
-  - CPU: implemented AVX-512 VBMI2/VNNI/BITALG, VAES, VPCLMULQDQ / GFNI
-    instructions emulation
-  - VMX: Implement EPT-Based Sub-Page Protection
-  - CPUID: Added new CPU models Skylake-X, Cannonlake and Icelake-U
-  - CPUID: Implemented side-channel attack prevention reporting and
-    corresponding MSR registers, enabled for Icelake-U
-  - Added basic support for the i440BX PCI/AGP chipset.
-  - Added basic Voodoo Banshee / Voodoo3 emulation support.
-  - Added basic DDC support for the VGA-compatible adapters.
-  - Implemented HPET emulation (ported from Qemu).
+Summary of changes in 2.6.11:
+  - General
+    - Added 64-bit support to the NSIS installer script
+    - Several fixes in the build system based on Debian patches
+  - CPU / CPUDB
+    - Bugfixes for CPU emulation correctness
+      - Many critical bugfixes for Protection Keys, AVX512*, VMX/SVM, SHA, GFNI emulation
+    ! Implemented CET (Control Flow Enforcement Technology) emulation according to Intel SDM rev071
+  - I/O Devices
+    - Added missing Cirrus SVGA bitblt feature "transparent color compare"
+    - Some fixes in HPET emulation (patch by Oleg)
+    - Fixed disk image lock mechanism in the USB MSD case
+  - BIOS / VGABIOS
+    - LGPL'd VGABIOS updated to version 0.7b (Fixed VESA extension 'read EDID'
+      for Bochs VBE and Cirrus)
+    - Updated SeaBIOS ROM image to current version 1.13.0
+    - Added SeaVGABIOS ROM image for the Cirrus adapter
+    - Bochs BIOS built to work with CPU level 5 again
 
 See CHANGES file for more information!

README

@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2014  The Bochs Project
+# Copyright (C) 2001-2019  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
@@ -37,11 +37,13 @@ BCC = bcc
 GCC = gcc
 GCC32 = gcc -m32 -fno-stack-protector
 AS86 = as86
+IASL = @IASL@
 
 BX_INCDIRS = -I.. -I$(srcdir)/.. -I../iodev -I$(srcdir)/../iodev
 LOCAL_CXXFLAGS =
 
-BUILDDATE = `date '+%m/%d/%y'`
+UPSTREAM_RELEASE_DATE = $(shell grep "Updated:" ../README | sed 's/Updated://')
+BUILDDATE = `date -d '$(UPSTREAM_RELEASE_DATE)' '+%m/%d/%y'`
 BIOS_BUILD_DATE = "-DBIOS_BUILD_DATE=\"$(BUILDDATE)\""
 #
 # -------- end configurable options --------------------------
@@ -56,6 +58,7 @@ bios: biossums BIOS-bochs-latest BIOS-bochs-legacy
 
 clean:
 	@RMCOMMAND@ *.o *.a *.s _rombios*_.c rombios*.txt rombios*.sym
+	@RMCOMMAND@ acpt-dsdt.aml
 	@RMCOMMAND@ usage biossums rombios16.bin
 	@RMCOMMAND@ rombios32.bin rombios32.out
 
@@ -86,7 +89,6 @@ rombios16.bin: rombios.c apmbios.S biossums rombios.h
 	./biossums rombios16.bin
 	@RMCOMMAND@ _rombios_.s
 
-
 rombios32.bin: rombios32.out rombios.h
 	objcopy -O binary $< $@
 	./biossums -pad $@
@@ -97,7 +99,7 @@ rombios32.out: rombios32start.o rombios32.o rombios32.ld
 rombios32.o: rombios32.c acpi-dsdt.hex rombios.h
 	$(GCC32) -O2 -Wall -c -o $@ $<
 
-ifeq ("1", "0")
+ifneq ($(IASL), not_found)
 acpi-dsdt.hex: acpi-dsdt.dsl
 	cpp -P $< $<.i
 	iasl -tc -p $@ $<.i

bios/BIOS-bochs-latest

@@ -1,35 +1,16 @@
---------------------------------------------
-| SeaBIOS (http://www.seabios.org/SeaBIOS) |
---------------------------------------------
+SeaBIOS is an open source implementation of a 16bit X86 BIOS. SeaBIOS
+can run in an emulator or it can run natively on X86 hardware with the
+use of coreboot (http://www.coreboot.org/).
 
-SeaBIOS is an open source implementation of a 16bit X86 BIOS.
+SeaBIOS is the default BIOS for qemu (http://www.qemu.org/) and
+kvm (http://www.linux-kvm.org/).
 
-SeaBIOS can run in an emulator or it can run natively on X86 hardware with
-the use of coreboot (http://www.coreboot.org).
+The coreboot SeaBIOS (http://www.coreboot.org/SeaBIOS) page has
+information on using SeaBIOS in coreboot. Please see the
+releases page for information on recent releases. See the
+download page to obtain SeaBIOS.
 
-SeaBIOS is the default BIOS for qemu and kvm.
+SeaVGABIOS is a sub-project of SeaBIOS.
 
-SeaBIOS may be distributed under the terms of the GNU LGPLv3 license.
-Both source code and binaries are available.
-
-
---------------------------------------------
-|    coreboot (http://www.coreboot.org)    | 
---------------------------------------------
-
-coreboot is a Free Software project aimed at replacing the proprietary BIOS
-(firmware) found in most computers. coreboot performs a little bit of
-hardware initialization and then executes additional boot logic, called a
-payload.
-
-With the separation of hardware initialization and later boot logic,
-coreboot can scale from specialized applications that run directly from
-firmware, run operating systems in flash, load custom bootloaders, or
-implement firmware standards, like  PC BIOS services or  UEFI. This allows
-for systems to only include the features necessary in the target
-application, reducing the amount of code and flash space required.
-
-coreboot currently supports over 230 different mainboards. Check the
-Support page to see if your system is supported.
-
-coreboot was formerly known as LinuxBIOS.
+Please join the mailing list to contribute to SeaBIOS. Information on
+the internals of SeaBIOS is available on the Developer Documentation page.

bios/BIOS-bochs-legacy

@@ -0,0 +1,35 @@
+SeaVGABIOS is a sub-project of the SeaBIOS project - it is an open
+source implementation of a 16bit X86 VGA BIOS
+(http://en.wikipedia.org/wiki/Video_BIOS). SeaVGABIOS is the
+default VGA BIOS on QEMU (http://www.qemu.org/). SeaVGABIOS can also
+run natively on some X86 VGA hardware with coreboot (http://www.coreboot.org/).
+
+Building SeaVGABIOS
+===================
+
+To build SeaVGABIOS, obtain the code, run `make
+menuconfig` and select the type of VGA BIOS to build in the "VGA ROM"
+menu. Once selected, run `make` and the final VGA BIOS binary will be
+located in "out/vgabios.bin".
+
+The choice of available VGA BIOSes within "make menuconfig" is
+dependent on whether CONFIG_QEMU, CONFIG_COREBOOT, or CONFIG_CSM is
+selected. Also, the debug options under the "Debugging" menu apply to
+SeaVGABIOS. All other options found in "make menuconfig" apply only to
+SeaBIOS and will not impact the SeaVGABIOS build.
+
+If SeaVGABIOS is needed for multiple different devices (eg, QEMU's
+cirrus emulation and QEMU's "dispi" emulation), then one must compile
+SeaVGABIOS multiple times with the appropriate config for each build.
+
+SeaVGABIOS code
+===============
+
+The source code for SeaVGABIOS is located in the SeaBIOS
+git repository. The main VGA BIOS code is located in the "vgasrc/"
+directory. The VGA BIOS code is always compiled in 16bit mode.
+
+The SeaVGABIOS builds to a separate binary from the main SeaBIOS
+binary, and much of the VGA BIOS code is separate from the main BIOS
+code. However, much of the SeaBIOS developer documentation applies to
+SeaVGABIOS. To contribute, please join the SeaBIOS mailing list.