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 <vapier@gentoo.org>

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 6e6d2fd..462fb61 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-25  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-core.h (sim_core_trans_addr): Add prototype.
+
 2012-03-24  Hans-Peter Nilsson  <hp@axis.com>
 
        * 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 5797be0..9607b60 100644 (file)
--- 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 6a85991..d59b73c 100644 (file)
--- a/sim/m32r/ChangeLog
+++ b/sim/m32r/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-25  Mike Frysinger  <vapier@gentoo.org>
+
+       * traps-linux.c (sim_core_trans_addr): Delete prototype.
+
 2012-03-24  Mike Frysinger  <vapier@gentoo.org>
 
        * aclocal.m4, config.in, configure: Regenerate.

diff --git a/sim/m32r/traps-linux.c b/sim/m32r/traps-linux.c
index 0138a4e..d7d552b 100644 (file)
--- 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;