diff options
| author | Andrew Cagney <cagney@redhat.com> | 2003-03-29 01:40:01 +0000 |
|---|---|---|
| committer | Andrew Cagney <cagney@redhat.com> | 2003-03-29 01:40:01 +0000 |
| commit | e8933a55f2eef4804910286757df001d19e46b10 (patch) | |
| tree | 0e3dacf6186272847fba21f5d14e3a2d2ca9ab90 /gdb/d10v-tdep.c | |
| parent | 5941afc1054ede37b6d8981269b8fe4519458eac (diff) | |
| download | gdb-e8933a55f2eef4804910286757df001d19e46b10.zip gdb-e8933a55f2eef4804910286757df001d19e46b10.tar.gz gdb-e8933a55f2eef4804910286757df001d19e46b10.tar.bz2 | |
2003-03-28 Andrew Cagney <cagney@redhat.com>
* Makefile.in (d10v-tdep.o): Update dependencies.
* remote.h (target_resume_hook, target_wait_loop_hook): Declare.
* d10v-tdep.c: Include "remote.h".
(target_resume_hook): Delete extern declaration.
(target_wait_loop_hook): Ditto.
(tdisassemble_command): Eliminate assignment in "if" conditional.
(d10v_ts2_register_sim_regno): Eliminate call to
legacy_register_sim_regno.
(d10v_ts3_register_sim_regno): Ditto.
Diffstat (limited to 'gdb/d10v-tdep.c')
| -rw-r--r-- | gdb/d10v-tdep.c | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/gdb/d10v-tdep.c b/gdb/d10v-tdep.c index c996223..f15eeaa 100644 --- a/gdb/d10v-tdep.c +++ b/gdb/d10v-tdep.c @@ -38,7 +38,7 @@ #include "language.h" #include "arch-utils.h" #include "regcache.h" - +#include "remote.h" #include "floatformat.h" #include "gdb/sim-d10v.h" #include "sim-regno.h" @@ -276,8 +276,8 @@ d10v_imap_register (int reg_nr) static int d10v_ts2_register_sim_regno (int nr) { - if (legacy_register_sim_regno (nr) < 0) - return legacy_register_sim_regno (nr); + /* Only makes sense to supply raw registers. */ + gdb_assert (nr >= 0 && nr < NUM_REGS); if (nr >= TS2_IMAP0_REGNUM && nr < TS2_IMAP0_REGNUM + NR_IMAP_REGS) return nr - TS2_IMAP0_REGNUM + SIM_D10V_IMAP0_REGNUM; @@ -292,8 +292,8 @@ d10v_ts2_register_sim_regno (int nr) static int d10v_ts3_register_sim_regno (int nr) { - if (legacy_register_sim_regno (nr) < 0) - return legacy_register_sim_regno (nr); + /* Only makes sense to supply raw registers. */ + gdb_assert (nr >= 0 && nr < NUM_REGS); if (nr >= TS3_IMAP0_REGNUM && nr < TS3_IMAP0_REGNUM + NR_IMAP_REGS) return nr - TS3_IMAP0_REGNUM + SIM_D10V_IMAP0_REGNUM; @@ -1339,26 +1339,29 @@ tdisassemble_command (char *arg, int from_tty) { int i, count; CORE_ADDR low, high; - char *space_index; if (!arg) { low = 0; high = trace_data.size; } - else if (!(space_index = (char *) strchr (arg, ' '))) - { - low = parse_and_eval_address (arg); - high = low + 5; - } else - { - /* Two arguments. */ - *space_index = '\0'; - low = parse_and_eval_address (arg); - high = parse_and_eval_address (space_index + 1); - if (high < low) - high = low; + { + char *space_index = strchr (arg, ' '); + if (space_index == NULL) + { + low = parse_and_eval_address (arg); + high = low + 5; + } + else + { + /* Two arguments. */ + *space_index = '\0'; + low = parse_and_eval_address (arg); + high = parse_and_eval_address (space_index + 1); + if (high < low) + high = low; + } } printf_filtered ("Dump of trace from %s to %s:\n", paddr_u (low), paddr_u (high)); @@ -1719,10 +1722,6 @@ d10v_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) return gdbarch; } - -extern void (*target_resume_hook) (void); -extern void (*target_wait_loop_hook) (void); - void _initialize_d10v_tdep (void) { |