diff options
author | wiz <wiz@pkgsrc.org> | 2001-02-20 11:33:52 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2001-02-20 11:33:52 +0000 |
commit | 5f37108cc9772dbeff27be4fec0c6214fc73aacc (patch) | |
tree | 388f41e62eefca38cfcb475dc1821c407ad2f4a6 | |
parent | 8cf774ddc190324fc7330386e90fac78dd174737 (diff) | |
download | pkgsrc-5f37108cc9772dbeff27be4fec0c6214fc73aacc.tar.gz |
Update to 0.3 because the distfile changed. Bugfixes and enhancements.
-rw-r--r-- | emulators/ia64sim/Makefile | 10 | ||||
-rw-r--r-- | emulators/ia64sim/files/md5 | 4 | ||||
-rw-r--r-- | emulators/ia64sim/files/patch-sum | 5 | ||||
-rw-r--r-- | emulators/ia64sim/patches/patch-ab | 13 | ||||
-rw-r--r-- | emulators/ia64sim/patches/patch-ad | 60 |
5 files changed, 54 insertions, 38 deletions
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile index b556b5d3256..336f6e2e216 100644 --- a/emulators/ia64sim/Makefile +++ b/emulators/ia64sim/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2001/02/17 18:38:18 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2001/02/20 11:33:52 wiz Exp $ DISTNAME= ia64sim -PKGNAME= ia64sim-0.1 +PKGNAME= ia64sim-0.3 CATEGORIES= emulators MASTER_SITES= http://www.glue.umd.edu/~jasonp/ EXTRACT_SUFX= .zip @@ -10,15 +10,11 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.glue.umd.edu/~jasonp/ COMMENT= IA64 simulator (Intel(R) Architecture 64) -BUILD_DEPENDS+= unzip:../../archivers/unzip - USE_GMAKE= yes +DIST_SUBDIR= ${PKGNAME} MAKEFILE= makefile.unx -do-extract: - ${MKDIR} ${WRKDIR}; cd ${WRKDIR} && unzip -uLa ${_DISTDIR}/${_DISTFILES} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/ia64sim ${LOCALBASE}/bin/ia64sim diff --git a/emulators/ia64sim/files/md5 b/emulators/ia64sim/files/md5 index a5fea598ed1..11a6196697e 100644 --- a/emulators/ia64sim/files/md5 +++ b/emulators/ia64sim/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 1999/12/10 12:59:02 agc Exp $ +$NetBSD: md5,v 1.2 2001/02/20 11:33:53 wiz Exp $ -MD5 (ia64sim.zip) = 3a39347f9d02ff65807364b1ba1174f2 +MD5 (ia64sim-0.3/ia64sim.zip) = 058971863cdb21554133f89b85265c36 diff --git a/emulators/ia64sim/files/patch-sum b/emulators/ia64sim/files/patch-sum index a1aaf646fe6..a8a7c731352 100644 --- a/emulators/ia64sim/files/patch-sum +++ b/emulators/ia64sim/files/patch-sum @@ -1,6 +1,5 @@ -$NetBSD: patch-sum,v 1.3 1999/12/10 15:14:02 soren Exp $ +$NetBSD: patch-sum,v 1.4 2001/02/20 11:33:53 wiz Exp $ MD5 (patch-aa) = 19768923e5dacd1fa157716a534331a2 -MD5 (patch-ab) = d567b501ba88098b76fcc1b45ca337f9 MD5 (patch-ac) = 9a718ecc249a932a47c6be164808937a -MD5 (patch-ad) = 7012c6363589f9e240421b71fc10b85f +MD5 (patch-ad) = fd8925b03556f2ba761c39795cac0c02 diff --git a/emulators/ia64sim/patches/patch-ab b/emulators/ia64sim/patches/patch-ab deleted file mode 100644 index bffacffa8ca..00000000000 --- a/emulators/ia64sim/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/12/10 12:59:03 agc Exp $ - ---- execute/b_unit.c 1999/12/10 12:50:27 1.1 -+++ execute/b_unit.c 1999/12/10 12:51:23 -@@ -89,7 +89,7 @@ - ip.q = b[b1].q; - add_hazard(PC_REG); - cfm.q = ar[AR_PFS].q & (((uint64)(1) << 37) - 1); -- ar[AR_EC] = (uint64)BITS(ar[AR_PFS],52,57); -+ ar[AR_EC].q = (uint64)BITS(ar[AR_PFS],52,57); - pop_stack_frame(); - } - return IA_OK; diff --git a/emulators/ia64sim/patches/patch-ad b/emulators/ia64sim/patches/patch-ad index f84c0e8db92..70b42b7e30d 100644 --- a/emulators/ia64sim/patches/patch-ad +++ b/emulators/ia64sim/patches/patch-ad @@ -1,9 +1,9 @@ -$NetBSD: patch-ad,v 1.2 1999/12/10 15:14:03 soren Exp $ +$NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $ ---- ia64sim.c.orig Sun Dec 5 02:15:28 1999 -+++ ia64sim.c Fri Dec 10 15:55:16 1999 -@@ -95,7 +95,7 @@ - currslot = SLOT0; +--- ia64sim.c.orig Wed Mar 8 04:54:20 2000 ++++ ia64sim.c +@@ -98,7 +98,7 @@ + stop(); /* Clear pending register hazzards */ } else { - i1 = strtoll(first+1, &junk, 0); @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.2 1999/12/10 15:14:03 soren Exp $ if(*junk) { printf("3syntax error\n"); return; -@@ -135,7 +135,7 @@ +@@ -138,7 +138,7 @@ } } else { @@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.2 1999/12/10 15:14:03 soren Exp $ if(*junk) { printf("6syntax error\n"); return; -@@ -156,7 +156,7 @@ +@@ -159,7 +159,7 @@ size2 = sizeof(uint64); } else { @@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.2 1999/12/10 15:14:03 soren Exp $ if(*junk) { printf("7syntax error\n"); return; -@@ -197,7 +197,7 @@ +@@ -200,7 +200,7 @@ } } else { @@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.2 1999/12/10 15:14:03 soren Exp $ if(*junk) { printf("Asyntax error\n"); return; -@@ -286,7 +286,7 @@ +@@ -289,7 +289,7 @@ base = strtok(NULL, tokens); if(base) { @@ -47,16 +47,50 @@ $NetBSD: patch-ad,v 1.2 1999/12/10 15:14:03 soren Exp $ if(*junk) { printf("2syntax error\n"); return; -@@ -338,7 +338,7 @@ +@@ -355,7 +355,7 @@ + } + if(!second) base = 0; + else { +- base = strtoll(second, &junk, 0) & ~15; ++ base = strtoq(second, &junk, 0) & ~15; + if(*junk) { + printf("Invalid base address\n"); return; +@@ -397,7 +397,7 @@ } - + if(!second) base = 0; + else { - base = strtoll(second, &junk, 0) & ~15; + base = strtoq(second, &junk, 0) & ~15; if(*junk) { - printf("3syntax error\n"); + printf("Invalid base address\n"); + return; +@@ -436,13 +436,13 @@ return; -@@ -422,6 +422,9 @@ + } + +- base = strtoll(second, &junk, 0) & ~15; ++ base = strtoq(second, &junk, 0) & ~15; + if(*junk) { + printf("Invalid base address\n"); + return; + } + +- module_size = strtoll(third, &junk, 0) & ~15; ++ module_size = strtoq(third, &junk, 0) & ~15; + if(*junk) { + printf("Invalid length\n"); + return; +@@ -512,7 +512,7 @@ + printf("Break point address is required\n"); + return; + } +- break_address = strtoll(first,&junk,0) & ~15; ++ break_address = strtoq(first,&junk,0) & ~15; + if(*junk) { + printf("Invalid break point address\n"); + return; +@@ -556,6 +556,9 @@ while(1) { printf("IA64sim>> "); gets(cmd); |