From: Yao Qi Date: Thu, 3 Nov 2016 14:35:14 +0000 (+0000) Subject: Remove gdbarch_remote_breakpoint_from_pc X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c0f4a997c26760d2584946196ee5c411d1a632a6;p=binutils-gdb.git Remove gdbarch_remote_breakpoint_from_pc This patch removes gdbarch method remote_breakpoint_from_pc, as it is no longer used. gdb: 2016-11-03 Yao Qi * arch-utils.c (default_remote_breakpoint_from_pc): Remove. * arch-utils.h (default_remote_breakpoint_from_pc): Remove. * arm-tdep.c (arm_remote_breakpoint_from_pc): Remove. (arm_gdbarch_init): Don't call set_gdbarch_remote_breakpoint_from_pc. * gdbarch.sh (remote_breakpoint_from_pc): Remove. * gdbarch.c, gdbarch.h: Regenerate. * mips-tdep.c (mips_remote_breakpoint_from_pc): Remove. (mips_gdbarch_init): Don't call set_gdbarch_remote_breakpoint_from_pc. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 80ca8b9b9cd..3e742ac9bce 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2016-11-03 Yao Qi + + * arch-utils.c (default_remote_breakpoint_from_pc): Remove. + * arch-utils.h (default_remote_breakpoint_from_pc): Remove. + * arm-tdep.c (arm_remote_breakpoint_from_pc): Remove. + (arm_gdbarch_init): Don't call + set_gdbarch_remote_breakpoint_from_pc. + * gdbarch.sh (remote_breakpoint_from_pc): Remove. + * gdbarch.c, gdbarch.h: Regenerate. + * mips-tdep.c (mips_remote_breakpoint_from_pc): Remove. + (mips_gdbarch_init): Don't call + set_gdbarch_remote_breakpoint_from_pc. + 2016-11-03 Yao Qi * breakpoint.h (struct bp_target_info) : Remove. diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 776dabc79fc..72156fd5ffe 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -840,13 +840,6 @@ default_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, return 1; } -void -default_remote_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, - int *kindptr) -{ - gdbarch_breakpoint_from_pc (gdbarch, pcptr, kindptr); -} - void default_gen_return_address (struct gdbarch *gdbarch, struct agent_expr *ax, struct axs_value *value, diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index c9a74a77437..ab558e2c805 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -228,9 +228,6 @@ extern int default_has_shared_address_space (struct gdbarch *); extern int default_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, char **msg); -extern void default_remote_breakpoint_from_pc (struct gdbarch *, - CORE_ADDR *pcptr, int *kindptr); - extern void default_gen_return_address (struct gdbarch *gdbarch, struct agent_expr *ax, struct axs_value *value, diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 05b65f1551d..3f21299bcb3 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -7911,14 +7911,6 @@ arm_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size) GDBARCH_BREAKPOINT_FROM_PC (arm) -static void -arm_remote_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, - int *kindptr) -{ - - *kindptr = arm_breakpoint_kind_from_pc (gdbarch, pcptr); -} - /* Extract from an array REGBUF containing the (raw) register state a function return value of type TYPE, and copy that, in virtual format, into VALBUF. */ @@ -9427,8 +9419,6 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Breakpoint manipulation. */ SET_GDBARCH_BREAKPOINT_MANIPULATION (arm); - set_gdbarch_remote_breakpoint_from_pc (gdbarch, - arm_remote_breakpoint_from_pc); /* Information about registers, etc. */ set_gdbarch_sp_regnum (gdbarch, ARM_SP_REGNUM); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 0377b4d906c..a1e311ba188 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -232,7 +232,6 @@ struct gdbarch gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc; gdbarch_breakpoint_kind_from_pc_ftype *breakpoint_kind_from_pc; gdbarch_sw_breakpoint_from_kind_ftype *sw_breakpoint_from_kind; - gdbarch_remote_breakpoint_from_pc_ftype *remote_breakpoint_from_pc; gdbarch_adjust_breakpoint_address_ftype *adjust_breakpoint_address; gdbarch_memory_insert_breakpoint_ftype *memory_insert_breakpoint; gdbarch_memory_remove_breakpoint_ftype *memory_remove_breakpoint; @@ -406,7 +405,6 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->address_to_pointer = unsigned_address_to_pointer; gdbarch->return_in_first_hidden_param_p = default_return_in_first_hidden_param_p; gdbarch->sw_breakpoint_from_kind = NULL; - gdbarch->remote_breakpoint_from_pc = default_remote_breakpoint_from_pc; gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint; gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint; gdbarch->remote_register_number = default_remote_register_number; @@ -589,7 +587,6 @@ verify_gdbarch (struct gdbarch *gdbarch) if (gdbarch->breakpoint_kind_from_pc == 0) fprintf_unfiltered (log, "\n\tbreakpoint_kind_from_pc"); /* Skip verify of sw_breakpoint_from_kind, invalid_p == 0 */ - /* Skip verify of remote_breakpoint_from_pc, invalid_p == 0 */ /* Skip verify of adjust_breakpoint_address, has predicate. */ /* Skip verify of memory_insert_breakpoint, invalid_p == 0 */ /* Skip verify of memory_remove_breakpoint, invalid_p == 0 */ @@ -1290,9 +1287,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: relocate_instruction = <%s>\n", host_address_to_string (gdbarch->relocate_instruction)); - fprintf_unfiltered (file, - "gdbarch_dump: remote_breakpoint_from_pc = <%s>\n", - host_address_to_string (gdbarch->remote_breakpoint_from_pc)); fprintf_unfiltered (file, "gdbarch_dump: remote_register_number = <%s>\n", host_address_to_string (gdbarch->remote_register_number)); @@ -2828,23 +2822,6 @@ set_gdbarch_sw_breakpoint_from_kind (struct gdbarch *gdbarch, gdbarch->sw_breakpoint_from_kind = sw_breakpoint_from_kind; } -void -gdbarch_remote_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *kindptr) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->remote_breakpoint_from_pc != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_remote_breakpoint_from_pc called\n"); - gdbarch->remote_breakpoint_from_pc (gdbarch, pcptr, kindptr); -} - -void -set_gdbarch_remote_breakpoint_from_pc (struct gdbarch *gdbarch, - gdbarch_remote_breakpoint_from_pc_ftype remote_breakpoint_from_pc) -{ - gdbarch->remote_breakpoint_from_pc = remote_breakpoint_from_pc; -} - int gdbarch_adjust_breakpoint_address_p (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 807f7909a86..09cb8cc7fe1 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -564,14 +564,6 @@ typedef const gdb_byte * (gdbarch_sw_breakpoint_from_kind_ftype) (struct gdbarch extern const gdb_byte * gdbarch_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size); extern void set_gdbarch_sw_breakpoint_from_kind (struct gdbarch *gdbarch, gdbarch_sw_breakpoint_from_kind_ftype *sw_breakpoint_from_kind); -/* Return the adjusted address and kind to use for Z0/Z1 packets. - KIND is usually the memory length of the breakpoint, but may have a - different target-specific meaning. */ - -typedef void (gdbarch_remote_breakpoint_from_pc_ftype) (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *kindptr); -extern void gdbarch_remote_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *kindptr); -extern void set_gdbarch_remote_breakpoint_from_pc (struct gdbarch *gdbarch, gdbarch_remote_breakpoint_from_pc_ftype *remote_breakpoint_from_pc); - extern int gdbarch_adjust_breakpoint_address_p (struct gdbarch *gdbarch); typedef CORE_ADDR (gdbarch_adjust_breakpoint_address_ftype) (struct gdbarch *gdbarch, CORE_ADDR bpaddr); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 5e2726d08f6..e410e657bb2 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -569,10 +569,6 @@ m:int:breakpoint_kind_from_pc:CORE_ADDR *pcptr:pcptr::0: # SIZE is set to the software breakpoint's length in memory. m:const gdb_byte *:sw_breakpoint_from_kind:int kind, int *size:kind, size::NULL::0 -# Return the adjusted address and kind to use for Z0/Z1 packets. -# KIND is usually the memory length of the breakpoint, but may have a -# different target-specific meaning. -m:void:remote_breakpoint_from_pc:CORE_ADDR *pcptr, int *kindptr:pcptr, kindptr:0:default_remote_breakpoint_from_pc::0 M:CORE_ADDR:adjust_breakpoint_address:CORE_ADDR bpaddr:bpaddr m:int:memory_insert_breakpoint:struct bp_target_info *bp_tgt:bp_tgt:0:default_memory_insert_breakpoint::0 m:int:memory_remove_breakpoint:struct bp_target_info *bp_tgt:bp_tgt:0:default_memory_remove_breakpoint::0 diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 424150a031b..6a254f500dd 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -7131,15 +7131,6 @@ mips_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size) GDBARCH_BREAKPOINT_FROM_PC (mips) -/* Determine the remote breakpoint kind suitable for the PC. */ - -static void -mips_remote_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, - int *kindptr) -{ - *kindptr = mips_breakpoint_kind_from_pc (gdbarch, pcptr); -} - /* Return non-zero if the standard MIPS instruction INST has a branch delay slot (i.e. it is a jump or branch instruction). This function is based on mips32_next_pc. */ @@ -8736,8 +8727,6 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_inner_than (gdbarch, core_addr_lessthan); SET_GDBARCH_BREAKPOINT_MANIPULATION (mips); - set_gdbarch_remote_breakpoint_from_pc (gdbarch, - mips_remote_breakpoint_from_pc); set_gdbarch_adjust_breakpoint_address (gdbarch, mips_adjust_breakpoint_address);