Update to 2.3.6:

+ More than 25% emulation speedup vs Bochs 2.3.5 release!
+ Up to 40% speedup vs Bochs 2.3.5 release with trace cache optimization!
- Lots of bugfixes in CPU emulation
- Bochs benchmarking support
- Added emulation of Intel SSE4.2 instruction set

and others, please review the CHANGES file.

6 files changed, 48 insertions, 52 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index a8cbfb21937..674d7e60f20 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2007/09/25 10:07:05 hira Exp $
+# $NetBSD: Makefile,v 1.51 2008/01/03 21:03:45 xtraeme Exp $
 
-DISTNAME=		bochs-2.3
+DISTNAME=		bochs-2.3.6
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bochs/}
 
@@ -12,6 +12,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_TOOLS+=		gunzip gzip
 USE_LANGUAGES=		c c++
+USE_LIBTOOL=		yes
 
 ONLY_FOR_COMPILER=	gcc
 CXXFLAGS+=		-DPARANOID
@@ -51,7 +52,6 @@ CONFIGURE_ARGS+=	--enable-guest2host-tlb
 CONFIGURE_ARGS+=	--enable-host-specific-asms
 CONFIGURE_ARGS+=	--enable-icache
 CONFIGURE_ARGS+=	--enable-mmx
-CONFIGURE_ARGS+=	--enable-new-pit
 CONFIGURE_ARGS+=	--enable-pae
 CONFIGURE_ARGS+=	--enable-pci
 CONFIGURE_ARGS+=	--enable-repeat-speedups
@@ -60,6 +60,15 @@ CONFIGURE_ARGS+=	--enable-sse=3
 CONFIGURE_ARGS+=	--enable-usb
 CONFIGURE_ARGS+=	--enable-vbe
 CONFIGURE_ARGS+=	--enable-x86-64
+CONFIGURE_ARGS+=	--enable-popcnt
+CONFIGURE_ARGS+=	--enable-smp
+CONFIGURE_ARGS+=	--enable-ne2000
+CONFIGURE_ARGS+=	--enable-acpi
+CONFIGURE_ARGS+=	--enable-pnic
+CONFIGURE_ARGS+=	--enable-large-pages
+CONFIGURE_ARGS+=	--enable-mtrr
+CONFIGURE_ARGS+=	--enable-clgd54xx
+CONFIGURE_ARGS+=	--enable-sse-extension
 
 .  if !empty(MACHINE_PLATFORM:M*-*-i386)
 CONFIGURE_ARGS+=	--enable-fast-function-calls
diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST
index e781267e4d3..7876ad309f5 100644
--- a/emulators/bochs/PLIST
+++ b/emulators/bochs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/12/04 17:37:24 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/01/03 21:03:45 xtraeme Exp $
 bin/bochs
 bin/bxcommit
 bin/bximage
@@ -8,6 +8,7 @@ man/man1/bxcommit.1
 man/man1/bximage.1
 man/man5/bochsrc.5
 share/bochs/BIOS-bochs-latest
+share/bochs/BIOS-bochs-legacy
 share/bochs/VGABIOS-elpin-2.40
 share/bochs/VGABIOS-elpin-LICENSE
 share/bochs/VGABIOS-lgpl-README
diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo
index d70556365db..3a5dbdc17aa 100644
--- a/emulators/bochs/distinfo
+++ b/emulators/bochs/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.20 2006/12/04 17:37:24 jmmv Exp $
+$NetBSD: distinfo,v 1.21 2008/01/03 21:03:45 xtraeme Exp $
 
-SHA1 (bochs-2.3.tar.gz) = 2fe0dbdebd7fe9fe07d697bcbe1736bdaeb64aaf
-RMD160 (bochs-2.3.tar.gz) = 545e0bf3edd0fdd073a107e835f90c65451c100e
-Size (bochs-2.3.tar.gz) = 3812273 bytes
-SHA1 (patch-aa) = 65538ace00fa74f0871210364622ddc8027c2655
+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 (patch-aa) = e0d72eb694bbd132e598d0c5ad88875c0c0ccd7f
 SHA1 (patch-ab) = 51ebcc673c60258d19e4ec18f2464fb694548228
 SHA1 (patch-ac) = ab21b4c2c38d798e24244163b2c447430e012e8e
-SHA1 (patch-ad) = e305a33c204d9957d9da4048dddb194fff76dc12
-SHA1 (patch-ae) = b8092c73b77adebc054e7adf4a773206af726bf5
+SHA1 (patch-ad) = 1d6be38c7c084b19cf89f0185e965323b65ea181
diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa
index 90ba8d7863d..ec2f8ee820f 100644
--- a/emulators/bochs/patches/patch-aa
+++ b/emulators/bochs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2006/12/04 17:37:24 jmmv Exp $
+$NetBSD: patch-aa,v 1.12 2008/01/03 21:03:45 xtraeme Exp $
 
---- .bochsrc.orig	2006-06-22 20:50:47.000000000 +0200
-+++ .bochsrc
-@@ -196,13 +196,13 @@ vga: extension=vbe
+--- .bochsrc.orig	2007-12-27 00:41:46.000000000 +0100
++++ .bochsrc	2007-12-27 00:42:35.000000000 +0100
+@@ -197,13 +197,13 @@
  # such as a: or b: as the path.  The parameter 'image' works with image files
  # only. In that case the size must match one of the supported types.
  #=======================================================================
@@ -18,12 +18,12 @@ $NetBSD: patch-aa,v 1.11 2006/12/04 17:37:24 jmmv Exp $
  
  #=======================================================================
  # FLOPPYB:
-@@ -282,7 +282,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=
+@@ -283,7 +283,7 @@
  #   ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, heads=15, spt=63
  #   ata3-slave:  type=cdrom, path=iso.sample, status=inserted
  #=======================================================================
--ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
-+#ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
+-ata0-master: type=disk, mode=flat, path="30M.sample"
++#ata0-master: type=disk, mode=flat, path="30M.sample"
+ #ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17
  #ata0-master: type=disk, mode=flat, path="c.img", cylinders=0 # autodetect
  #ata0-slave: type=cdrom, path=D:, status=inserted
- #ata0-slave: type=cdrom, path=/dev/cdrom, status=inserted
diff --git a/emulators/bochs/patches/patch-ad b/emulators/bochs/patches/patch-ad
index 86f09503a5b..f283f372c59 100644
--- a/emulators/bochs/patches/patch-ad
+++ b/emulators/bochs/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2006/12/03 22:18:16 jmmv Exp $
+$NetBSD: patch-ad,v 1.9 2008/01/03 21:03:45 xtraeme Exp $
 
---- Makefile.in.orig	2005-07-06 22:28:23.000000000 +0200
-+++ Makefile.in
-@@ -71,8 +71,8 @@ RMDIR=rmdir
+--- Makefile.in.orig	2007-12-27 00:43:38.000000000 +0100
++++ Makefile.in	2007-12-27 00:44:54.000000000 +0100
+@@ -72,8 +72,8 @@
  TAR=tar
  CHMOD=chmod
  # the GZIP variable is reserved by gzip program
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.8 2006/12/03 22:18:16 jmmv Exp $
  ZIP=zip
  UNIX2DOS=unix2dos
  LIBTOOL=@LIBTOOL@
-@@ -574,7 +574,7 @@ RINCLUDES=/System/Library/Frameworks/Car
+@@ -576,7 +576,7 @@
  REZ_ARGS=-append -i $RINCLUDES -d SystemSevenOrLater=1 -useDF
  STANDALONE_LIBDIR=`pwd`/$(APP)/Contents/$(APP_PLATFORM)/lib
  OSACOMPILE=/usr/bin/osacompile
@@ -22,23 +22,23 @@ $NetBSD: patch-ad,v 1.8 2006/12/03 22:18:16 jmmv Exp $
  
  # On a MacOS X machine, you run rez, osacompile, and setfile to
  # produce the script executable, which has both a data fork and a
-@@ -651,18 +651,15 @@ $(APP)/.build_plugins: $(APP)/.build boc
+@@ -653,18 +653,15 @@
  	$(LIBTOOL) --finish $(STANDALONE_LIBDIR);
  	touch $(APP)/.build_plugins
  
--install_macosx: all download_dlx @INSTALL_DOCBOOK_VAR@
-+install_macosx: all @INSTALL_DOCBOOK_VAR@
- 	-mkdir -p $(prefix)
- 	for i in $(INSTALL_LIST_MACOSX); do if test -e $$i; then $(CPMAC) -r $$i $(prefix); else $(CPMAC) -r $(srcdir)/$$i $(prefix); fi; done
- 	$(CPMAC) $(srcdir)/.bochsrc $(prefix)/bochsrc-sample.txt
- 	-mkdir $(prefix)/keymaps
- 	$(CPMAC) $(srcdir)/gui/keymaps/*.map $(prefix)/keymaps
--	cat $(DLXLINUX_TAR) | (cd $(prefix) && tar xzvf -)
--	dlxrc=$(prefix)/dlxlinux/bochsrc.txt; mv "$$dlxrc" "$$dlxrc.orig" && sed < "$$dlxrc.orig" 's/\/usr\/local\/bochs\/latest/../' > "$$dlxrc" && rm -f "$$dlxrc.orig"
- 	mv $(prefix)/README $(prefix)/README.orig
- 	cat $(srcdir)/build/macosx/README.macosx-binary $(prefix)/README.orig > $(prefix)/README
- 	rm -f $(prefix)/README.orig
--	$(CPMAC) $(SCRIPT_EXEC) $(prefix)/dlxlinux
- 	for i in $(TEXT_FILE_LIST); do mv $(prefix)/$$i $(prefix)/$$i.txt; done
+-install_macosx: all download_dlx install_man @INSTALL_DOCBOOK_VAR@
++install_macosx: all install_man @INSTALL_DOCBOOK_VAR@
+ 	-mkdir -p $(DESTDIR)$(prefix)
+ 	for i in $(INSTALL_LIST_MACOSX); do if test -e $$i; then $(CPMAC) -r $$i $(DESTDIR)$(sharedir); else $(CPMAC) -r $(srcdir)/$$i $(DESTDIR)$(sharedir); fi; done
+ 	$(CPMAC) $(srcdir)/.bochsrc $(DESTDIR)$(sharedir)/bochsrc-sample.txt
+ 	-mkdir $(DESTDIR)$(sharedir)/keymaps
+ 	$(CPMAC) $(srcdir)/gui/keymaps/*.map $(DESTDIR)$(sharedir)/keymaps
+-	cat $(DLXLINUX_TAR) | (cd $(DESTDIR)$(sharedir) && tar xzvf -)
+-	dlxrc=$(DESTDIR)$(sharedir)/dlxlinux/bochsrc.txt; mv "$$dlxrc" "$$dlxrc.orig" && sed < "$$dlxrc.orig" 's/\/usr\/local\/bochs\/latest/../' > "$$dlxrc" && rm -f "$$dlxrc.orig"
+ 	mv $(srcdir)/README $(srcdir)/README.orig
+ 	cat $(srcdir)/build/macosx/README.macosx-binary $(srcdir)/README.orig > $(DESTDIR)$(sharedir)/README
+ 	rm -f $(DESTDIR)$(sharedir)/README.orig
+-	$(CPMAC) $(SCRIPT_EXEC) $(DESTDIR)$(sharedir)/dlxlinux
+ #	for i in $(TEXT_FILE_LIST); do mv $(srcdir)/$$i $(DESTDIR)$(sharedir)/$$i.txt; done
  
  ###########################################
diff --git a/emulators/bochs/patches/patch-ae b/emulators/bochs/patches/patch-ae
deleted file mode 100644
index 230cc08d65a..00000000000
--- a/emulators/bochs/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2005/12/03 03:17:14 ben Exp $
-
---- iodev/eth_tuntap.cc.orig	2005-05-21 00:38:29.000000000 -0700
-+++ iodev/eth_tuntap.cc
-@@ -58,7 +58,7 @@
- #include <linux/if_tun.h>
- #else
- #include <net/if.h>
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__NetBSD__)
- #include <net/if_tap.h>
- #endif
- #endif