aboutsummaryrefslogtreecommitdiff
path: root/sim/microblaze/microblaze.h
diff options
context:
space:
mode:
Diffstat (limited to 'sim/microblaze/microblaze.h')
-rw-r--r--sim/microblaze/microblaze.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/sim/microblaze/microblaze.h b/sim/microblaze/microblaze.h
index e08f5a0..6b10d56 100644
--- a/sim/microblaze/microblaze.h
+++ b/sim/microblaze/microblaze.h
@@ -52,18 +52,16 @@
#define RETREG CPU.regs[3]
-#define MEM(X) memory[X]
-
-#define MEM_RD_BYTE(X) rbat(cpu, X)
-#define MEM_RD_HALF(X) rhat(cpu, X)
-#define MEM_RD_WORD(X) rlat(cpu, X)
+#define MEM_RD_BYTE(X) sim_core_read_1 (cpu, 0, read_map, X)
+#define MEM_RD_HALF(X) sim_core_read_2 (cpu, 0, read_map, X)
+#define MEM_RD_WORD(X) sim_core_read_4 (cpu, 0, read_map, X)
#define MEM_RD_UBYTE(X) (ubyte) MEM_RD_BYTE(X)
#define MEM_RD_UHALF(X) (uhalf) MEM_RD_HALF(X)
#define MEM_RD_UWORD(X) (uword) MEM_RD_WORD(X)
-#define MEM_WR_BYTE(X, D) wbat(cpu, X, D)
-#define MEM_WR_HALF(X, D) what(cpu, X, D)
-#define MEM_WR_WORD(X, D) wlat(cpu, X, D)
+#define MEM_WR_BYTE(X, D) sim_core_write_1 (cpu, 0, write_map, X, D)
+#define MEM_WR_HALF(X, D) sim_core_write_2 (cpu, 0, write_map, X, D)
+#define MEM_WR_WORD(X, D) sim_core_write_4 (cpu, 0, write_map, X, D)
#define MICROBLAZE_SEXT8(X) ((char) X)