Use strtoq(3) in place of strtoll().

3 files changed, 83 insertions, 1 deletions

diff --git a/emulators/ia64sim/files/patch-sum b/emulators/ia64sim/files/patch-sum
index c6dde0b0093..9e3fc2f83a1 100644
--- a/emulators/ia64sim/files/patch-sum
+++ b/emulators/ia64sim/files/patch-sum
@@ -1,4 +1,6 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/12/10 12:59:02 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/12/10 13:55:14 soren Exp $
 
 MD5 (patch-aa) = 19768923e5dacd1fa157716a534331a2
 MD5 (patch-ab) = d567b501ba88098b76fcc1b45ca337f9
+MD5 (patch-ac) = 9a718ecc249a932a47c6be164808937a
+MD5 (patch-ad) = f37b0217b9d24879212dfb8be128dfd9
diff --git a/emulators/ia64sim/patches/patch-ac b/emulators/ia64sim/patches/patch-ac
new file mode 100644
index 00000000000..6ded469165d
--- /dev/null
+++ b/emulators/ia64sim/patches/patch-ac
@@ -0,0 +1,22 @@
+$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/patches/patch-ad b/emulators/ia64sim/patches/patch-ad
new file mode 100644
index 00000000000..578dbae18b7
--- /dev/null
+++ b/emulators/ia64sim/patches/patch-ad
@@ -0,0 +1,58 @@
+$NetBSD: patch-ad,v 1.1 1999/12/10 13:55:16 soren Exp $
+
+--- ia64sim.c.orig	Fri Dec 10 14:52:42 1999
++++ ia64sim.c	Fri Dec 10 14:52:55 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("3syntax error\n");
+       return;