diff options
author | ben <ben@pkgsrc.org> | 2005-11-26 06:15:00 +0000 |
---|---|---|
committer | ben <ben@pkgsrc.org> | 2005-11-26 06:15:00 +0000 |
commit | 58c8ef2470d132af107ab4ff97792f030b311715 (patch) | |
tree | bac825ce9a524f3cd72a006f9429cbf2ba0e83a0 /emulators | |
parent | f2eb252a05e7c21927394f907f4cd7272e048579 (diff) | |
download | pkgsrc-58c8ef2470d132af107ab4ff97792f030b311715.tar.gz |
Update bochs to version 2.2.1. Changes include:
- Fixed several compilation warnings and errors for different platforms (Volker)
- Fixed FPU tag word restore in FXRSTOR instruction (Stanislav)
- Added missing scancodes for F11 and F12 to BIOS translation table (Volker)
- Bochs disassembler bugfixes (h.johansson)
- About 5% emulation speed improvement (h.johansson)
- Handle writing of zero to APIC timer initial count register (Stanislav)
- Enable Idle-Hack for 'TERM' GUI (h.johansson)
- Reduced overhead of BX_SHOW_IPS option to minimum. Now every simulation
could run with --enable-show-ips without significant performance
penalty. (Stanislav)
- Fixed pcipnic register access (Volker)
- Limited write support for TFTP server in 'vnet' networking module added (Volker)
- Changed some timing defaults changed to more useful values (Volker)
- WinXP/2003 style common controls now supported (Vitaly Vorobyov)
- Updated LGPL'd VGABIOS to version 0.5c (Volker)
- New floating point emulator based on SoftFloat floating point
emulation library.
- improved x86-64 emulation
- Cirrus SVGA card emulation added
- status bar with indicators for keyboard, floppy, cdrom and disk (gui dependant)
- many improvements in Bochs emulated I/O devices (e.g. PCI subsystem)
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/bochs/Makefile | 7 | ||||
-rw-r--r-- | emulators/bochs/PLIST | 7 | ||||
-rw-r--r-- | emulators/bochs/distinfo | 14 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-aa | 54 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-ab | 13 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-ad | 12 |
6 files changed, 47 insertions, 60 deletions
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index e8efe94790f..56e260e7d79 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.41 2005/06/01 18:02:46 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/11/26 06:15:00 ben Exp $ -DISTNAME= bochs-2.1.1 -PKGREVISION= 1 +DISTNAME= bochs-2.2.1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://bochs.sourceforge.net/ -COMMENT= i386 machine emulator capable of running DOS/Windows +COMMENT= IA32 and AMD64 PC emulator GNU_CONFIGURE= yes USE_TOOLS+= gmake diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST index 20f91997438..1445e2a3d7c 100644 --- a/emulators/bochs/PLIST +++ b/emulators/bochs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/02/12 00:10:31 hubertf Exp $ +@comment $NetBSD: PLIST,v 1.7 2005/11/26 06:15:00 ben Exp $ bin/bochs bin/bxcommit bin/bximage @@ -15,8 +15,9 @@ share/bochs/VGABIOS-elpin-2.40 share/bochs/VGABIOS-elpin-LICENSE share/bochs/VGABIOS-lgpl-README share/bochs/VGABIOS-lgpl-latest +share/bochs/VGABIOS-lgpl-latest-cirrus +share/bochs/VGABIOS-lgpl-latest-cirrus-debug share/bochs/VGABIOS-lgpl-latest-debug -share/bochs/keymaps/convertmap.pl share/bochs/keymaps/sdl-pc-de.map share/bochs/keymaps/sdl-pc-us.map share/bochs/keymaps/x11-pc-be.map @@ -25,12 +26,14 @@ share/bochs/keymaps/x11-pc-de.map share/bochs/keymaps/x11-pc-es.map share/bochs/keymaps/x11-pc-fr.map share/bochs/keymaps/x11-pc-it.map +share/bochs/keymaps/x11-pc-ru.map share/bochs/keymaps/x11-pc-se.map share/bochs/keymaps/x11-pc-uk.map share/bochs/keymaps/x11-pc-us.map share/doc/bochs/CHANGES share/doc/bochs/COPYING share/doc/bochs/README +share/doc/bochs/TODO share/doc/bochs/bochsrc-sample.txt @dirrm share/doc/bochs @dirrm share/bochs/keymaps diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo index 558a3a12d37..02a8dc11c71 100644 --- a/emulators/bochs/distinfo +++ b/emulators/bochs/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.17 2005/02/23 18:49:17 agc Exp $ +$NetBSD: distinfo,v 1.18 2005/11/26 06:15:00 ben Exp $ -SHA1 (bochs-2.1.1.tar.gz) = 4d3ab662a4fb01d85cc77d7f8ddbd1f7a19b08e7 -RMD160 (bochs-2.1.1.tar.gz) = e43ec6f58c8b8f2af0d4089682aa9a81bd5e6b1a -Size (bochs-2.1.1.tar.gz) = 3653487 bytes -SHA1 (patch-aa) = efa5e0be4b19b36032f4f15b60ecc13054852af9 -SHA1 (patch-ab) = 55f4c9d7de56ffe02673e627717648e80f9a1bd4 -SHA1 (patch-ad) = 8287d00e11892b6c78bc0c89590acd91e992ca69 +SHA1 (bochs-2.2.1.tar.gz) = 72a59872189ab4b206c09c6ccfb83fe0ee988b8e +RMD160 (bochs-2.2.1.tar.gz) = 2cf906281a71cc6db546da715852ac98aab074cc +Size (bochs-2.2.1.tar.gz) = 3785329 bytes +SHA1 (patch-aa) = a6888ff31c879e3ba96297ddfe2f38f6ed723918 +SHA1 (patch-ad) = 03191808449d6bee665046f242ec3356614021f4 +SHA1 (patch-ae) = b8092c73b77adebc054e7adf4a773206af726bf5 diff --git a/emulators/bochs/patches/patch-aa b/emulators/bochs/patches/patch-aa index bca237b82e8..e4c9624eb23 100644 --- a/emulators/bochs/patches/patch-aa +++ b/emulators/bochs/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.9 2004/02/12 00:10:31 hubertf Exp $ +$NetBSD: patch-aa,v 1.10 2005/11/26 06:15:00 ben Exp $ ---- .bochsrc.orig Mon Dec 29 22:51:53 2003 +--- .bochsrc.orig 2005-07-06 12:59:47.000000000 -0700 +++ .bochsrc -@@ -66,10 +66,10 @@ +@@ -70,10 +70,10 @@ # You can also use the environment variable $BXSHARE to specify the # location of the BIOS. #======================================================================= @@ -17,29 +17,36 @@ $NetBSD: patch-aa,v 1.9 2004/02/12 00:10:31 hubertf Exp $ #======================================================================= # MEGS -@@ -105,9 +105,9 @@ megs: 32 +@@ -108,9 +108,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: $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 +-#vgaromimage: file=bios/VGABIOS-elpin-2.40 +-vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest +-#vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus ++#vgaromimage: file=XXXPREFIXXXX/share/bochs/VGABIOS-elpin-2.40 ++vgaromimage: file=XXXPREFIXXXX/share/bochs/VGABIOS-lgpl-latest ++#vgaromimage: file=XXXPREFIXXXX/share/bochs/VGABIOS-lgpl-latest-cirrus #======================================================================= - # FLOPPYA: -@@ -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. + # VGA: +@@ -143,13 +143,13 @@ vga: extension=vbe + # 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. #======================================================================= -floppya: 1_44=/dev/fd0, status=inserted -+floppya: 1_44=/dev/rfd0a, status=inserted - #floppya: file=../1.44, status=inserted ++#floppya: 1_44=/dev/fd0, status=inserted + #floppya: image=../1.44, status=inserted #floppya: 1_44=/dev/fd0H1440, status=inserted #floppya: 1_2=../1_2, status=inserted -@@ -214,7 +214,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2= + #floppya: 1_44=a:, status=inserted + #floppya: 1_44=a.img, status=inserted +-#floppya: 1_44=/dev/rfd0a, status=inserted ++floppya: 1_44=/dev/rfd0a, status=inserted + + #======================================================================= + # FLOPPYB: +@@ -227,7 +227,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 #======================================================================= @@ -48,8 +55,8 @@ $NetBSD: patch-aa,v 1.9 2004/02/12 00:10:31 hubertf Exp $ #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 -@@ -233,7 +233,8 @@ ata0-master: type=disk, mode=flat, path= - # boot: a +@@ -247,7 +247,8 @@ ata0-master: type=disk, mode=flat, path= + # boot: cdrom, floppy, disk #======================================================================= #boot: floppy -boot: disk @@ -58,12 +65,3 @@ $NetBSD: patch-aa,v 1.9 2004/02/12 00:10:31 hubertf Exp $ #======================================================================= # 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 deleted file mode 100644 index 6f82f1a5a1f..00000000000 --- a/emulators/bochs/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2004/02/12 00:10:32 hubertf Exp $ - ---- 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 4064431708f..2884077c58a 100644 --- a/emulators/bochs/patches/patch-ad +++ b/emulators/bochs/patches/patch-ad @@ -1,14 +1,14 @@ -$NetBSD: patch-ad,v 1.6 2004/02/12 00:10:32 hubertf Exp $ +$NetBSD: patch-ad,v 1.7 2005/11/26 06:15:00 ben Exp $ ---- Makefile.in.orig Mon Dec 29 22:53:03 2003 +--- Makefile.in.orig 2005-07-06 13:28:23.000000000 -0700 +++ Makefile.in -@@ -70,8 +70,8 @@ MKDIR=mkdir - RMDIR=rmdir +@@ -71,8 +71,8 @@ RMDIR=rmdir TAR=tar CHMOD=chmod --GZIP=gzip -9 + # the GZIP variable is reserved by gzip program +-GZIP_BIN=gzip -9 -GUNZIP=gunzip -+GZIP=${GZIP_CMD} -9 ++GZIP_BIN=${GZIP_CMD} -9 +GUNZIP=${GUNZIP_CMD} ZIP=zip UNIX2DOS=unix2dos |