diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 64278e0cf6..fef7e74d10 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-30  Mike Frysinger  <vapier@gentoo.org>
+
+	* sim-core.c (sim_core_read_buffer): Change raddr to address_word.
+	(sim_core_write_buffer): Likewise.
+
 2010-03-30  Mike Frysinger  <vapier@gentoo.org>
 
 	* sim-trace.c (trace_option_handler): Move cpu_nr decl behind
diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
index 92b80037a0..5476ead71f 100644
--- a/sim/common/sim-core.c
+++ b/sim/common/sim-core.c
@@ -516,7 +516,7 @@ sim_core_read_buffer (SIM_DESC sd,
   unsigned count = 0;
   while (count < len)
  {
-    unsigned_word raddr = addr + count;
+    address_word raddr = addr + count;
     sim_core_mapping *mapping =
       sim_core_find_mapping (core, map,
 			    raddr, /*nr-bytes*/1,
@@ -582,7 +582,7 @@ sim_core_write_buffer (SIM_DESC sd,
   unsigned count = 0;
   while (count < len)
     {
-      unsigned_word raddr = addr + count;
+      address_word raddr = addr + count;
       sim_core_mapping *mapping =
 	sim_core_find_mapping (core, map,
 			       raddr, /*nr-bytes*/1,