From 7e83aa92f2d986ba60f124287a9fd1e534fbbcf8 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 18 Apr 2015 04:08:56 -0400 Subject: sim: unify sim_cia definition Almost every target defines sim_cia the same way -- either using the address_word type directly, or a type of equivalent size. The only odd one out is sh64 (who has 32bit address_word and 64bit cia), and even that case doesn't seem to make sense. We'll put off clean up though of sh64 and at least set up a sensible default for everyone. --- sim/m32r/ChangeLog | 4 ++++ sim/m32r/sim-main.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'sim/m32r') diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index d47cdfb..dc82037 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,7 @@ +2015-04-18 Mike Frysinger + + * sim-main.h (sim_cia): Delete. + 2015-04-17 Mike Frysinger * sim-main.h (CIA_GET, CIA_SET): Delete. diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h index 661d9cf..6839a41 100644 --- a/sim/m32r/sim-main.h +++ b/sim/m32r/sim-main.h @@ -15,9 +15,6 @@ typedef struct _sim_cpu SIM_CPU; #include "m32r-opc.h" #include "arch.h" -/* These must be defined before sim-base.h. */ -typedef USI sim_cia; - #define SIM_ENGINE_HALT_HOOK(sd, cpu, cia) \ do { \ if (cpu) /* null if ctrl-c */ \ -- cgit v1.1