Update bochs to 991023a.

relevant changes since 980707:
new BIOS
many many fixes
integrated debugger additions
Pentium emulation

It's now possible to boot NetBSD inside bochs. (Remaining problems:
missing BIOS INT15/86 (delay), IDE disk recognition, timer interrupt too
fast, pccons-isapnp clash)

9 files changed, 143 insertions, 104 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index e1d5689d1ec..53a9e5c41e5 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,18 +1,15 @@
-# $NetBSD: Makefile,v 1.5 1999/05/24 20:39:39 tv Exp $
+# $NetBSD: Makefile,v 1.6 1999/10/25 16:05:37 drochner Exp $
 
-DISTNAME=		bochs-980707a
+DISTNAME=		bochs-991023a
 CATEGORIES=		emulators
-MASTER_SITES=		ftp://ftp.std.com/pub/bochs/
+MASTER_SITES=		ftp://bochs.com/pub/
 
 MAINTAINER=		root@garbled.net
-HOMEPAGE=		http://world.std.com/~bochs/
+HOMEPAGE=		http://www.bochs.com/
 
 NOT_FOR_PLATFORM=	*-*-alpha	#runs, SEGV.
 
 LICENSE=		shareware
-WRKSRC=			${WRKDIR}/bochs-980707
-USE_GMAKE=		yes
-CONFIGURE_ARGS+=	--enable-vga #--with-x11
 GNU_CONFIGURE=		yes
 USE_X11BASE=		yes
 
@@ -21,15 +18,16 @@ post-configure:
 
 do-install:
 	${MKDIR} ${PREFIX}/share/bochs/bios
-	${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-980702a ${PREFIX}/share/bochs/bios
+	${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-990925a ${PREFIX}/share/bochs/bios
 	${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.20 ${PREFIX}/share/bochs/bios
-	${MKDIR} ${PREFIX}/share/doc/bochs
-	${INSTALL_DATA} ${WRKSRC}/docs-html/* ${PREFIX}/share/doc/bochs
-	${INSTALL_DATA} ${WRKSRC}/font/hercules.bdf ${X11BASE}/lib/X11/fonts/misc
-	${INSTALL_DATA} ${WRKSRC}/font/vga.bdf ${X11BASE}/lib/X11/fonts/misc
-	${INSTALL_DATA} ${WRKSRC}/font/vga.pcf ${X11BASE}/lib/X11/fonts/misc
+	${MKDIR} ${PREFIX}/share/bochs/doc
+	${INSTALL_DATA} ${WRKSRC}/docs-html/* ${PREFIX}/share/bochs/doc
+	${MKDIR} ${PREFIX}/share/bochs/xfonts
+	${INSTALL_DATA} ${WRKSRC}/font/hercules.bdf ${PREFIX}/share/bochs/xfonts
+	${INSTALL_DATA} ${WRKSRC}/font/vga.bdf ${PREFIX}/share/bochs/xfonts
+	${INSTALL_DATA} ${WRKSRC}/font/vga.pcf ${PREFIX}/share/bochs/xfonts
 	${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/bochsrc ${PREFIX}/share/bochs
-	${X11BASE}/bin/mkfontdir ${X11BASE}/lib/X11/fonts/misc
+	${X11BASE}/bin/mkfontdir ${PREFIX}/share/bochs/xfonts
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/bochs/files/md5 b/emulators/bochs/files/md5
index 463d29a793b..97dba7cbe05 100644
--- a/emulators/bochs/files/md5
+++ b/emulators/bochs/files/md5
@@ -1,3 +1,2 @@
-$NetBSD: md5,v 1.1 1998/09/06 06:51:04 garbled Exp $
-
-MD5 (bochs-980707a.tar.gz) = 1e21b04444d61e2c8a4adb85afcb9b4e
+$NetBSD: md5,v 1.2 1999/10/25 16:05:38 drochner Exp $
+MD5 (bochs-991023a.tar.gz) = 1f693993033bca6620f7f68d004ff113
diff --git a/emulators/bochs/files/patch-sum b/emulators/bochs/files/patch-sum
index cd6b38d8082..8d4f94ce1b4 100644
--- a/emulators/bochs/files/patch-sum
+++ b/emulators/bochs/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:46 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/25 16:05:38 drochner Exp $
 
-MD5 (patch-aa) = 66bbd42d0db0dd34927e7cba448c68b7
-MD5 (patch-ab) = 99299d752653b7c7e9237c10dc1f6bd7
+MD5 (patch-aa) = 448b1fcc6096d0225d8ee5d81d3fda91
+MD5 (patch-ab) = 73d5e0a72d694ca148a23e154105dab4
+MD5 (patch-ac) = aa14eccc54c9bb8b5c26eb8583a13ae9
+MD5 (patch-ad) = 702e68d23534f772c21aacb7680fc136
diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa
index 902bfe9b2aa..ea2872db727 100644
--- a/emulators/bochs/patches/patch-aa
+++ b/emulators/bochs/patches/patch-aa
@@ -1,38 +1,52 @@
-$NetBSD: patch-aa,v 1.1 1998/09/06 06:51:05 garbled Exp $
---- .bochsrc.orig	Sat Sep  5 16:56:33 1998
-+++ .bochsrc	Sat Sep  5 16:59:02 1998
-@@ -20,8 +20,10 @@
+$NetBSD: patch-aa,v 1.2 1999/10/25 16:05:38 drochner Exp $
+--- .bochsrc.orig	Sat Oct 23 08:23:24 1999
++++ .bochsrc	Mon Oct 25 17:37:19 1999
+@@ -2,8 +2,8 @@
+ megs: 32
+ #megs: 16
+ #megs: 8
+-boot: c
+-vgaromimage: bios/VGABIOS-elpin-2.20
++boot: a
++vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.20
+ 
+ # You many now use double quotes around pathnames, in case
+ # your pathname includes spaces.
+@@ -32,7 +32,7 @@
+ #diskc: file=../585M, cyl=1162, heads=16, spt=63
+ #diskc: file=../528M, cyl=1024, heads=16, spt=63
+ 
+-diskc: file=../62M.980115, cyl=940, heads=8, spt=17
++#diskc: file=../62M.980115, cyl=940, heads=8, spt=17
+ #diskc: file="../10M.vga", cyl=306, heads=4, spt=17
+ #diskc: file=../10M.dos622, cyl=306, heads=4, spt=17
+ #diskc: file=../30M.freebsd, cyl=615, heads=6, spt=17
+@@ -47,7 +47,7 @@
+ #diskc: file=../10M.win31, cyl=306, heads=4, spt=17
  #diskc: file=../rrrr, cyl=1, heads=2, spt=18
- #floppya: 1_44=/vol/dev/aliases/floppy0, status=inserted
  
+-cdromd: dev=/dev/cdrom, status=inserted
++#cdromd: dev=/dev/cdrom, status=inserted
+ #cdromd: dev=/dev/cdrom, status=ejected
+ 
+ 
+@@ -57,7 +57,9 @@
+ #floppya: 1_44=../1.44.freebsd, status=inserted
+ #floppya: 720k=../720k.dos33, status=inserted
+ 
+-floppya: 1_44=../1.44a, status=inserted
 +floppya: 1_44=/dev/rfd0a, status=inserted
 +
- #floppya: 1_44=../1.44, status=inserted
--floppya: 720k=../720k.dos33, status=inserted
-+#floppya: 720k=../720k.dos33, status=inserted
- 
- #floppya: 1_44=../1.44a, status=inserted
++#floppya: 1_44=../1.44a, status=inserted
+ #floppyb: 1_44=../1.44b, status=inserted
+ #floppya: 1_44=/dev/fd0, status=inserted
  #floppyb: 1_44=../1.44b, status=inserted
-@@ -30,11 +32,11 @@
- #floppya: 1_44=../1.44.yodlowsk
+@@ -67,7 +69,7 @@
  #floppya: 1_2=../1.2
  #floppyb: 1_44=../1.680
--vgaromimage: bios/VGABIOS-elpin-2.20
-+vgaromimage: XXXPREFIXXXX/share/bochs/bios/VGABIOS-elpin-2.20
- #romimage: bios/rombios.bin
- #romimage: bios/BIOS-bochs-980331a
- #romimage: bios/BIOS-bochs-980622a
--romimage: bios/BIOS-bochs-980702a
-+romimage: XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-980702a
- #romimage: ../cbios961203
- 
- #romimage: ../cbios961112
-@@ -42,7 +44,7 @@
- #romimage: ../cbios961203
- 
- #log: /dev/null
--log: ./bochs.out
-+log: XXXPREFIXXXX/share/bochs/bochs.out
- keyboard_serial_delay: 200  #microseconds
- floppy_command_delay: 500   #microseconds
- #ips:  1500000
+ 
+-romimage: file=bios/BIOS-bochs-990925a, address=0xf0000
++romimage: file=XXXPREFIXXXX/share/bochs/bios/BIOS-bochs-990925a, address=0xf0000
+ 
+ #romimage: file=bios/rombios.bin, address=0xf0000
+ #romimage: file=../cbios961203
diff --git a/emulators/bochs/patches/patch-ab b/emulators/bochs/patches/patch-ab
index f65a2f7a5b5..bec68e63b7a 100644
--- a/emulators/bochs/patches/patch-ab
+++ b/emulators/bochs/patches/patch-ab
@@ -1,18 +1,12 @@
-$NetBSD: patch-ab,v 1.1 1998/09/06 06:51:05 garbled Exp $
---- Makefile.in.orig	Sun Jun 28 22:20:48 1998
-+++ Makefile.in	Sat Sep  5 23:09:05 1998
-@@ -27,11 +27,11 @@
- CFLAGS = @CFLAGS@
- CXXFLAGS = @CXXFLAGS@
- 
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = -Wl,-R${X11BASE}/lib @LDFLAGS@
- LIBS = @LIBS@
--X_LIBS = @X_LIBS@
-+X_LIBS = -L${X11BASE}/lib
- X_PRE_LIBS = @X_PRE_LIBS@
--GUI_LINK_OPTS_X = $(X_LIBS) $(X_PRE_LIBS) -lX11
-+GUI_LINK_OPTS_X =  $(LDFLAGS) $(X_LIBS) $(X_PRE_LIBS) -lX11
- GUI_LINK_OPTS_BEOS =
- GUI_LINK_OPTS_WIN32 = -luser32 -lgdi32 -lwinmm -lcomdlg32 -lcomctl32
- GUI_LINK_OPTS_WIN32_VC50 = user32.lib gdi32.lib winmm.lib comdlg32.lib comctl32.lib
+$NetBSD: patch-ab,v 1.2 1999/10/25 16:05:38 drochner Exp $
+--- Makefile.in.orig	Sat Oct 23 21:34:14 1999
++++ Makefile.in	Sat Oct 23 21:35:39 1999
+@@ -101,7 +101,7 @@
+            @DISASM_VAR@ @INSTRUMENT_VAR@ @DYNAMIC_VAR@ $(BX_OBJS) \
+            $(SIMX86_OBJS) \
+            $(FPU_LIB)
+-	@LINK@ $(BX_OBJS) \
++	@LINK@ $(LDFLAGS) $(BX_OBJS) \
+                 $(SIMX86_OBJS) \
+ 		iodev/libiodev.a \
+ 		cpu/libcpu.a memory/libmemory.a gui/libgui.a \
diff --git a/emulators/bochs/patches/patch-ac b/emulators/bochs/patches/patch-ac
new file mode 100644
index 00000000000..9f3d7ad964a
--- /dev/null
+++ b/emulators/bochs/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 1999/10/25 16:05:38 drochner Exp $
+--- iodev/keyboard.cc.orig	Sun Oct 24 00:17:37 1999
++++ iodev/keyboard.cc	Sun Oct 24 00:18:02 1999
+@@ -972,6 +972,11 @@
+       return;
+       break;
+ 
++    case 0xf0: // set scancode - let OS time out
++      bx_printf("KBD: set scancode command received\n");
++      return;
++      break;
++
+     case 0xf2:  // identify keyboard
+       bx_printf("KBD: indentify keyboard command received\n");
+       kbd_enQ(0xFA); // AT sends ACK, MFII sends ACK+ABh+41h
diff --git a/emulators/bochs/patches/patch-ad b/emulators/bochs/patches/patch-ad
new file mode 100644
index 00000000000..760f0bc33ed
--- /dev/null
+++ b/emulators/bochs/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.1 1999/10/25 16:05:38 drochner Exp $
+--- iodev/harddrv.cc.orig	Sun Oct 24 00:17:53 1999
++++ iodev/harddrv.cc	Sun Oct 24 00:18:09 1999
+@@ -492,7 +492,10 @@
+         value8 = BX_SELECTED_CONTROLLER.sector_count;
+         goto return_value8;
+         }
+-      bx_panic("disk: IO read(0x1f2): current command not read/write\n");
++      bx_printf("disk: IO read(0x1f2): current command not read/write (%x)\n",
++	BX_SELECTED_CONTROLLER.current_command);
++      value8 = 0xff;
++      goto return_value8;
+       break;
+ 
+     case 0x1f3: // sector number
diff --git a/emulators/bochs/pkg/MESSAGE b/emulators/bochs/pkg/MESSAGE
index 4bae8ed50b2..6d51e7c0c27 100644
--- a/emulators/bochs/pkg/MESSAGE
+++ b/emulators/bochs/pkg/MESSAGE
@@ -3,6 +3,6 @@ directory and name it .bochsrc.  Then edit it to your
 tastes defining the hard drives, and floppies as needed.
 
 Documentation is available on the website, and a copy of that
-website is in share/doc/bochs/.  The file install.html will
+website is in share/bochs/doc/.  The file install.html will
 assist you in creating a HD "file". (A raw disk partition can
 be used as well)
diff --git a/emulators/bochs/pkg/PLIST b/emulators/bochs/pkg/PLIST
index a34fdd89e51..023718a3a7c 100644
--- a/emulators/bochs/pkg/PLIST
+++ b/emulators/bochs/pkg/PLIST
@@ -1,39 +1,41 @@
-@comment $NetBSD: PLIST,v 1.2 1998/11/12 23:03:40 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/10/25 16:05:38 drochner Exp $
 bin/bochs
-lib/X11/fonts/misc/fonts.dir
-lib/X11/fonts/misc/hercules.bdf
-lib/X11/fonts/misc/vga.bdf
-lib/X11/fonts/misc/vga.pcf
-@exec %D/bin/mkfontdir %D/lib/X11/fonts/misc
-@unexec %D/bin/mkfontdir %D/lib/X11/fonts/misc
-share/doc/bochs/00README
-share/doc/bochs/3rdparty.license.html
-share/doc/bochs/DOS.html
-share/doc/bochs/LICENSE
-share/doc/bochs/Linux.html
-share/doc/bochs/Minix.html
-share/doc/bochs/OldWindows95.html
-share/doc/bochs/WISHLIST
-share/doc/bochs/Windows31.html
-share/doc/bochs/Windows95.html
-share/doc/bochs/changelog.html
-share/doc/bochs/company.html
-share/doc/bochs/construction.html
-share/doc/bochs/debugger.html
-share/doc/bochs/developers.html
-share/doc/bochs/drawing_board.html
-share/doc/bochs/features.html
-share/doc/bochs/index.html
-share/doc/bochs/install.html
-share/doc/bochs/jbochs.html
-share/doc/bochs/licensing.html
-share/doc/bochs/mtools.html
-share/doc/bochs/undercon.gif
-share/doc/bochs/whatisbochs.html
-share/doc/bochs/win32.html
-share/bochs/bios/BIOS-bochs-980702a
+share/bochs/doc/00README
+share/bochs/doc/3rdparty.license.html
+share/bochs/doc/DOS.html
+share/bochs/doc/LICENSE
+share/bochs/doc/Linux.html
+share/bochs/doc/Minix.html
+share/bochs/doc/OldWindows95.html
+share/bochs/doc/Windows31.html
+share/bochs/doc/Windows95.html
+share/bochs/doc/changelog.html
+share/bochs/doc/codingguidelines.html
+share/bochs/doc/configure.html
+share/bochs/doc/construction.html
+share/bochs/doc/cosimulation.html
+share/bochs/doc/debugger.html
+share/bochs/doc/developers.html
+share/bochs/doc/faq.html
+share/bochs/doc/features.html
+share/bochs/doc/fpu.html
+share/bochs/doc/index.html
+share/bochs/doc/install.html
+share/bochs/doc/instrumentation.html
+share/bochs/doc/licensing.html
+share/bochs/doc/mtools.html
+share/bochs/doc/undercon.gif
+share/bochs/doc/whatisbochs.html
+share/bochs/doc/win32.html
+share/bochs/bios/BIOS-bochs-990925a
 share/bochs/bios/VGABIOS-elpin-2.20
+@exec %D/bin/mkfontdir %D/share/bochs/xfonts
+share/bochs/xfonts/fonts.dir
+share/bochs/xfonts/hercules.bdf
+share/bochs/xfonts/vga.bdf
+share/bochs/xfonts/vga.pcf
 share/bochs/bochsrc
-@dirrm share/doc/bochs
+@dirrm share/bochs/doc
 @dirrm share/bochs/bios
+@dirrm share/bochs/xfonts
 @dirrm share/bochs