Update ia64sim to 0.5.

Changes in Version 0.4
----------------------
1. First draft of a user manual (doc/ia64user.txt)
2. Systems calls to vprintf and program exit
3. Enhancements to single step and display register commands
4. Trace level command
5. Reset hazards command
6  Various bug fixes

Changes in Version 0.5
----------------------
Supports ELF files created by the Intel IA64 Assembler. Not all relocation
types are yet supported.

8 files changed, 86 insertions, 55 deletions

diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
index a623cafc573..fac27bb2e6b 100644
--- a/emulators/ia64sim/Makefile
+++ b/emulators/ia64sim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2008/03/03 19:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2008/08/04 08:04:30 obache Exp $
 
 DISTNAME=		ia64sim
-PKGNAME=		ia64sim-0.3
-PKGREVISION=		1
+PKGNAME=		ia64sim-0.5
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.boo.net/~jasonp/
 EXTRACT_SUFX=		.zip
@@ -15,11 +14,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=		gmake
 DIST_SUBDIR=		${PKGNAME_NOREV}
+WRKSRC=			${WRKDIR}/home/chuck/ia64simcc
 
 MAKE_FILE=		makefile.unx
-INSTALLATION_DIRS=	bin
+INSTALLATION_DIRS=	bin share/doc/ia64sim
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ia64sim ${DESTDIR}${PREFIX}/bin/ia64sim
+	${INSTALL_DATA} ${WRKSRC}/doc/ia64user.txt ${DESTDIR}${PREFIX}/share/doc/ia64sim
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ia64sim/PLIST b/emulators/ia64sim/PLIST
index c7354713b8b..ae92bb3431d 100644
--- a/emulators/ia64sim/PLIST
+++ b/emulators/ia64sim/PLIST
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:51 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/08/04 08:04:30 obache Exp $
 bin/ia64sim
+share/doc/ia64sim/ia64user.txt
+@dirrm share/doc/ia64sim
diff --git a/emulators/ia64sim/distinfo b/emulators/ia64sim/distinfo
index ad3ac378e04..cbb8fdca333 100644
--- a/emulators/ia64sim/distinfo
+++ b/emulators/ia64sim/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.5 2008/02/27 16:45:36 rillig Exp $
+$NetBSD: distinfo,v 1.6 2008/08/04 08:04:30 obache Exp $
 
-SHA1 (ia64sim-0.3/ia64sim.zip) = 8ec70627716bfcc59f7083f76655bb3ee09aa89f
-RMD160 (ia64sim-0.3/ia64sim.zip) = 20610c120d8eff5564555b50494de627a88de67b
-Size (ia64sim-0.3/ia64sim.zip) = 91846 bytes
-SHA1 (patch-aa) = 1e732a6dd645cf090311f080dcb0e22bb124ce01
-SHA1 (patch-ab) = 27d7bd7c7e6b0603fa731850b83aa47145defed8
-SHA1 (patch-ac) = 42b237f44e4dde9be1897a83ffe97cf5ccf3f8d4
-SHA1 (patch-ad) = e1e97c022d64c1729a8c4ca836695148808804d6
+SHA1 (ia64sim-0.5/ia64sim.zip) = e19c937082a6231f37b003392386d20675429b76
+RMD160 (ia64sim-0.5/ia64sim.zip) = a2951c2a2ef944b1e5634caea7bc425cd60f0492
+Size (ia64sim-0.5/ia64sim.zip) = 754344 bytes
+SHA1 (patch-aa) = b4a2beabfaafa5fd64bcd9bb48424679aea924ee
+SHA1 (patch-ab) = bda64a314ce331eb0f604b25513700f8b9f014b6
+SHA1 (patch-ac) = aad790026e9035bbbaafeb122b7c5cd27633d80b
+SHA1 (patch-ad) = 3ccbcf5fef91d5eca8d67b6b14dc181612a42791
+SHA1 (patch-ae) = 2de8792222ec046cc1f64395f5d516efab88e814
diff --git a/emulators/ia64sim/patches/patch-aa b/emulators/ia64sim/patches/patch-aa
index 71a0c798134..8cfdc386597 100644
--- a/emulators/ia64sim/patches/patch-aa
+++ b/emulators/ia64sim/patches/patch-aa
@@ -1,13 +1,18 @@
-$NetBSD: patch-aa,v 1.2 2008/02/27 16:45:36 rillig Exp $
+$NetBSD: patch-aa,v 1.3 2008/08/04 08:04:30 obache Exp $
 
---- makefile.unx	1999/12/10 12:46:49	1.1
-+++ makefile.unx	1999/12/10 12:47:03
-@@ -18,7 +18,7 @@
+--- makefile.unx.orig	2000-02-13 06:25:47.000000000 +0000
++++ makefile.unx
+@@ -18,11 +18,11 @@ EXECDIR = execute
  OBJDIR = obj
  INCDIR = include
  CC = gcc
 -CFLAGS = -O3 -m486 -fomit-frame-pointer -s -I$(INCDIR)
-+CFLAGS = -O3 -fomit-frame-pointer -I$(INCDIR)
++CFLAGS += -I$(INCDIR)
  
- ASMSRCS= assemble.c bundle.c asmfunc.c jumptbl.c decode.c
+ ASMSRCS= assemble.c bundle.c asmfunc.c jumptbl.c decode.c symbols.c
   
+-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  \
+            m_unit.c i_alu.c i_cmp.c i_shft.c globals.c
+ 
+ ASMOBJS = $(ASMSRCS:.c=.o) 
diff --git a/emulators/ia64sim/patches/patch-ab b/emulators/ia64sim/patches/patch-ab
index 668d9acc226..8266b419d2a 100644
--- a/emulators/ia64sim/patches/patch-ab
+++ b/emulators/ia64sim/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2004/02/18 23:24:59 kristerw Exp $
+$NetBSD: patch-ab,v 1.4 2008/08/04 08:04:30 obache Exp $
 
---- include/ia64.h.orig	Thu Feb 19 00:15:01 2004
-+++ include/ia64.h	Thu Feb 19 00:16:20 2004
-@@ -35,7 +35,7 @@
+--- include/ia64.h.orig	2000-03-09 00:57:11.000000000 +0000
++++ include/ia64.h
+@@ -38,7 +38,7 @@ benefit from your work.	
             0<=lo,hi<=63 and lo<=hi */
  
  #define BITS(x,lo,hi) (      \
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.3 2004/02/18 23:24:59 kristerw Exp $
  	   ( (1<<(hi-lo+1)) - 1 )    \
  	   )
  
-@@ -69,8 +69,8 @@
+@@ -72,8 +72,8 @@ typedef union {
     uint8 b[8];
  } qword;
  
diff --git a/emulators/ia64sim/patches/patch-ac b/emulators/ia64sim/patches/patch-ac
index 6ded469165d..7abe39072e0 100644
--- a/emulators/ia64sim/patches/patch-ac
+++ b/emulators/ia64sim/patches/patch-ac
@@ -1,22 +1,22 @@
-$NetBSD: patch-ac,v 1.1 1999/12/10 13:55:15 soren Exp $
+$NetBSD: patch-ac,v 1.2 2008/08/04 08:04:30 obache 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;
+--- asm/assemble.c.orig	2000-02-14 21:06:29.000000000 +0000
++++ asm/assemble.c
+@@ -282,7 +282,7 @@ uint32 parse_operands(char *input, char 
  
           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');
+             if(!isalpha(inptr[0]))
+-              imm = strtoll(inptr, &throwaway, 0);
++              imm = strtoq(inptr, &throwaway, 0);
              else
-@@ -294,7 +294,7 @@
-             break;
+               imm = get_symbol_value(inptr);  
+             if( isdigit(refptr[3]) )
+@@ -299,7 +299,7 @@ uint32 parse_operands(char *input, char 
  
           case 'u':                                 /* unsigned immediate */
--            imm = strtoll(inptr, &throwaway, 0);
-+            imm = strtoq(inptr, &throwaway, 0);
+             if(!isalpha(inptr[0]))
+-              imm = strtoll(inptr, &throwaway, 0);
++              imm = strtoq(inptr, &throwaway, 0);
+             else
+               imm = get_symbol_value(inptr);  
              maxbits = (refptr[2]-'0');
- 	    if(maxbits==6)
- 	       index = 65;	      /* <-- some ops need 1-64, not 0-63 */
diff --git a/emulators/ia64sim/patches/patch-ad b/emulators/ia64sim/patches/patch-ad
index 70b42b7e30d..2a68659452d 100644
--- a/emulators/ia64sim/patches/patch-ad
+++ b/emulators/ia64sim/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
+$NetBSD: patch-ad,v 1.4 2008/08/04 08:04:30 obache Exp $
 
---- ia64sim.c.orig	Wed Mar  8 04:54:20 2000
+--- ia64sim.c.orig	2000-02-28 01:20:26.000000000 +0000
 +++ ia64sim.c
-@@ -98,7 +98,7 @@
+@@ -99,7 +99,7 @@ void assign(void) {
           stop(); /* Clear pending register hazzards */
        }
        else {
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
           if(*junk) {
              printf("3syntax error\n");
              return;
-@@ -138,7 +138,7 @@
+@@ -139,7 +139,7 @@ void assign(void) {
        }
     }
     else {
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
        if(*junk) {
           printf("6syntax error\n");
           return;
-@@ -159,7 +159,7 @@
+@@ -160,7 +160,7 @@ void assign(void) {
           size2 = sizeof(uint64);
        }
        else {
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
           if(*junk) {
              printf("7syntax error\n");
              return;
-@@ -200,7 +200,7 @@
+@@ -201,7 +201,7 @@ void assign(void) {
        }
     }
     else {
@@ -38,7 +38,7 @@ $NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
        if(*junk) {
           printf("Asyntax error\n");
           return;
-@@ -289,7 +289,7 @@
+@@ -350,7 +350,7 @@ void showmem(void) {
  
     base = strtok(NULL, tokens);
     if(base) {
@@ -47,7 +47,7 @@ $NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
        if(*junk) {
           printf("2syntax error\n");
           return;
-@@ -355,7 +355,7 @@
+@@ -459,7 +459,7 @@ void compile(void)  {
     }
     if(!second) base = 0;
     else {
@@ -56,7 +56,7 @@ $NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
     if(*junk) {
        printf("Invalid base address\n");
        return;
-@@ -397,7 +397,7 @@
+@@ -534,7 +534,7 @@ void load(void)  {
     }
     if(!second) base = 0;
     else {
@@ -65,7 +65,7 @@ $NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
     if(*junk) {
        printf("Invalid base address\n");
        return;
-@@ -436,13 +436,13 @@
+@@ -590,13 +590,13 @@ void save(void)  {
        return;
     }
  
@@ -81,7 +81,7 @@ $NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
     if(*junk) {
        printf("Invalid length\n");
        return;
-@@ -512,7 +512,7 @@
+@@ -748,7 +748,7 @@ void setbp(void) {
       printf("Break point address is required\n"); 
       return;
     }
@@ -90,13 +90,22 @@ $NetBSD: patch-ad,v 1.3 2001/02/20 11:33:53 wiz Exp $
     if(*junk) {
       printf("Invalid break point address\n");
       return;
-@@ -556,6 +556,9 @@
-    while(1) {
+@@ -779,7 +779,7 @@ int main(int argc, char **argv) {
+ 
+    uint32 i;
+ 
+-   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");
+ 
+@@ -811,6 +811,9 @@ int main(int argc, char **argv) {
        printf("IA64sim>> ");
-       gets(cmd);
-+
+       fgets(cmd,sizeof(cmd),stdin);
+ 
 +      if (feof(stdin))
 +         return 0;
- 
++
        nextchar = cmd;
        while(*nextchar) *nextchar++ = tolower(*nextchar);
+ 
diff --git a/emulators/ia64sim/patches/patch-ae b/emulators/ia64sim/patches/patch-ae
new file mode 100644
index 00000000000..fea493de363
--- /dev/null
+++ b/emulators/ia64sim/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2008/08/04 08:04:30 obache Exp $
+
+--- asm/bundle.c.orig	2000-02-19 06:53:57.000000000 +0000
++++ asm/bundle.c
+@@ -308,7 +308,7 @@ uint32 bundle_from_file( bundle *vliw, F
+                       BITS(window[maxindex[i]],13,32) <<4;
+            iprel -= seg_tbl[0].seg_length;
+            iprel >>=4;
+-           window[maxindex[i]].q &= 0x1ee00001fff;
++           window[maxindex[i]].q &= UINT64_C(0x1ee00001fff);
+            window[maxindex[i]].q |= (((iprel & 0xfffff)<< 13) |
+                                    (((iprel >> 20) & 1) << 36)) ;
+