Update to 2.3.7, based on diffs by Juan Romero Pardines.

+ More optimizations in CPU code - Bochs 2.3.7 is more than 2x faster
  than Bochs 2.3.5 build !
- Implemented LBA48 support in BIOS
- Added memory access tracing for Bochs internal debugger
- Implemented Intel(R) XSAVE/XRSTOR and AES instruction set extensions
- Many fixes in CPU emulation and internal debugger
  - MenuetOS64 floppy images booting perfect again !
- updated LGPL'd VGABIOS to version 0.6b

XXX: Darwin PLIST probably wrong, someone please fix and integrate
better.

4 files changed, 41 insertions, 22 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index ebdcde3b369..e392c54f3c3 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2008/06/12 02:14:29 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2008/12/06 12:00:56 wiz Exp $
 
-DISTNAME=		bochs-2.3.6
+DISTNAME=		bochs-2.3.7
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bochs/}
 
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--enable-x86-debugger
 .endif
 
 .if empty(PKG_OPTIONS:Mtiny)
-CONFIGURE_ARGS+=	--enable-3dnow
+#CONFIGURE_ARGS+=	--enable-3dnow
 CONFIGURE_ARGS+=	--enable-4meg-pages
 CONFIGURE_ARGS+=	--enable-all-optimizations
 CONFIGURE_ARGS+=	--enable-apic
@@ -71,6 +71,12 @@ CONFIGURE_ARGS+=	--enable-large-pages
 CONFIGURE_ARGS+=	--enable-mtrr
 CONFIGURE_ARGS+=	--enable-clgd54xx
 CONFIGURE_ARGS+=	--enable-sse-extension
+CONFIGURE_ARGS+=	--enable-gameport
+CONFIGURE_ARGS+=	--enable-misaligned-sse
+CONFIGURE_ARGS+=	--enable-aes
+CONFIGURE_ARGS+=	--enable-xsave
+CONFIGURE_ARGS+=	--enable-vme
+CONFIGURE_ARGS+=	--enable-plugins
 
 .  if !empty(MACHINE_PLATFORM:M*-*-i386)
 CONFIGURE_ARGS+=	--enable-fast-function-calls
diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST
index 7876ad309f5..eedb9239107 100644
--- a/emulators/bochs/PLIST
+++ b/emulators/bochs/PLIST
@@ -1,7 +1,32 @@
-@comment $NetBSD: PLIST,v 1.9 2008/01/03 21:03:45 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/12/06 12:00:56 wiz Exp $
 bin/bochs
 bin/bxcommit
 bin/bximage
+lib/bochs/plugins/libbx_acpi.la
+lib/bochs/plugins/libbx_biosdev.la
+lib/bochs/plugins/libbx_busmouse.la
+lib/bochs/plugins/libbx_cmos.la
+lib/bochs/plugins/libbx_dma.la
+lib/bochs/plugins/libbx_extfpuirq.la
+lib/bochs/plugins/libbx_floppy.la
+lib/bochs/plugins/libbx_gameport.la
+lib/bochs/plugins/libbx_harddrv.la
+lib/bochs/plugins/libbx_keyboard.la
+lib/bochs/plugins/libbx_ne2k.la
+lib/bochs/plugins/libbx_parallel.la
+lib/bochs/plugins/libbx_pci.la
+lib/bochs/plugins/libbx_pci2isa.la
+lib/bochs/plugins/libbx_pci_ide.la
+lib/bochs/plugins/libbx_pcipnic.la
+lib/bochs/plugins/libbx_pciusb.la
+lib/bochs/plugins/libbx_pcivga.la
+lib/bochs/plugins/libbx_pic.la
+lib/bochs/plugins/libbx_sb16.la
+lib/bochs/plugins/libbx_serial.la
+lib/bochs/plugins/libbx_speaker.la
+lib/bochs/plugins/libbx_unmapped.la
+lib/bochs/plugins/libbx_vga.la
+lib/bochs/plugins/libbx_x.la
 man/man1/bochs-dlx.1
 man/man1/bochs.1
 man/man1/bxcommit.1
@@ -37,3 +62,5 @@ share/doc/bochs/bochsrc-sample.txt
 @dirrm share/doc/bochs
 @dirrm share/bochs/keymaps
 @dirrm share/bochs
+@dirrm lib/bochs/plugins
+@dirrm lib/bochs
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index 4c79c94cd0f..095a54d7d77 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.22 2008/01/18 10:21:01 jmmv Exp $
+$NetBSD: distinfo,v 1.23 2008/12/06 12:00:56 wiz Exp $
 
-SHA1 (bochs-2.3.6.tar.gz) = 3675b1c5a324854b998bb7518c7279db2fecd8c3
-RMD160 (bochs-2.3.6.tar.gz) = b81c8093c147d0d75cb18a954407ed3f7451aa3f
-Size (bochs-2.3.6.tar.gz) = 3951132 bytes
+SHA1 (bochs-2.3.7.tar.gz) = e687c697a8be8396ae75106d0cd6149bd52ca67d
+RMD160 (bochs-2.3.7.tar.gz) = b4c9cb8e777c4e484f653085783bce9645804fe0
+Size (bochs-2.3.7.tar.gz) = 3989982 bytes
 SHA1 (patch-aa) = e0d72eb694bbd132e598d0c5ad88875c0c0ccd7f
 SHA1 (patch-ab) = 51ebcc673c60258d19e4ec18f2464fb694548228
 SHA1 (patch-ac) = ab21b4c2c38d798e24244163b2c447430e012e8e
 SHA1 (patch-ad) = 44181a229d81a6462e3e44c2425d62a415c5f6f9
 SHA1 (patch-ae) = 4c466afb1d780ce7cdfbaef8e8fa00447d0ebcb7
-SHA1 (patch-af) = ffe66e8fdf18872c5060b85f85d7323d451f17a3
diff --git a/emulators/bochs/patches/patch-af b/emulators/bochs/patches/patch-af
deleted file mode 100644
index caaf9191d12..00000000000
--- a/emulators/bochs/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.6 2008/01/18 10:21:01 jmmv Exp $
-
---- bx_debug/dbg_main.cc.orig	2007-12-13 23:56:35.000000000 +0100
-+++ bx_debug/dbg_main.cc
-@@ -1070,7 +1070,7 @@ void bx_dbg_xlate_address(bx_lin_address
-   bx_phy_address paddr;
-   laddr &= BX_CONST64(0xfffffffffffff000);
- 
--  bx_bool paddr_valid = BX_CPU(which_cpu)->dbg_xlate_linear2phy(laddr, &paddr);
-+  bx_bool paddr_valid = BX_CPU(dbg_cpu)->dbg_xlate_linear2phy(laddr, &paddr);
-   if (paddr_valid) {
-     dbg_printf("linear page 0x" FMT_ADDRX " maps to physical page 0x%08x\n", laddr, paddr);
-   }