From a35a332283963d66a7ff272ace86cf49c50119e1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 26 Mar 2012 02:18:43 +0000 Subject: [PATCH] sim: add a proper sim_core_trans_addr prototype The common code has a sim_core_trans_addr() helper that only the m32r code uses. Move the inline extern in the m32r code to the proper common header. Signed-off-by: Mike Frysinger --- sim/common/ChangeLog | 4 ++++ sim/common/sim-core.h | 8 ++++++++ sim/m32r/ChangeLog | 4 ++++ sim/m32r/traps-linux.c | 1 - 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 6e6d2fd7035..462fb61b3c4 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,7 @@ +2012-03-25 Mike Frysinger + + * sim-core.h (sim_core_trans_addr): Add prototype. + 2012-03-24 Hans-Peter Nilsson * nrun.c: Add #ifdef HAVE_CONFIG_H and associated includes stanza diff --git a/sim/common/sim-core.h b/sim/common/sim-core.h index 5797be0e625..9607b6029c5 100644 --- a/sim/common/sim-core.h +++ b/sim/common/sim-core.h @@ -241,6 +241,14 @@ extern unsigned sim_core_xor_write_buffer unsigned nr_bytes); +/* Translate an address based on a map. */ + +extern void *sim_core_trans_addr +(SIM_DESC sd, + sim_cpu *cpu, + unsigned map, + address_word addr); + /* Fixed sized, processor oriented, read/write. diff --git a/sim/m32r/ChangeLog b/sim/m32r/ChangeLog index 6a85991b8bc..d59b73c120d 100644 --- a/sim/m32r/ChangeLog +++ b/sim/m32r/ChangeLog @@ -1,3 +1,7 @@ +2012-03-25 Mike Frysinger + + * traps-linux.c (sim_core_trans_addr): Delete prototype. + 2012-03-24 Mike Frysinger * aclocal.m4, config.in, configure: Regenerate. diff --git a/sim/m32r/traps-linux.c b/sim/m32r/traps-linux.c index 0138a4edb36..d7d552b3e90 100644 --- a/sim/m32r/traps-linux.c +++ b/sim/m32r/traps-linux.c @@ -141,7 +141,6 @@ static void * t2h_addr (host_callback *cb, struct cb_syscall *sc, unsigned long taddr) { - extern sim_core_trans_addr (SIM_DESC, sim_cpu *, unsigned, address_word); void *addr; SIM_DESC sd = (SIM_DESC) sc->p1; SIM_CPU *cpu = (SIM_CPU *) sc->p2; -- 2.30.2