From e59d6cd87e1ab218cb2c867af9b0664da3a52169 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Fri, 15 Jul 2005 13:57:38 +0000
Subject: [PATCH] 	* cpu/fr30.opc (print_register_list): Correct format
 strings. 	* cpu/ip2k.opc: Likewise.

---
 ChangeLog    |  5 +++++
 cpu/fr30.opc |  4 ++--
 cpu/ip2k.opc | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 199f89a..7496f25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-15  Alan Modra  <amodra@bigpond.net.au>
+
+	* cpu/fr30.opc (print_register_list): Correct format strings.
+	* cpu/ip2k.opc: Likewise.
+
 2005-07-05  Nick Clifton  <nickc@redhat.com>
 
 	* cpu/iq2000.opc (parse_lo16, parse_mlo16): Make value parameter
diff --git a/cpu/fr30.opc b/cpu/fr30.opc
index 8faceee..6017dbd 100644
--- a/cpu/fr30.opc
+++ b/cpu/fr30.opc
@@ -157,7 +157,7 @@ print_register_list (void * dis_info,
 
   if (value & mask)
     {
-      (*info->fprintf_func) (info->stream, "r%i", index + offset);
+      (*info->fprintf_func) (info->stream, "r%li", index + offset);
       comma = ",";
     }
     
@@ -170,7 +170,7 @@ print_register_list (void * dis_info,
 
       if (value & mask)
 	{
-	  (*info->fprintf_func) (info->stream, "%sr%i", comma, index + offset);
+	  (*info->fprintf_func) (info->stream, "%sr%li", comma, index + offset);
 	  comma = ",";
 	}
     }
diff --git a/cpu/ip2k.opc b/cpu/ip2k.opc
index 8a4a675..c2d505a 100644
--- a/cpu/ip2k.opc
+++ b/cpu/ip2k.opc
@@ -488,7 +488,7 @@ print_fr (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
       if (offsetvalue == 0)
 	(*info->fprintf_func) (info->stream, "%s","(DP)");
       else
-	(*info->fprintf_func) (info->stream, "$%x%s",offsetvalue, "(DP)");
+	(*info->fprintf_func) (info->stream, "$%lx%s", offsetvalue, "(DP)");
       return;
     }
 
@@ -498,7 +498,7 @@ print_fr (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
       if (offsetvalue == 0)
 	(*info->fprintf_func) (info->stream, "%s", "(SP)");
       else
-	(*info->fprintf_func) (info->stream, "$%x%s", offsetvalue,"(SP)");
+	(*info->fprintf_func) (info->stream, "$%lx%s", offsetvalue,"(SP)");
       return;
     }
 
@@ -509,7 +509,7 @@ print_fr (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
     (*info->fprintf_func) (info->stream, "%s", ke->name);
   else
     /* Print as an address literal.  */
-    (*info->fprintf_func) (info->stream, "$%02x", value);
+    (*info->fprintf_func) (info->stream, "$%02lx", value);
 }
 
 static void
@@ -522,7 +522,7 @@ print_dollarhex (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  (*info->fprintf_func) (info->stream, "$%x", value);
+  (*info->fprintf_func) (info->stream, "$%lx", value);
 }
 
 static void
@@ -535,7 +535,7 @@ print_dollarhex8 (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  (*info->fprintf_func) (info->stream, "$%02x", value);
+  (*info->fprintf_func) (info->stream, "$%02lx", value);
 }
 
 static void
@@ -552,7 +552,7 @@ print_dollarhex_addr16h (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
      by 8 bits so that disassembled code will reassemble properly.  */
   value = ((value << 8) & 0xFF00);
 
-  (*info->fprintf_func) (info->stream, "$%04x", value);
+  (*info->fprintf_func) (info->stream, "$%04lx", value);
 }
 
 static void
@@ -565,7 +565,7 @@ print_dollarhex_addr16l (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  (*info->fprintf_func) (info->stream, "$%04x", value);
+  (*info->fprintf_func) (info->stream, "$%04lx", value);
 }
 
 static void
@@ -580,7 +580,7 @@ print_dollarhex_p (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 
   value = ((value << 14) & 0x1C000);
   ;value = (value  & 0x1FFFF);
-  (*info->fprintf_func) (info->stream, "$%05x", value);
+  (*info->fprintf_func) (info->stream, "$%05lx", value);
 }
 
 static void
@@ -594,7 +594,7 @@ print_dollarhex_cj (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
   disassemble_info *info = (disassemble_info *) dis_info;
 
   value = ((value << 1) & 0x1FFFF);
-  (*info->fprintf_func) (info->stream, "$%05x", value);
+  (*info->fprintf_func) (info->stream, "$%05lx", value);
 }
 
 static void
@@ -607,7 +607,7 @@ print_decimal (CGEN_CPU_DESC cd ATTRIBUTE_UNUSED,
 {
   disassemble_info *info = (disassemble_info *) dis_info;
 
-  (*info->fprintf_func) (info->stream, "%d", value);
+  (*info->fprintf_func) (info->stream, "%ld", value);
 }
 
 
-- 
2.43.5