diff options
author | hubertf <hubertf> | 2004-02-12 00:10:30 +0000 |
---|---|---|
committer | hubertf <hubertf> | 2004-02-12 00:10:30 +0000 |
commit | 77e789244cdbb3d5947ca3680a9deb6fa56c4889 (patch) | |
tree | 9c253bf15c3d1aa0f1cd2d718604e4813013d0ae | |
parent | a4cb0119f4a8bfddd725e10421ace2dc544ae253 (diff) | |
download | pkgsrc-77e789244cdbb3d5947ca3680a9deb6fa56c4889.tar.gz |
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
-rw-r--r-- | doc/CHANGES | 3 | ||||
-rw-r--r-- | emulators/bochs/MESSAGE | 17 | ||||
-rw-r--r-- | emulators/bochs/Makefile | 62 | ||||
-rw-r--r-- | emulators/bochs/PLIST | 77 | ||||
-rw-r--r-- | emulators/bochs/distinfo | 16 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-aa | 64 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-ab | 89 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-ad | 40 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-ae | 13 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-af | 15 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-ag | 14 | ||||
-rw-r--r-- | emulators/bochs/patches/patch-ah | 13 |
12 files changed, 137 insertions, 286 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 58688ab496c..e75d46e14cb 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.4794 2004/02/11 23:11:30 jmmv Exp $ +$NetBSD: CHANGES,v 1.4795 2004/02/12 00:10:30 hubertf Exp $ Changes to the packages collection and infrastructure in 2004: @@ -789,3 +789,4 @@ Changes to the packages collection and infrastructure in 2004: Updated imlib2 to 1.1.0nb2 [xtraeme 2004-02-11] Removed linuxls [jmmv 2004-02-11] Added gnuls-5.0 [jmmv 2004-02-11] + Updated bochs to 2.1 [hubertf 2004-02-12] diff --git a/emulators/bochs/MESSAGE b/emulators/bochs/MESSAGE index b69d668349d..d1e68e1c5ce 100644 --- a/emulators/bochs/MESSAGE +++ b/emulators/bochs/MESSAGE @@ -1,18 +1,13 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2002/09/24 12:29:58 wiz Exp $ +$NetBSD: MESSAGE,v 1.3 2004/02/12 00:10:30 hubertf Exp $ -You need to copy the ${BOCHS_MAINDIR}/bochsrc file to your home -directory and name it .bochsrc. Then edit it to your tastes -defining the hard drives and floppies as needed. You also need -to ${BOCHS_FONTDIR} to your X font path and to enable it -before running bochs, e.g. - - $ xset fp+ ${BOCHS_FONTDIR} - $ xset fp rehash +You need to copy the ${PREFIX}/share/doc/bochs/bochsrc-sample.txt +file to your home 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 ${BOCHS_DOCDIR}. The file install.html -will assist you in creating a HD "file". (A raw disk partition can -be used as well.) +will assist you in creating a HD "file" (a raw disk partition or +ISO file can be used as well) =========================================================================== diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index 1e4be96c5ab..538928229be 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.31 2004/01/22 08:36:03 grant Exp $ +# $NetBSD: Makefile,v 1.32 2004/02/12 00:10:31 hubertf Exp $ -DISTNAME= bochs-2.0.2 +DISTNAME= bochs-2.1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=bochs/} @@ -20,8 +20,37 @@ USE_GCC_SHLIB= yes CONFIGURE_ARGS+= --enable-cdrom CONFIGURE_ARGS+= --enable-ne2000 CONFIGURE_ARGS+= --enable-sb16=dummy +.if !defined(BOCHS_TINY) +CONFIGURE_ARGS+= --enable-new-pit +CONFIGURE_ARGS+= --enable-pci +CONFIGURE_ARGS+= --enable-cpu-level=6 +CONFIGURE_ARGS+= --enable-apic +CONFIGURE_ARGS+= --enable-usb +CONFIGURE_ARGS+= --enable-4meg-pages +CONFIGURE_ARGS+= --enable-pae +CONFIGURE_ARGS+= --enable-guest2host-tlb +CONFIGURE_ARGS+= --enable-repeat-speedups +CONFIGURE_ARGS+= --enable-icache +.include "../../mk/bsd.prefs.mk" +.if !empty(MACHINE_PLATFORM:M*-*-i386) +CONFIGURE_ARGS+= --enable-fast-function-calls +.endif +CONFIGURE_ARGS+= --enable-global-pages +CONFIGURE_ARGS+= --enable-host-specific-asms +CONFIGURE_ARGS+= --enable-all-optimizations +CONFIGURE_ARGS+= --enable-vbe +CONFIGURE_ARGS+= --enable-fpu +CONFIGURE_ARGS+= --enable-mmx +CONFIGURE_ARGS+= --enable-3dnow +CONFIGURE_ARGS+= --enable-sse=2 +CONFIGURE_ARGS+= --enable-daz +CONFIGURE_ARGS+= --enable-sep +.endif # !BOCHS_TINY CONFIGURE_ENV+= CXXFLAGS="-I${X11BASE}/include ${CXXFLAGS}" USE_X11= yes +MANCOMPRESSED= yes +MAKE_ENV+= GZIP_CMD=${GZIP_CMD:Q} \ + GUNZIP_CMD=${GUNZIP_CMD:Q} BOCHS_MAINDIR= ${PREFIX}/share/bochs BOCHS_BIOSDIR= ${BOCHS_MAINDIR}/bios @@ -32,33 +61,8 @@ MESSAGE_SUBST+= BOCHS_MAINDIR=${BOCHS_MAINDIR} \ BOCHS_DOCDIR=${BOCHS_DOCDIR} post-configure: + ${MV} ${WRKSRC}/.bochsrc ${WRKSRC}/.bochsrc.BAK ${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' \ - < ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc - -do-install: - ${INSTALL_DATA_DIR} ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-2-processors ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-4-processors ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-8-processors ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/BIOS-bochs-latest ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-2.40 ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-elpin-LICENSE ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-lgpl-latest ${BOCHS_BIOSDIR} - ${INSTALL_DATA} ${WRKSRC}/bios/VGABIOS-lgpl-README ${BOCHS_BIOSDIR} - ${INSTALL_DATA_DIR} ${BOCHS_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs-html/00README ${BOCHS_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs-html/*.gif ${BOCHS_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${BOCHS_DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/docs-html/*.txt ${BOCHS_DOCDIR} - ${INSTALL_DATA_DIR} ${BOCHS_FONTDIR} - ${INSTALL_DATA} ${WRKSRC}/font/hercules.bdf ${BOCHS_FONTDIR} - ${INSTALL_DATA} ${WRKSRC}/font/vga.bdf ${BOCHS_FONTDIR} - ${INSTALL_DATA} ${WRKSRC}/font/vga.pcf ${BOCHS_FONTDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/bochs ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/bximage ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/bochsrc ${PREFIX}/share/bochs - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${PREFIX}/man/man5 - ${X11BASE}/bin/mkfontdir ${PREFIX}/share/bochs/xfonts + < ${WRKSRC}/.bochsrc.BAK > ${WRKSRC}/.bochsrc .include "../../mk/bsd.pkg.mk" diff --git a/emulators/bochs/PLIST b/emulators/bochs/PLIST index ab7c443e2c9..20f91997438 100644 --- a/emulators/bochs/PLIST +++ b/emulators/bochs/PLIST @@ -1,54 +1,37 @@ -@comment $NetBSD: PLIST,v 1.5 2002/12/25 01:12:37 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.6 2004/02/12 00:10:31 hubertf Exp $ bin/bochs +bin/bxcommit bin/bximage man/man1/bochs-dlx.1 man/man1/bochs.1 +man/man1/bxcommit.1 man/man1/bximage.1 man/man5/bochsrc.5 -share/bochs/bios/BIOS-bochs-2-processors -share/bochs/bios/BIOS-bochs-4-processors -share/bochs/bios/BIOS-bochs-8-processors -share/bochs/bios/BIOS-bochs-latest -share/bochs/bios/VGABIOS-elpin-2.40 -share/bochs/bios/VGABIOS-elpin-LICENSE -share/bochs/bios/VGABIOS-lgpl-README -share/bochs/bios/VGABIOS-lgpl-latest -share/bochs/bochsrc -share/bochs/xfonts/fonts.dir -share/bochs/xfonts/hercules.bdf -share/bochs/xfonts/vga.bdf -share/bochs/xfonts/vga.pcf -share/doc/html/bochs/00README -share/doc/html/bochs/3rdparty.license.html -share/doc/html/bochs/Linux.html -share/doc/html/bochs/Minix.html -share/doc/html/bochs/OldWindows95.html -share/doc/html/bochs/Windows95.html -share/doc/html/bochs/changelog.html -share/doc/html/bochs/codingguidelines.html -share/doc/html/bochs/configure.html -share/doc/html/bochs/construction.html -share/doc/html/bochs/cosimulation.html -share/doc/html/bochs/cvs-status.html -share/doc/html/bochs/cvs-structure.txt -share/doc/html/bochs/developers.html -share/doc/html/bochs/faq.html -share/doc/html/bochs/features.html -share/doc/html/bochs/fpu.html -share/doc/html/bochs/guestNT.html -share/doc/html/bochs/index.html -share/doc/html/bochs/install.html -share/doc/html/bochs/instrumentation.html -share/doc/html/bochs/iodebug.html -share/doc/html/bochs/mtools.html -share/doc/html/bochs/random.txt -share/doc/html/bochs/release-prep.txt -share/doc/html/bochs/smp-simulation.html -share/doc/html/bochs/sound.html -share/doc/html/bochs/undercon.gif -share/doc/html/bochs/whatisbochs.html -share/doc/html/bochs/win32.html -@dirrm share/doc/html/bochs -@dirrm share/bochs/xfonts -@dirrm share/bochs/bios +share/bochs/BIOS-bochs-2-processors +share/bochs/BIOS-bochs-4-processors +share/bochs/BIOS-bochs-8-processors +share/bochs/BIOS-bochs-latest +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-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 +share/bochs/keymaps/x11-pc-da.map +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-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/bochsrc-sample.txt +@dirrm share/doc/bochs +@dirrm share/bochs/keymaps @dirrm share/bochs diff --git a/emulators/bochs/distinfo b/emulators/bochs/distinfo index 04ab9400735..c2dfe593554 100644 --- a/emulators/bochs/distinfo +++ b/emulators/bochs/distinfo @@ -1,11 +1,7 @@ -$NetBSD: distinfo,v 1.14 2003/10/24 22:03:53 bouyer Exp $ +$NetBSD: distinfo,v 1.15 2004/02/12 00:10:31 hubertf Exp $ -SHA1 (bochs-2.0.2.tar.gz) = 94a133dbfa646eda19c27e060df1c1e098a75be3 -Size (bochs-2.0.2.tar.gz) = 3269299 bytes -SHA1 (patch-aa) = bbe026a0487dee7ac00cf75500d38b600f473c8f -SHA1 (patch-ab) = 1646ba658064a6fe449ba4d1e0a98afb9b114e13 -SHA1 (patch-ad) = 3ce76c962920677c383ce2f61fb20565ddbd8777 -SHA1 (patch-ae) = 510238ed28e8aa79f4dd8780d54ac66f317a9380 -SHA1 (patch-af) = 931805d3523baab6cc16bd1052f059309aab75a7 -SHA1 (patch-ag) = a22ca6f8abf0db67de714f53e3db94cb06e33db6 -SHA1 (patch-ah) = 2d91f2ebcf26d7c80381028c31c3e849e3668208 +SHA1 (bochs-2.1.tar.gz) = d7be064e627871ee45480717d12accedf07d2fe8 +Size (bochs-2.1.tar.gz) = 3650627 bytes +SHA1 (patch-aa) = efa5e0be4b19b36032f4f15b60ecc13054852af9 +SHA1 (patch-ab) = 55f4c9d7de56ffe02673e627717648e80f9a1bd4 +SHA1 (patch-ad) = 8287d00e11892b6c78bc0c89590acd91e992ca69 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) |