diff options
Diffstat (limited to 'sim/d10v')
| -rw-r--r-- | sim/d10v/ChangeLog | 9 | ||||
| -rw-r--r-- | sim/d10v/interp.c | 17 |
2 files changed, 20 insertions, 6 deletions
diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog index 0ff2c2b..6a796bb 100644 --- a/sim/d10v/ChangeLog +++ b/sim/d10v/ChangeLog @@ -1,3 +1,12 @@ +2015-12-30 Mike Frysinger <vapier@gentoo.org> + + * wrapper.c (d10v_reg_store, d10v_reg_fetch): Define. + (sim_open): Call CPU_REG_FETCH/CPU_REG_STORE. + (sim_store_register): Rename to ... + (d10v_reg_store): ... this. Rename cpu to sd. + (sim_fetch_register): Rename to ... + (d10v_reg_fetch): ... this. Rename cpu to sd. + 2015-12-27 Mike Frysinger <vapier@gentoo.org> * Makefile.in (SIM_OBJS): Delete sim-hload.o. diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c index 330fbbc..807c5c2 100644 --- a/sim/d10v/interp.c +++ b/sim/d10v/interp.c @@ -742,6 +742,9 @@ free_state (SIM_DESC sd) sim_state_free (sd); } +static int d10v_reg_fetch (SIM_CPU *, int, unsigned char *, int); +static int d10v_reg_store (SIM_CPU *, int, unsigned char *, int); + SIM_DESC sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv) { @@ -806,6 +809,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, struct bfd *abfd, char **argv) { SIM_CPU *cpu = STATE_CPU (sd, i); + CPU_REG_FETCH (cpu) = d10v_reg_fetch; + CPU_REG_STORE (cpu) = d10v_reg_store; CPU_PC_FETCH (cpu) = d10v_pc_get; CPU_PC_STORE (cpu) = d10v_pc_set; } @@ -1196,10 +1201,10 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, char **argv, char **env) return SIM_RC_OK; } -int -sim_fetch_register (SIM_DESC sd, int rn, unsigned char *memory, int length) +static int +d10v_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length) { - SIM_CPU *cpu = STATE_CPU (sd, 0); + SIM_DESC sd = CPU_STATE (cpu); int size; switch ((enum sim_d10v_regs) rn) { @@ -1280,10 +1285,10 @@ sim_fetch_register (SIM_DESC sd, int rn, unsigned char *memory, int length) return size; } -int -sim_store_register (SIM_DESC sd, int rn, unsigned char *memory, int length) +static int +d10v_reg_store (SIM_CPU *cpu, int rn, unsigned char *memory, int length) { - SIM_CPU *cpu = STATE_CPU (sd, 0); + SIM_DESC sd = CPU_STATE (cpu); int size; switch ((enum sim_d10v_regs) rn) { |