aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-05-07 02:58:14 +0800
committerobrien <obrien@FreeBSD.org>2001-05-07 02:58:14 +0800
commit79b1eca705c186868398a225bf4ba9d036937b41 (patch)
treeace284da1722d0fe40637df1e0ddff2495d21b0d /emulators
parent3f0cd7c93994bf8ecba7f082f84848af32e968f7 (diff)
downloadfreebsd-ports-gnome-79b1eca705c186868398a225bf4ba9d036937b41.tar.gz
freebsd-ports-gnome-79b1eca705c186868398a225bf4ba9d036937b41.tar.zst
freebsd-ports-gnome-79b1eca705c186868398a225bf4ba9d036937b41.zip
Update to version 0.5.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/ia64sim/Makefile12
-rw-r--r--emulators/ia64sim/distinfo2
-rw-r--r--emulators/ia64sim/files/HOLD.patch-ia64sim.c68
-rw-r--r--emulators/ia64sim/files/patch-assemble.c22
-rw-r--r--emulators/ia64sim/files/patch-ia64.h6
-rw-r--r--emulators/ia64sim/files/patch-ia64sim.c99
-rw-r--r--emulators/ia64sim/files/patch-makefile.unx9
7 files changed, 32 insertions, 186 deletions
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
index 6fa08ab431cc..c0927a87b11f 100644
--- a/emulators/ia64sim/Makefile
+++ b/emulators/ia64sim/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# Ports collection makefile for: ia64sim
# Date created: Tue Oct 10, 2000
# Whom: David O'Brien (obrien@NUXI.com)
@@ -6,20 +7,25 @@
#
PORTNAME= ia64sim
-PORTVERSION= 0.2
+PORTVERSION= 0.5
CATEGORIES= emulators
-MASTER_SITES= http://www.glue.umd.edu/~jasonp/ \
+MASTER_SITES= http://www.pacificsites.com/~ccrayne/ \
+ http://www.glue.umd.edu/~jasonp/ \
http://odin.asgard/
DISTFILES= ${PORTNAME}${EXTRACT_SUFX}
MAINTAINER= obrien@FreeBSD.org
EXTRACT_BEFORE_ARGS= -qLa
-WRKSRC= ${WRKDIR}/${PORTNAME}
+WRKSRC= ${WRKDIR}/home/chuck/ia64simcc
USE_ZIP= yes
USE_GMAKE= yes
MAKEFILE= makefile.unx
+pre-build:
+ rm -f ${WRKSRC}/obj/*.o
+ rm -f ${WRKSRC}/ia64sim
+
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ia64sim ${LOCALBASE}/bin/ia64sim
.if !defined(NOPORTDOCS)
diff --git a/emulators/ia64sim/distinfo b/emulators/ia64sim/distinfo
index 92a50709d268..53433fdf2e01 100644
--- a/emulators/ia64sim/distinfo
+++ b/emulators/ia64sim/distinfo
@@ -1 +1 @@
-MD5 (ia64sim.zip) = 058971863cdb21554133f89b85265c36
+MD5 (ia64sim.zip) = 15d38b90a98afc72cee6797ce7e5c171
diff --git a/emulators/ia64sim/files/HOLD.patch-ia64sim.c b/emulators/ia64sim/files/HOLD.patch-ia64sim.c
deleted file mode 100644
index 1d2a1452e23a..000000000000
--- a/emulators/ia64sim/files/HOLD.patch-ia64sim.c
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1999/12/10 15:14:03 soren 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;
- }
- else {
-- i1 = strtoll(first+1, &junk, 0);
-+ i1 = strtoq(first+1, &junk, 0);
- if(*junk) {
- printf("3syntax error\n");
- return;
-@@ -135,7 +135,7 @@
- }
- }
- else {
-- i1 = strtoll(first, &junk, 0);
-+ i1 = strtoq(first, &junk, 0);
- if(*junk) {
- printf("6syntax error\n");
- return;
-@@ -156,7 +156,7 @@
- size2 = sizeof(uint64);
- }
- else {
-- i2 = strtoll(second+1, &junk, 0);
-+ i2 = strtoq(second+1, &junk, 0);
- if(*junk) {
- printf("7syntax error\n");
- return;
-@@ -197,7 +197,7 @@
- }
- }
- else {
-- i2 = strtoll(second, &junk, 0);
-+ i2 = strtoq(second, &junk, 0);
- if(*junk) {
- printf("Asyntax error\n");
- return;
-@@ -286,7 +286,7 @@
-
- base = strtok(NULL, tokens);
- if(base) {
-- temp = strtoll(base, &junk, 0);
-+ temp = strtoq(base, &junk, 0);
- if(*junk) {
- printf("2syntax error\n");
- return;
-@@ -338,7 +338,7 @@
- return;
- }
-
-- base = strtoll(second, &junk, 0) & ~15;
-+ base = strtoq(second, &junk, 0) & ~15;
- if(*junk) {
- printf("Invalid base address\n");
- return;
-@@ -422,6 +422,9 @@
- while(1) {
- printf("IA64sim>> ");
- gets(cmd);
-+
-+ if (feof(stdin))
-+ return 0;
-
- nextchar = cmd;
- while(*nextchar) *nextchar++ = tolower(*nextchar);
diff --git a/emulators/ia64sim/files/patch-assemble.c b/emulators/ia64sim/files/patch-assemble.c
deleted file mode 100644
index 6ded469165d7..000000000000
--- a/emulators/ia64sim/files/patch-assemble.c
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 1999/12/10 13:55:15 soren Exp $
-
---- asm/assemble.c.orig Fri Dec 10 14:50:49 1999
-+++ asm/assemble.c Fri Dec 10 14:50:58 1999
-@@ -280,7 +280,7 @@
- break;
-
- case 'i': /* signed immediate */
-- imm = strtoll(inptr, &throwaway, 0);
-+ imm = strtoq(inptr, &throwaway, 0);
- if( isdigit(refptr[3]) )
- maxbits = (refptr[2]-'0')*10 + (refptr[3]-'0');
- else
-@@ -294,7 +294,7 @@
- break;
-
- case 'u': /* unsigned immediate */
-- imm = strtoll(inptr, &throwaway, 0);
-+ imm = strtoq(inptr, &throwaway, 0);
- maxbits = (refptr[2]-'0');
- if(maxbits==6)
- index = 65; /* <-- some ops need 1-64, not 0-63 */
diff --git a/emulators/ia64sim/files/patch-ia64.h b/emulators/ia64sim/files/patch-ia64.h
new file mode 100644
index 000000000000..d1fc329e5b8b
--- /dev/null
+++ b/emulators/ia64sim/files/patch-ia64.h
@@ -0,0 +1,6 @@
+--- include/ia64.h.orig Sun May 6 11:39:29 2001
++++ include/ia64.h Sun May 6 11:35:10 2001
+@@ -31,2 +31,3 @@
+ #include <elf.h>
++#include <sys/elf64.h>
+
diff --git a/emulators/ia64sim/files/patch-ia64sim.c b/emulators/ia64sim/files/patch-ia64sim.c
index 32f0b564a959..2a71349740a6 100644
--- a/emulators/ia64sim/files/patch-ia64sim.c
+++ b/emulators/ia64sim/files/patch-ia64sim.c
@@ -1,97 +1,18 @@
---- ia64sim.c.orig Wed Mar 8 04:54:20 2000
-+++ ia64sim.c Tue Oct 10 16:34:36 2000
-@@ -98,7 +98,7 @@
- stop(); /* Clear pending register hazzards */
- }
- else {
-- i1 = strtoll(first+1, &junk, 0);
-+ i1 = strtoq(first+1, &junk, 0);
- if(*junk) {
- printf("3syntax error\n");
- return;
-@@ -138,7 +138,7 @@
- }
- }
- else {
-- i1 = strtoll(first, &junk, 0);
-+ i1 = strtoq(first, &junk, 0);
- if(*junk) {
- printf("6syntax error\n");
- return;
-@@ -159,7 +159,7 @@
- size2 = sizeof(uint64);
- }
- else {
-- i2 = strtoll(second+1, &junk, 0);
-+ i2 = strtoq(second+1, &junk, 0);
- if(*junk) {
- printf("7syntax error\n");
- return;
-@@ -200,7 +200,7 @@
- }
- }
- else {
-- i2 = strtoll(second, &junk, 0);
-+ i2 = strtoq(second, &junk, 0);
- if(*junk) {
- printf("Asyntax error\n");
- return;
-@@ -289,7 +289,7 @@
+--- ia64sim.c.orig Sun Feb 27 17:20:26 2000
++++ ia64sim.c Sun May 6 11:51:41 2001
+@@ -779,7 +779,7 @@
- base = strtok(NULL, tokens);
- if(base) {
-- temp = strtoll(base, &junk, 0);
-+ temp = strtoq(base, &junk, 0);
- if(*junk) {
- printf("2syntax error\n");
- return;
-@@ -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("Invalid base address\n");
- return;
-@@ -436,13 +436,13 @@
- return;
- }
+ uint32 i;
-- base = strtoll(second, &junk, 0) & ~15;
-+ base = strtoq(second, &junk, 0) & ~15;
- if(*junk) {
- printf("Invalid base address\n");
- return;
- }
+- printf("\nIA64 ISA simulator, version 0.4\n");
++ printf("\nIA64 ISA simulator, version 0.5\n");
+ printf("Memory limits: 0x%08x-0x%08x\n", 0, MEMSIZE-1);
+ printf("Try 'h' for help\n\n");
-- 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 @@
+@@ -810,6 +810,9 @@
while(1) {
printf("IA64sim>> ");
- gets(cmd);
+ fgets(cmd,sizeof(cmd),stdin);
+
+ if (feof(stdin))
+ return 0;
diff --git a/emulators/ia64sim/files/patch-makefile.unx b/emulators/ia64sim/files/patch-makefile.unx
index 168af2254b57..c13fc41cae36 100644
--- a/emulators/ia64sim/files/patch-makefile.unx
+++ b/emulators/ia64sim/files/patch-makefile.unx
@@ -1,5 +1,8 @@
---- makefile.unx.orig Wed Mar 8 04:58:52 2000
-+++ makefile.unx Sat Mar 10 16:42:01 2001
+--- makefile.unx.orig Sat Feb 12 22:25:47 2000
++++ makefile.unx Sun May 6 11:48:13 2001
@@ -21 +21 @@
-CFLAGS = -O3 -m486 -fomit-frame-pointer -s -I$(INCDIR)
-+CFLAGS += -fomit-frame-pointer -s -I$(INCDIR)
++CFLAGS += -s -I$(INCDIR)
+@@ -25 +25 @@
+-EXECSRCS = execute.c utils.c f_unit.c b_unit.c x_unit.c \
++EXECSRCS = elf.c execute.c utils.c f_unit.c b_unit.c x_unit.c \