diff --git a/sim/v850/simops.c b/sim/v850/simops.c
index 1d5403be561..67656d398c8 100644
--- a/sim/v850/simops.c
+++ b/sim/v850/simops.c
@@ -3387,7 +3387,7 @@ v850_satsub (SIM_DESC sd, unsigned int op0, unsigned int op1, unsigned int *op2p
 
 uint32_t
 load_data_mem (SIM_DESC  sd,
-	       SIM_ADDR  addr,
+	       address_word  addr,
 	       int       len)
 {
   uint32_t data;
@@ -3414,7 +3414,7 @@ load_data_mem (SIM_DESC  sd,
 
 void
 store_data_mem (SIM_DESC    sd,
-		SIM_ADDR    addr,
+		address_word    addr,
 		int         len,
 		uint32_t  data)
 {
diff --git a/sim/v850/simops.h b/sim/v850/simops.h
index 632febe5de5..85339f55cbe 100644
--- a/sim/v850/simops.h
+++ b/sim/v850/simops.h
@@ -79,8 +79,8 @@ int OP_307E0 (void);
 int v850_float_compare(SIM_DESC sd, int cmp, sim_fpu wop1, sim_fpu wop2, int double_op_p);
 
 /* MEMORY ACCESS */
-uint32_t load_data_mem(SIM_DESC sd, SIM_ADDR addr, int len);
-void store_data_mem(SIM_DESC sd, SIM_ADDR addr, int len, uint32_t data);
+uint32_t load_data_mem(SIM_DESC sd, address_word addr, int len);
+void store_data_mem(SIM_DESC sd, address_word addr, int len, uint32_t data);
 
 unsigned long Add32 (unsigned long a1, unsigned long a2, int * carry);