From 9add17f218409f357d5ed8b831c777ac93f41ec4 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Tue, 6 Mar 2018 16:57:41 +0000 Subject: [PATCH] gdb/riscv: Remove partial target description support Some parts of the target description support were committed with the initial riscv patch. As target descriptions are not currently supported on riscv this commit removes the two pieces for code that relate to target description support. It is expected that target description support will be added in the future, at which point this, or similar code will be added back. gdb/ChangeLog: * riscv-tdep.c (riscv_register_name): Remove target description support. (riscv_gdbarch_init): Remove target description check. --- gdb/ChangeLog | 6 ++++++ gdb/riscv-tdep.c | 37 ------------------------------------- 2 files changed, 6 insertions(+), 37 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ccd1354fb4c..4eb6b9b9710 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2018-03-06 Andrew Burgess + + * riscv-tdep.c (riscv_register_name): Remove target description + support. + (riscv_gdbarch_init): Remove target description check. + 2018-03-06 Andrew Burgess * riscv-tdep.c: Remove 'Contributed by ...' lines from header diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c index bc25edfa9f2..11b12279321 100644 --- a/gdb/riscv-tdep.c +++ b/gdb/riscv-tdep.c @@ -464,9 +464,6 @@ value_of_riscv_user_reg (struct frame_info *frame, const void *baton) static const char * riscv_register_name (struct gdbarch *gdbarch, int regnum) { - if (tdesc_has_registers (gdbarch_target_desc (gdbarch))) - return tdesc_register_name (gdbarch, regnum); - /* Prefer to use the alias. */ if (regnum >= RISCV_ZERO_REGNUM && regnum <= RISCV_LAST_REGNUM) { @@ -2565,40 +2562,6 @@ riscv_gdbarch_init (struct gdbarch_info info, dwarf2_append_unwinders (gdbarch); frame_unwind_append_unwinder (gdbarch, &riscv_frame_unwind); - /* Check any target description for validity. */ - if (tdesc_has_registers (info.target_desc)) - { - const struct tdesc_feature *feature; - struct tdesc_arch_data *tdesc_data; - int valid_p; - - feature = tdesc_find_feature (info.target_desc, "org.gnu.gdb.riscv.cpu"); - if (feature == NULL) - goto no_tdata; - - tdesc_data = tdesc_data_alloc (); - - valid_p = 1; - for (i = RISCV_ZERO_REGNUM; i <= RISCV_LAST_FP_REGNUM; ++i) - valid_p &= tdesc_numbered_register (feature, tdesc_data, i, - riscv_gdb_reg_names[i]); - for (i = RISCV_FIRST_CSR_REGNUM; i <= RISCV_LAST_CSR_REGNUM; ++i) - { - char buf[20]; - - sprintf (buf, "csr%d", i - RISCV_FIRST_CSR_REGNUM); - valid_p &= tdesc_numbered_register (feature, tdesc_data, i, buf); - } - - valid_p &= tdesc_numbered_register (feature, tdesc_data, i++, "priv"); - - if (!valid_p) - tdesc_data_cleanup (tdesc_data); - else - tdesc_use_registers (gdbarch, info.target_desc, tdesc_data); - } - no_tdata: - for (i = 0; i < ARRAY_SIZE (riscv_register_aliases); ++i) user_reg_add (gdbarch, riscv_register_aliases[i].name, value_of_riscv_user_reg, &riscv_register_aliases[i].regnum); -- 2.30.2