aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sim/cr16/ChangeLog6
-rw-r--r--sim/cr16/cr16_sim.h5
-rw-r--r--sim/cr16/endian.c15
3 files changed, 6 insertions, 20 deletions
diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 360b234..aaf44eb 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,5 +1,11 @@
2015-11-15 Mike Frysinger <vapier@gentoo.org>
+ * cr16_sim.h (get_longlong, write_longlong, WRITE_16, READ_64,
+ WRITE_64): Delete.
+ * endian.c (get_longlong, write_longlong): Likewise.
+
+2015-11-15 Mike Frysinger <vapier@gentoo.org>
+
* Makefile.in (SIM_OBJS): Add sim-reg.o.
* interp.c (cr16_reg_fetch, cr16_reg_store): Add prototypes.
(sim_open): Call CPU_REG_FETCH/CPU_REG_STORE.
diff --git a/sim/cr16/cr16_sim.h b/sim/cr16/cr16_sim.h
index 5e0eabe..e9769ac 100644
--- a/sim/cr16/cr16_sim.h
+++ b/sim/cr16/cr16_sim.h
@@ -436,10 +436,8 @@ extern bfd_vma decode_pc (void);
#else
extern uint32 get_longword (uint8 *);
extern uint16 get_word (uint8 *);
-extern int64 get_longlong (uint8 *);
extern void write_word (uint8 *addr, uint16 data);
extern void write_longword (uint8 *addr, uint32 data);
-extern void write_longlong (uint8 *addr, int64 data);
#endif
#define SW(addr,data) write_word(dmem_addr(addr),data)
@@ -447,9 +445,6 @@ extern void write_longlong (uint8 *addr, int64 data);
#define SLW(addr,data) write_longword(dmem_addr(addr),data)
#define RLW(x) get_longword(dmem_addr(x))
#define READ_16(x) get_word(x)
-#define WRITE_16(addr,data) write_word(addr,data)
-#define READ_64(x) get_longlong(x)
-#define WRITE_64(addr,data) write_longlong(addr,data)
#define JMP(x) do { SET_PC (x); State.pc_changed = 1; } while (0)
diff --git a/sim/cr16/endian.c b/sim/cr16/endian.c
index 3cf2f22..03f79ac 100644
--- a/sim/cr16/endian.c
+++ b/sim/cr16/endian.c
@@ -39,14 +39,6 @@ get_longword (uint8 *x)
return (((uint32) *(uint16 *)x) << 16) | ((uint32) *(uint16 *)(x+2));
}
-ENDIAN_INLINE int64
-get_longlong (uint8 *x)
-{
- uint32 top = get_longword (x);
- uint32 bottom = get_longword (x+4);
- return (((int64)top)<<32) | (int64)bottom;
-}
-
ENDIAN_INLINE void
write_word (uint8 *addr, uint16 data)
{
@@ -61,10 +53,3 @@ write_longword (uint8 *addr, uint32 data)
*(uint16 *)(addr + 2) = (uint16)(data >> 16);
*(uint16 *)(addr) = (uint16)data;
}
-
-ENDIAN_INLINE void
-write_longlong (uint8 *addr, int64 data)
-{
- write_longword (addr+4, (uint32)(data >> 32));
- write_longword (addr, (uint32)data);
-}