From 7e83aa92f2d986ba60f124287a9fd1e534fbbcf8 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> 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/frv/ChangeLog | 5 +++++ sim/frv/sim-main.h | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'sim/frv') diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 1724c35..750695f 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,3 +1,8 @@ +2015-04-18 Mike Frysinger <vapier@gentoo.org> + + * sim-main.h (sim_cia): Delete. + (frv_sim_engine_halt_hook): Move below includes. + 2015-04-17 Mike Frysinger <vapier@gentoo.org> * sim-main.h (CIA_GET, CIA_SET): Delete. diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h index 275ac28..fd12c4f 100644 --- a/sim/frv/sim-main.h +++ b/sim/frv/sim-main.h @@ -40,10 +40,6 @@ typedef struct _sim_cpu SIM_CPU; #include "frv-opc.h" #include "arch.h" -/* These must be defined before sim-base.h. */ -typedef USI sim_cia; - -void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia); #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) \ frv_sim_engine_halt_hook ((SD), (LAST_CPU), (CIA)) @@ -55,6 +51,8 @@ void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia); #include "cache.h" #include "registers.h" #include "profile.h" + +void frv_sim_engine_halt_hook (SIM_DESC, SIM_CPU *, sim_cia); /* The _sim_cpu struct. */ -- cgit v1.1