From 9eb56a72355d6c8a7a7375a36bf3918ae3e7eacf Mon Sep 17 00:00:00 2001 From: xtraeme Date: Sun, 19 Feb 2006 19:31:41 +0000 Subject: Update to 0.3.8: The user-visible changes between release 0.3.7 and 0.3.8 include: o) The IQ80321 (Xscale) machine mode is now working well enough to run NetBSD/evbarm 2.1. o) Faster framebuffer output in some situations. --- emulators/gxemul/Makefile | 5 ++--- emulators/gxemul/PLIST | 4 +++- emulators/gxemul/distinfo | 9 ++++----- emulators/gxemul/patches/patch-aa | 24 ------------------------ 4 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 emulators/gxemul/patches/patch-aa diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile index c3e09715b18..365f1223ff5 100644 --- a/emulators/gxemul/Makefile +++ b/emulators/gxemul/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:09:01 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/02/19 19:31:41 xtraeme Exp $ # -DISTNAME= gxemul-0.3.7 -PKGREVISION= 2 +DISTNAME= gxemul-0.3.8 CATEGORIES= emulators MASTER_SITES= http://gavare.se/gxemul/src/ diff --git a/emulators/gxemul/PLIST b/emulators/gxemul/PLIST index 0031126fbd8..dba9ba2ef8c 100644 --- a/emulators/gxemul/PLIST +++ b/emulators/gxemul/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2005/11/27 08:55:32 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.10 2006/02/19 19:31:41 xtraeme Exp $ bin/gxemul man/man1/gxemul.1 share/doc/gxemul/20040504-ultrix45-boot1.png @@ -49,6 +49,8 @@ share/doc/gxemul/20051007-openbsd-cats-installed.png share/doc/gxemul/20051007-openbsd-cats-installed_small.png share/doc/gxemul/20051123-netbsd-prep.png share/doc/gxemul/20051123-netbsd-prep_small.png +share/doc/gxemul/20060218-netbsd-evbarm.png +share/doc/gxemul/20060218-netbsd-evbarm_small.png share/doc/gxemul/BUGS share/doc/gxemul/HISTORY share/doc/gxemul/LICENSE diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo index 9d07cecd789..52982f54f27 100644 --- a/emulators/gxemul/distinfo +++ b/emulators/gxemul/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.10 2005/11/30 19:11:01 rillig Exp $ +$NetBSD: distinfo,v 1.11 2006/02/19 19:31:41 xtraeme Exp $ -SHA1 (gxemul-0.3.7.tar.gz) = 830ed2a8c462a557c80fde1d8cba7e06f7f80281 -RMD160 (gxemul-0.3.7.tar.gz) = cd327503257b9b0653af73a87519e602b91c4a1d -Size (gxemul-0.3.7.tar.gz) = 1521309 bytes -SHA1 (patch-aa) = f6dc0b3836e06686342f73001975a539f1aa795b +SHA1 (gxemul-0.3.8.tar.gz) = 92d6cb1f2b0c63cbaf25d3522fc61bab79083e23 +RMD160 (gxemul-0.3.8.tar.gz) = 5987ba7884e12983ec0168d839a97996806bfcbf +Size (gxemul-0.3.8.tar.gz) = 1584151 bytes diff --git a/emulators/gxemul/patches/patch-aa b/emulators/gxemul/patches/patch-aa deleted file mode 100644 index 3f1a1e747b5..00000000000 --- a/emulators/gxemul/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2005/11/30 19:11:01 rillig Exp $ - -ISO C90 does not allow code intermixed with declarations. - ---- src/cpus/memory_ppc.c.orig Tue Nov 22 22:56:18 2005 -+++ src/cpus/memory_ppc.c Wed Nov 30 20:08:16 2005 -@@ -57,11 +57,13 @@ int ppc_bat(struct cpu *cpu, uint64_t va - - /* 4 instruction BATs, 4 data BATs... */ - for (i=0; i<8; i++) { -+ uint32_t upper, lower, phys, ebs, mask; -+ - regnr = SPR_IBAT0U + i * 2; -- uint32_t upper = cpu->cd.ppc.spr[regnr]; -- uint32_t lower = cpu->cd.ppc.spr[regnr + 1]; -- uint32_t phys = lower & BAT_RPN, ebs = upper & BAT_EPI; -- uint32_t mask = ((upper & BAT_BL) << 15) | 0x1ffff; -+ upper = cpu->cd.ppc.spr[regnr]; -+ lower = cpu->cd.ppc.spr[regnr + 1]; -+ phys = lower & BAT_RPN, ebs = upper & BAT_EPI; -+ mask = ((upper & BAT_BL) << 15) | 0x1ffff; - - /* Instruction BAT, but not instruction lookup? Then skip. */ - if (i < 4 && !(flags & FLAG_INSTR)) -- cgit v1.2.3