Sat Dec 6 12:00:56 2008 UTC ()
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.


(wiz)
diff -r1.53 -r1.54 pkgsrc/emulators/bochs/Makefile
diff -r1.9 -r1.10 pkgsrc/emulators/bochs/PLIST
diff -r1.22 -r1.23 pkgsrc/emulators/bochs/distinfo
diff -r1.6 -r0 pkgsrc/emulators/bochs/patches/patch-af
cvs diff -r1.53 -r1.54 pkgsrc/emulators/bochs/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/bochs/Makefile 2008/06/12 02:14:29 1.53
+++ pkgsrc/emulators/bochs/Makefile 2008/12/06 12:00:56 1.54
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.53 2008/06/12 02:14:29 joerg Exp $ 1# $NetBSD: Makefile,v 1.54 2008/12/06 12:00:56 wiz Exp $
2 2
3DISTNAME= bochs-2.3.6 3DISTNAME= bochs-2.3.7
4CATEGORIES= emulators 4CATEGORIES= emulators
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://bochs.sourceforge.net/ 8HOMEPAGE= http://bochs.sourceforge.net/
9COMMENT= IA32 and AMD64 PC emulator 9COMMENT= IA32 and AMD64 PC emulator
10 10
11PKG_DESTDIR_SUPPORT= user-destdir 11PKG_DESTDIR_SUPPORT= user-destdir
12 12
13GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
15USE_TOOLS+= gunzip gzip 15USE_TOOLS+= gunzip gzip
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
@@ -32,27 +32,27 @@ PKG_SUPPORTED_OPTIONS+= debug tiny @@ -32,27 +32,27 @@ PKG_SUPPORTED_OPTIONS+= debug tiny
32.include "../../mk/bsd.prefs.mk" 32.include "../../mk/bsd.prefs.mk"
33.include "../../mk/bsd.options.mk" 33.include "../../mk/bsd.options.mk"
34 34
35# Debugging features for the client operating systems. These options are 35# Debugging features for the client operating systems. These options are
36# not enabled by default because they can adversely impact performance. 36# not enabled by default because they can adversely impact performance.
37.if !empty(PKG_OPTIONS:Mdebug) 37.if !empty(PKG_OPTIONS:Mdebug)
38CONFIGURE_ARGS+= --enable-debugger 38CONFIGURE_ARGS+= --enable-debugger
39CONFIGURE_ARGS+= --enable-disasm 39CONFIGURE_ARGS+= --enable-disasm
40CONFIGURE_ARGS+= --enable-iodebug 40CONFIGURE_ARGS+= --enable-iodebug
41CONFIGURE_ARGS+= --enable-x86-debugger 41CONFIGURE_ARGS+= --enable-x86-debugger
42.endif 42.endif
43 43
44.if empty(PKG_OPTIONS:Mtiny) 44.if empty(PKG_OPTIONS:Mtiny)
45CONFIGURE_ARGS+= --enable-3dnow 45#CONFIGURE_ARGS+= --enable-3dnow
46CONFIGURE_ARGS+= --enable-4meg-pages 46CONFIGURE_ARGS+= --enable-4meg-pages
47CONFIGURE_ARGS+= --enable-all-optimizations 47CONFIGURE_ARGS+= --enable-all-optimizations
48CONFIGURE_ARGS+= --enable-apic 48CONFIGURE_ARGS+= --enable-apic
49CONFIGURE_ARGS+= --enable-cpu-level=6 49CONFIGURE_ARGS+= --enable-cpu-level=6
50CONFIGURE_ARGS+= --enable-daz 50CONFIGURE_ARGS+= --enable-daz
51CONFIGURE_ARGS+= --enable-fpu 51CONFIGURE_ARGS+= --enable-fpu
52CONFIGURE_ARGS+= --enable-global-pages 52CONFIGURE_ARGS+= --enable-global-pages
53CONFIGURE_ARGS+= --enable-guest2host-tlb 53CONFIGURE_ARGS+= --enable-guest2host-tlb
54CONFIGURE_ARGS+= --enable-host-specific-asms 54CONFIGURE_ARGS+= --enable-host-specific-asms
55CONFIGURE_ARGS+= --enable-icache 55CONFIGURE_ARGS+= --enable-icache
56CONFIGURE_ARGS+= --enable-mmx 56CONFIGURE_ARGS+= --enable-mmx
57CONFIGURE_ARGS+= --enable-pae 57CONFIGURE_ARGS+= --enable-pae
58CONFIGURE_ARGS+= --enable-pci 58CONFIGURE_ARGS+= --enable-pci
@@ -61,26 +61,32 @@ CONFIGURE_ARGS+= --enable-sep @@ -61,26 +61,32 @@ CONFIGURE_ARGS+= --enable-sep
61CONFIGURE_ARGS+= --enable-sse=3 61CONFIGURE_ARGS+= --enable-sse=3
62CONFIGURE_ARGS+= --enable-usb 62CONFIGURE_ARGS+= --enable-usb
63CONFIGURE_ARGS+= --enable-vbe 63CONFIGURE_ARGS+= --enable-vbe
64CONFIGURE_ARGS+= --enable-x86-64 64CONFIGURE_ARGS+= --enable-x86-64
65CONFIGURE_ARGS+= --enable-popcnt 65CONFIGURE_ARGS+= --enable-popcnt
66CONFIGURE_ARGS+= --enable-smp 66CONFIGURE_ARGS+= --enable-smp
67CONFIGURE_ARGS+= --enable-ne2000 67CONFIGURE_ARGS+= --enable-ne2000
68CONFIGURE_ARGS+= --enable-acpi 68CONFIGURE_ARGS+= --enable-acpi
69CONFIGURE_ARGS+= --enable-pnic 69CONFIGURE_ARGS+= --enable-pnic
70CONFIGURE_ARGS+= --enable-large-pages 70CONFIGURE_ARGS+= --enable-large-pages
71CONFIGURE_ARGS+= --enable-mtrr 71CONFIGURE_ARGS+= --enable-mtrr
72CONFIGURE_ARGS+= --enable-clgd54xx 72CONFIGURE_ARGS+= --enable-clgd54xx
73CONFIGURE_ARGS+= --enable-sse-extension 73CONFIGURE_ARGS+= --enable-sse-extension
 74CONFIGURE_ARGS+= --enable-gameport
 75CONFIGURE_ARGS+= --enable-misaligned-sse
 76CONFIGURE_ARGS+= --enable-aes
 77CONFIGURE_ARGS+= --enable-xsave
 78CONFIGURE_ARGS+= --enable-vme
 79CONFIGURE_ARGS+= --enable-plugins
74 80
75. if !empty(MACHINE_PLATFORM:M*-*-i386) 81. if !empty(MACHINE_PLATFORM:M*-*-i386)
76CONFIGURE_ARGS+= --enable-fast-function-calls 82CONFIGURE_ARGS+= --enable-fast-function-calls
77. endif 83. endif
78 84
79. if ${OPSYS} == "Darwin" 85. if ${OPSYS} == "Darwin"
80CONFIGURE_ARGS+= --enable-sb16=osx 86CONFIGURE_ARGS+= --enable-sb16=osx
81. elif ${OPSYS} == "FreeBSD" 87. elif ${OPSYS} == "FreeBSD"
82CONFIGURE_ARGS+= --enable-sb16=freebsd 88CONFIGURE_ARGS+= --enable-sb16=freebsd
83. elif ${OPSYS} == "Linux" 89. elif ${OPSYS} == "Linux"
84CONFIGURE_ARGS+= --enable-sb16=linux 90CONFIGURE_ARGS+= --enable-sb16=linux
85. else 91. else
86CONFIGURE_ARGS+= --enable-sb16=dummy 92CONFIGURE_ARGS+= --enable-sb16=dummy
cvs diff -r1.9 -r1.10 pkgsrc/emulators/bochs/PLIST (expand / switch to unified diff)

--- pkgsrc/emulators/bochs/PLIST 2008/01/03 21:03:45 1.9
+++ pkgsrc/emulators/bochs/PLIST 2008/12/06 12:00:56 1.10
@@ -1,17 +1,42 @@ @@ -1,17 +1,42 @@
1@comment $NetBSD: PLIST,v 1.9 2008/01/03 21:03:45 xtraeme Exp $ 1@comment $NetBSD: PLIST,v 1.10 2008/12/06 12:00:56 wiz Exp $
2bin/bochs 2bin/bochs
3bin/bxcommit 3bin/bxcommit
4bin/bximage 4bin/bximage
 5lib/bochs/plugins/libbx_acpi.la
 6lib/bochs/plugins/libbx_biosdev.la
 7lib/bochs/plugins/libbx_busmouse.la
 8lib/bochs/plugins/libbx_cmos.la
 9lib/bochs/plugins/libbx_dma.la
 10lib/bochs/plugins/libbx_extfpuirq.la
 11lib/bochs/plugins/libbx_floppy.la
 12lib/bochs/plugins/libbx_gameport.la
 13lib/bochs/plugins/libbx_harddrv.la
 14lib/bochs/plugins/libbx_keyboard.la
 15lib/bochs/plugins/libbx_ne2k.la
 16lib/bochs/plugins/libbx_parallel.la
 17lib/bochs/plugins/libbx_pci.la
 18lib/bochs/plugins/libbx_pci2isa.la
 19lib/bochs/plugins/libbx_pci_ide.la
 20lib/bochs/plugins/libbx_pcipnic.la
 21lib/bochs/plugins/libbx_pciusb.la
 22lib/bochs/plugins/libbx_pcivga.la
 23lib/bochs/plugins/libbx_pic.la
 24lib/bochs/plugins/libbx_sb16.la
 25lib/bochs/plugins/libbx_serial.la
 26lib/bochs/plugins/libbx_speaker.la
 27lib/bochs/plugins/libbx_unmapped.la
 28lib/bochs/plugins/libbx_vga.la
 29lib/bochs/plugins/libbx_x.la
5man/man1/bochs-dlx.1 30man/man1/bochs-dlx.1
6man/man1/bochs.1 31man/man1/bochs.1
7man/man1/bxcommit.1 32man/man1/bxcommit.1
8man/man1/bximage.1 33man/man1/bximage.1
9man/man5/bochsrc.5 34man/man5/bochsrc.5
10share/bochs/BIOS-bochs-latest 35share/bochs/BIOS-bochs-latest
11share/bochs/BIOS-bochs-legacy 36share/bochs/BIOS-bochs-legacy
12share/bochs/VGABIOS-elpin-2.40 37share/bochs/VGABIOS-elpin-2.40
13share/bochs/VGABIOS-elpin-LICENSE 38share/bochs/VGABIOS-elpin-LICENSE
14share/bochs/VGABIOS-lgpl-README 39share/bochs/VGABIOS-lgpl-README
15share/bochs/VGABIOS-lgpl-latest 40share/bochs/VGABIOS-lgpl-latest
16share/bochs/VGABIOS-lgpl-latest-cirrus 41share/bochs/VGABIOS-lgpl-latest-cirrus
17share/bochs/VGABIOS-lgpl-latest-cirrus-debug 42share/bochs/VGABIOS-lgpl-latest-cirrus-debug
@@ -27,13 +52,15 @@ share/bochs/keymaps/x11-pc-it.map @@ -27,13 +52,15 @@ share/bochs/keymaps/x11-pc-it.map
27share/bochs/keymaps/x11-pc-ru.map 52share/bochs/keymaps/x11-pc-ru.map
28share/bochs/keymaps/x11-pc-se.map 53share/bochs/keymaps/x11-pc-se.map
29share/bochs/keymaps/x11-pc-si.map 54share/bochs/keymaps/x11-pc-si.map
30share/bochs/keymaps/x11-pc-uk.map 55share/bochs/keymaps/x11-pc-uk.map
31share/bochs/keymaps/x11-pc-us.map 56share/bochs/keymaps/x11-pc-us.map
32share/doc/bochs/CHANGES 57share/doc/bochs/CHANGES
33share/doc/bochs/COPYING 58share/doc/bochs/COPYING
34share/doc/bochs/README 59share/doc/bochs/README
35share/doc/bochs/TODO 60share/doc/bochs/TODO
36share/doc/bochs/bochsrc-sample.txt 61share/doc/bochs/bochsrc-sample.txt
37@dirrm share/doc/bochs 62@dirrm share/doc/bochs
38@dirrm share/bochs/keymaps 63@dirrm share/bochs/keymaps
39@dirrm share/bochs 64@dirrm share/bochs
 65@dirrm lib/bochs/plugins
 66@dirrm lib/bochs
cvs diff -r1.22 -r1.23 pkgsrc/emulators/bochs/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/bochs/distinfo 2008/01/18 10:21:01 1.22
+++ pkgsrc/emulators/bochs/distinfo 2008/12/06 12:00:56 1.23
@@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
1$NetBSD: distinfo,v 1.22 2008/01/18 10:21:01 jmmv Exp $ 1$NetBSD: distinfo,v 1.23 2008/12/06 12:00:56 wiz Exp $
2 2
3SHA1 (bochs-2.3.6.tar.gz) = 3675b1c5a324854b998bb7518c7279db2fecd8c3 3SHA1 (bochs-2.3.7.tar.gz) = e687c697a8be8396ae75106d0cd6149bd52ca67d
4RMD160 (bochs-2.3.6.tar.gz) = b81c8093c147d0d75cb18a954407ed3f7451aa3f 4RMD160 (bochs-2.3.7.tar.gz) = b4c9cb8e777c4e484f653085783bce9645804fe0
5Size (bochs-2.3.6.tar.gz) = 3951132 bytes 5Size (bochs-2.3.7.tar.gz) = 3989982 bytes
6SHA1 (patch-aa) = e0d72eb694bbd132e598d0c5ad88875c0c0ccd7f 6SHA1 (patch-aa) = e0d72eb694bbd132e598d0c5ad88875c0c0ccd7f
7SHA1 (patch-ab) = 51ebcc673c60258d19e4ec18f2464fb694548228 7SHA1 (patch-ab) = 51ebcc673c60258d19e4ec18f2464fb694548228
8SHA1 (patch-ac) = ab21b4c2c38d798e24244163b2c447430e012e8e 8SHA1 (patch-ac) = ab21b4c2c38d798e24244163b2c447430e012e8e
9SHA1 (patch-ad) = 44181a229d81a6462e3e44c2425d62a415c5f6f9 9SHA1 (patch-ad) = 44181a229d81a6462e3e44c2425d62a415c5f6f9
10SHA1 (patch-ae) = 4c466afb1d780ce7cdfbaef8e8fa00447d0ebcb7 10SHA1 (patch-ae) = 4c466afb1d780ce7cdfbaef8e8fa00447d0ebcb7
11SHA1 (patch-af) = ffe66e8fdf18872c5060b85f85d7323d451f17a3 
File Deleted: pkgsrc/emulators/bochs/patches/Attic/patch-af