From a6a51ac72004a195a766e444883daa3b6f8bbf24 Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Fri, 1 May 1998 05:44:17 +0000
Subject: [PATCH] Fix type of arguments to sim_engine_halt.

---
 sim/tic80/ChangeLog |  4 ++++
 sim/tic80/insns     | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sim/tic80/ChangeLog b/sim/tic80/ChangeLog
index fcee92811e..a0f79c0eb2 100644
--- a/sim/tic80/ChangeLog
+++ b/sim/tic80/ChangeLog
@@ -1,3 +1,7 @@
+Fri May  1 14:41:11 1998  Andrew Cagney  <cagney@b1.cygnus.com>
+
+	* insns: Pass correct arguments to sim_engine_abort.
+
 Tue Apr 28 18:33:31 1998  Geoffrey Noer  <noer@cygnus.com>
 
         * configure: Regenerated to track ../common/aclocal.m4 changes.
diff --git a/sim/tic80/insns b/sim/tic80/insns
index fb05919ac4..73d9375fa1 100644
--- a/sim/tic80/insns
+++ b/sim/tic80/insns
@@ -981,7 +981,7 @@ void::function::do_shift:int Dest, unsigned32 source, int Merge, int i, int n, i
 	  default:
 	    sim_engine_abort (SD, CPU, cia,
 	                      "0x%lx: Invalid merge (%d) for shift",
-	                      cia.ip, source);
+	                      (long) cia.ip, (int) source);
 	    shiftmask = 0;
 	  }
 	/* and the composite mask */
@@ -1008,7 +1008,7 @@ void::function::do_shift:int Dest, unsigned32 source, int Merge, int i, int n, i
 	  default:
 	    sim_engine_abort (SD, CPU, cia,
 	                      "0x%lx: Invalid merge (%d)",
-	                      cia.ip, source);
+	                      (long) cia.ip, (int) source);
 
 	  }
 	TRACE_SHIFT (MY_INDEX, GPR (Dest), input, i, n, Merge, EndMask, Rotate);
@@ -1193,7 +1193,7 @@ void::function::do_trap:unsigned32 trap_number
 	          else
 	            sim_engine_abort (SD, CPU, cia,
 	                              "0x%lx: write to invalid fid %d",
-	                              (unsigned long) cia.ip, GPR(2));
+	                              (long) cia.ip, (int) GPR(2));
 	          GPR(2) = GPR(6);
 	          break;
 	        }
@@ -1225,7 +1225,7 @@ void::function::do_trap:unsigned32 trap_number
 		  }
 	        sim_engine_abort (SD, CPU, cia,
 	                          "0x%lx: unknown syscall %d",
-	                          (unsigned long) cia.ip, GPR(15));
+	                          (long) cia.ip, (int) GPR(15));
 	      }
 	    break;
 	  case 73:
@@ -1252,7 +1252,7 @@ void::function::do_trap:unsigned32 trap_number
 	  default:
 	    sim_engine_abort (SD, CPU, cia,
 	                      "0x%lx: unsupported trap %d",
-	                      (unsigned long) cia.ip, trap_number);
+	                      (long) cia.ip, (int) trap_number);
 	  }
 31./,27.0,26./,21.0b0000001,14.UTN::::trap i
 "trap <UTN>"