diff options
Diffstat (limited to 'sim/frv')
| -rw-r--r-- | sim/frv/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/frv/sim-main.h | 6 |
2 files changed, 7 insertions, 4 deletions
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. */ |