Update bochs to 2.1. Changes:

- New disassembler
- 3DNow!/SSE/SSE2/PNI instruction support
- Vmware3/Sparse/Undoable/Growing harddisk images support
- many VGA emulation improvements (e.g. high/true color VBE modes added)
- No more X11 vga font required

7 files changed, 60 insertions, 188 deletions

diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa
index 5d0c8b492dc..bca237b82e8 100644
--- a/emulators/bochs/patches/patch-aa
+++ b/emulators/bochs/patches/patch-aa
@@ -1,32 +1,36 @@
-$NetBSD: patch-aa,v 1.8 2002/12/25 01:12:37 uebayasi Exp $
+$NetBSD: patch-aa,v 1.9 2004/02/12 00:10:31 hubertf Exp $
 
---- .bochsrc.orig	Sun Dec 22 04:30:48 2002
+--- .bochsrc.orig	Mon Dec 29 22:51:53 2003
 +++ .bochsrc
-@@ -66,9 +66,9 @@
- # directory, named BIOS-bochs-latest. 
+@@ -66,10 +66,10 @@
+ # You can also use the environment variable $BXSHARE to specify the
+ # location of the BIOS.
  #=======================================================================
- #romimage: bios/BIOS-bochs-970717a
--romimage: file=bios/BIOS-bochs-latest, address=0xf0000
+-romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
 -#romimage: file=bios/BIOS-bochs-2-processors, address=0xf0000
 -#romimage: file=bios/BIOS-bochs-4-processors, address=0xf0000
-+romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-latest, address=0xf0000
-+#romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-2-processors, address=0xf0000
-+#romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-4-processors, address=0xf0000
- #romimage: file=bios/rombios.bin, address=0xf0000
+-#romimage: file=bios/rombios.bin, address=0xf0000
++romimage: file=XXXPREFIXXXX/share/bochs/BIOS-bochs-latest, address=0xf0000
++#romimage: file=XXXPREFIXXXX/share/bochs/BIOS-bochs-2-processors, address=0xf0000
++#romimage: file=XXXPREFIXXXX/share/bochs/BIOS-bochs-4-processors, address=0xf0000
++#romimage: file=XXXPREFIXXXX/share/bochs/rombios.bin, address=0xf0000
  
  #=======================================================================
-@@ -105,8 +105,8 @@
+ # MEGS
+@@ -105,9 +105,9 @@ megs: 32
  # VGAROMIMAGE
  # You now need to load a VGA ROM BIOS into C0000.
  #=======================================================================
 -#vgaromimage: bios/VGABIOS-lgpl-latest
--vgaromimage: bios/VGABIOS-elpin-2.40
-+#vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-lgpl-latest
-+vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.40
+-#vgaromimage: bios/VGABIOS-elpin-2.40
+-vgaromimage: $BXSHARE/VGABIOS-elpin-2.40
++#vgaromimage: XXXPREFIXXXX/share/bochs/VGABIOS-lgpl-latest
++#vgaromimage: XXXPREFIXXXX/share/bochs/VGABIOS-elpin-2.40
++vgaromimage: XXXPREFIXXXX/share/bochs/VGABIOS-elpin-2.40
  
  #=======================================================================
  # FLOPPYA:
-@@ -126,7 +126,7 @@
+@@ -130,7 +130,7 @@ vgaromimage: $BXSHARE/VGABIOS-elpin-2.40
  # drive letters such as a: or b: as the path.  Raw floppy access is not
  # supported on Windows 95 and 98.
  #=======================================================================
@@ -35,25 +39,16 @@ $NetBSD: patch-aa,v 1.8 2002/12/25 01:12:37 uebayasi Exp $
  #floppya: file=../1.44, status=inserted
  #floppya: 1_44=/dev/fd0H1440, status=inserted
  #floppya: 1_2=../1_2, status=inserted
-@@ -206,7 +206,7 @@
- #   ata3-master: type=disk, path=483M.sample, cylinders=1024, heads=15, spt=63
+@@ -214,7 +214,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=
+ #   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, path="30M.sample", cylinders=615, heads=6, spt=17
-+#ata0-master: type=disk, 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", cylinders=615, heads=6, spt=17
  #ata0-slave: type=cdrom, path=D:, status=inserted
  #ata0-slave: type=cdrom, path=/dev/cdrom, status=inserted
  #ata0-slave: type=cdrom, path="drive", status=inserted
-@@ -263,7 +263,7 @@
- # NOTE: diskd and cdromd must not be used together!
- #=======================================================================
- #cdromd: dev=D:, status=inserted
--#cdromd: dev=/dev/cdrom, status=inserted
-+cdromd: dev=/dev/rcd0d, status=ejected
- #cdromd: dev="drive", status=inserted
- 
- #=======================================================================
-@@ -285,7 +285,8 @@
+@@ -233,7 +233,8 @@ ata0-master: type=disk, mode=flat, path=
  #   boot: a
  #=======================================================================
  #boot: floppy
@@ -62,4 +57,13 @@ $NetBSD: patch-aa,v 1.8 2002/12/25 01:12:37 uebayasi Exp $
 +boot: a
  
  #=======================================================================
- # FLOPPY_BOOTSIG_CHECK: disabled=[0|1]
+ # IPS:
+@@ -678,7 +679,7 @@ usb1: enabled=1, ioaddr=0xFF80, irq=10
+ # NOTE: diskd and cdromd must not be used together!
+ #=======================================================================
+ #cdromd: dev=D:, status=inserted
+-#cdromd: dev=/dev/cdrom, status=inserted
++#cdromd: dev=/dev/rcd0d, status=ejected
+ #cdromd: dev="drive", status=inserted
+ 
+ #=======================================================================
diff --git a/emulators/bochs/patches/patch-ab b/emulators/bochs/patches/patch-ab
index f5a9951d796..6f82f1a5a1f 100644
--- a/emulators/bochs/patches/patch-ab
+++ b/emulators/bochs/patches/patch-ab
@@ -1,78 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2003/10/24 22:03:53 bouyer Exp $
+$NetBSD: patch-ab,v 1.6 2004/02/12 00:10:32 hubertf Exp $
 
---- cpu/fetchdecode.cc.orig	2003-10-18 20:42:56.000000000 +0200
-+++ cpu/fetchdecode.cc	2003-10-18 20:45:25.000000000 +0200
-@@ -160,53 +160,53 @@
- } BxOpcodeInfo_t;
- 
- static BxOpcodeInfo_t opcodesADD_EwIw[2] = {
--  { 0,  { &BX_CPU_C::ADD_EEwIw } },
--  { 0,  { &BX_CPU_C::ADD_EGwIw } }
-+  { 0,  &BX_CPU_C::ADD_EEwIw  },
-+  { 0,  &BX_CPU_C::ADD_EGwIw  }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_EdId[2] = {
--  { 0,  { &BX_CPU_C::ADD_EEdId } },
--  { 0,  { &BX_CPU_C::ADD_EGdId } }
-+  { 0,  &BX_CPU_C::ADD_EEdId },
-+  { 0,  &BX_CPU_C::ADD_EGdId }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_GwEw[2] = {
--  { 0,  { &BX_CPU_C::ADD_GwEEw } },
--  { 0,  { &BX_CPU_C::ADD_GwEGw } }
-+  { 0,  &BX_CPU_C::ADD_GwEEw },
-+  { 0,  &BX_CPU_C::ADD_GwEGw }
-   };
- 
- static BxOpcodeInfo_t opcodesADD_GdEd[2] = {
--  { 0,  { &BX_CPU_C::ADD_GdEEd } },
--  { 0,  { &BX_CPU_C::ADD_GdEGd } }
-+  { 0,  &BX_CPU_C::ADD_GdEEd },
-+  { 0,  &BX_CPU_C::ADD_GdEGd }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GbEb[2] = {
--  { 0,  { &BX_CPU_C::MOV_GbEEb } },
--  { 0,  { &BX_CPU_C::MOV_GbEGb } }
-+  { 0,  &BX_CPU_C::MOV_GbEEb },
-+  { 0,  &BX_CPU_C::MOV_GbEGb }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GwEw[2] = {
--  { 0,  { &BX_CPU_C::MOV_GwEEw } },
--  { 0,  { &BX_CPU_C::MOV_GwEGw } }
-+  { 0,  &BX_CPU_C::MOV_GwEEw },
-+  { 0,  &BX_CPU_C::MOV_GwEGw }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_GdEd[2] = {
--  { 0,  { &BX_CPU_C::MOV_GdEEd } },
--  { 0,  { &BX_CPU_C::MOV_GdEGd } }
-+  { 0,  &BX_CPU_C::MOV_GdEEd },
-+  { 0,  &BX_CPU_C::MOV_GdEGd }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EbGb[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEbGb } },
--  { 0,  { &BX_CPU_C::MOV_EGbGb } }
-+  { 0,  &BX_CPU_C::MOV_EEbGb },
-+  { 0,  &BX_CPU_C::MOV_EGbGb }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EwGw[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEwGw } },
--  { 0,  { &BX_CPU_C::MOV_EGwGw } }
-+  { 0,  &BX_CPU_C::MOV_EEwGw },
-+  { 0,  &BX_CPU_C::MOV_EGwGw }
-   };
- 
- static BxOpcodeInfo_t opcodesMOV_EdGd[2] = {
--  { 0,  { &BX_CPU_C::MOV_EEdGd } },
--  { 0,  { &BX_CPU_C::MOV_EGdGd } }
-+  { 0,  &BX_CPU_C::MOV_EEdGd },
-+  { 0,  &BX_CPU_C::MOV_EGdGd }
-   };
- 
- /* ********** */
+--- iodev/eth_tap.cc.orig	Thu Oct  2 13:33:41 2003
++++ iodev/eth_tap.cc
+@@ -100,7 +100,7 @@
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+ #include <sys/wait.h>
+-#if defined(__FreeBSD__) || defined(__APPLE__)  // Should be fixed for other *BSD
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)  // Should be fixed for other *BSD
+ #include <net/if.h>
+ #else
+ #include <asm/types.h>
diff --git a/emulators/bochs/patches/patch-ad b/emulators/bochs/patches/patch-ad
index 39f1aae2d34..4064431708f 100644
--- a/emulators/bochs/patches/patch-ad
+++ b/emulators/bochs/patches/patch-ad
@@ -1,27 +1,15 @@
-$NetBSD: patch-ad,v 1.5 2002/12/25 01:12:38 uebayasi Exp $
+$NetBSD: patch-ad,v 1.6 2004/02/12 00:10:32 hubertf Exp $
 
---- iodev/cdrom.cc.orig	Tue Dec 24 12:50:46 2002
-+++ iodev/cdrom.cc
-@@ -662,6 +662,22 @@
-     return(true);
- }
- 
-+  int
-+cdrom_interface::start_cdrom()
-+{
-+  // Spin up the cdrom drive.
-+
-+  if (fd >= 0) {
-+#if defined(__NetBSD__)
-+    if (ioctl (fd, CDIOCSTART) < 0)
-+       BX_DEBUG(( "start_cdrom: start returns error: %s", strerror (errno) ));
-+    return(true);
-+#else
-+    BX_INFO(("start_cdrom: your OS is not supported yet."));
-+    return(false); // OS not supported yet, return false always.
-+#endif
-+    }
-+}
- 
-   void
- cdrom_interface::eject_cdrom()
+--- Makefile.in.orig	Mon Dec 29 22:53:03 2003
++++ Makefile.in
+@@ -70,8 +70,8 @@ MKDIR=mkdir
+ RMDIR=rmdir
+ TAR=tar
+ CHMOD=chmod
+-GZIP=gzip -9
+-GUNZIP=gunzip
++GZIP=${GZIP_CMD} -9
++GUNZIP=${GUNZIP_CMD}
+ ZIP=zip
+ UNIX2DOS=unix2dos
+ LIBTOOL=@LIBTOOL@
diff --git a/emulators/bochs/patches/patch-ae b/emulators/bochs/patches/patch-ae
deleted file mode 100644
index 6bc9f28d87e..00000000000
--- a/emulators/bochs/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/12/25 01:12:38 uebayasi Exp $
-
---- debug/lexer.c.orig	Tue Nov 19 18:25:20 2002
-+++ debug/lexer.c
-@@ -1379,7 +1379,7 @@
- case 110:
- YY_RULE_SETUP
- #line 133 "../../debug/lexer.l"
--{ bxlval.ulval = strtoull(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); }
-+{ bxlval.ulval = strtouq(bxtext, NULL, 10); return(BX_TOKEN_LONG_NUMERIC); }
- 	YY_BREAK
- case 111:
- YY_RULE_SETUP
diff --git a/emulators/bochs/patches/patch-af b/emulators/bochs/patches/patch-af
deleted file mode 100644
index 7ed841ccf97..00000000000
--- a/emulators/bochs/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.4 2002/12/25 01:12:38 uebayasi Exp $
-
---- iodev/harddrv.cc.orig	Sun Dec 15 06:29:42 2002
-+++ iodev/harddrv.cc
-@@ -1323,8 +1323,8 @@
- 					  BX_ERROR(("FIXME: Stop disc not implemented"));
- 					  atapi_cmd_nop(channel);
- 					  raise_interrupt(channel);
--				    } else if (!LoEj && Start) { // start the disc and read the TOC
--					  // BX_PANIC(("Start disc not implemented"));
-+				    } else if (!LoEj && Start) { // start (spin up) the disc
-+					  BX_SELECTED_DRIVE(channel).cdrom.cd->start_cdrom();
- 					  BX_ERROR(("FIXME: ATAPI start disc not reading TOC"));
- 					  atapi_cmd_nop(channel);
- 					  raise_interrupt(channel);
diff --git a/emulators/bochs/patches/patch-ag b/emulators/bochs/patches/patch-ag
deleted file mode 100644
index 687c91a728c..00000000000
--- a/emulators/bochs/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2002/05/14 13:52:52 fredb Exp $
-
---- iodev/cdrom.h.orig	Fri Feb  1 10:46:28 2002
-+++ iodev/cdrom.h
-@@ -49,6 +49,9 @@
-   // Read a single block from the CD
-   void read_block(uint8* buf, int lba);
- 
-+  // Start (spin up) the CD.
-+  int start_cdrom();
-+
- private:
-   int fd;
-   char *path;
diff --git a/emulators/bochs/patches/patch-ah b/emulators/bochs/patches/patch-ah
deleted file mode 100644
index 0ef05166244..00000000000
--- a/emulators/bochs/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2002/12/30 05:52:41 uebayasi Exp $
-
---- config.h.in.orig	Sun Dec 22 04:30:48 2002
-+++ config.h.in
-@@ -804,7 +804,7 @@
- #ifdef BX_USE_ETH_ARPBACK
- #  define ETH_ARPBACK 1
- #endif
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
- #define ETH_FBSD  1
- #endif
- #if defined(linux)