From patchwork Wed Aug 31 15:06:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Qi X-Patchwork-Id: 15127 Received: (qmail 97038 invoked by alias); 31 Aug 2016 15:06:36 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 96800 invoked by uid 89); 31 Aug 2016 15:06:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=no version=3.3.2 spammy=586, 7, 5867, 93716 X-HELO: mail-pf0-f195.google.com Received: from mail-pf0-f195.google.com (HELO mail-pf0-f195.google.com) (209.85.192.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 31 Aug 2016 15:06:26 +0000 Received: by mail-pf0-f195.google.com with SMTP id i6so2903959pfe.0 for ; Wed, 31 Aug 2016 08:06:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=bNZ08EKtMFJ3lTXZHHxorQ/St/yicwJHoYa/61t3GLM=; b=ddePM1XSxuOeUsnGFYSD2KrfV+S1eRRWmh3WYxrPIQ82XpZRXHTF+59J/GlPNEjqCs kZj78S8eOLsqcBL0Yhqutn4g7qoP1dyafwJyvmlTIWnk6BO1Oef/ysWv9E3tZ5Mv2K/C oqvptfmuBi08vHzR1S5Bx97zbvQi7LMQCbwdviYtlxWz1ZPXjSOTmAJ2gDNXGTF3qgEi ZrcoLZHBTYu5NPbRV0UQz/pARU2MsqHeibTXJ5G4ijcPiZ/YsH+NvS2ljKlakVcVuPhu LD53UNaaBXBsL0rH8tWlzc+7CrDWWreWN3q/Wt1FFKkTr9rRrFcePLOmsg5YbWD1yO2C 4Fow== X-Gm-Message-State: AE9vXwMhRKx0ZtG6iwTWg+6dC1ssG0MtjKc6e6J8uITc7NRANC+pbIG/CQslpzFYZ71OOQ== X-Received: by 10.98.35.145 with SMTP id q17mr17718628pfj.42.1472655984271; Wed, 31 Aug 2016 08:06:24 -0700 (PDT) Received: from E107787-LIN.cambridge.arm.com (gcc115.osuosl.org. [140.211.9.73]) by smtp.gmail.com with ESMTPSA id c125sm464809pfc.40.2016.08.31.08.06.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Aug 2016 08:06:23 -0700 (PDT) From: Yao Qi X-Google-Original-From: Yao Qi To: gdb-patches@sourceware.org Subject: [PATCH 10/13] Remove gdbarch_remote_breakpoint_from_pc Date: Wed, 31 Aug 2016 16:06:02 +0100 Message-Id: <1472655965-12212-11-git-send-email-yao.qi@linaro.org> In-Reply-To: <1472655965-12212-1-git-send-email-yao.qi@linaro.org> References: <1472655965-12212-1-git-send-email-yao.qi@linaro.org> X-IsSubscribed: yes This patch removes gdbarch method remote_breakpoint_from_pc, as it is no longer used. gdb: 2016-08-30 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. --- gdb/arch-utils.c | 7 ------- gdb/arch-utils.h | 3 --- gdb/arm-tdep.c | 10 ---------- gdb/gdbarch.c | 23 ----------------------- gdb/gdbarch.h | 8 -------- gdb/gdbarch.sh | 4 ---- gdb/mips-tdep.c | 24 ++++++++++++------------ 7 files changed, 12 insertions(+), 67 deletions(-) diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 53121bc..b562716 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -813,13 +813,6 @@ default_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, } 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, CORE_ADDR scope) diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index 0386d3d..263f4d5 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -223,9 +223,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 065d177..eba59a5 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -7863,14 +7863,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. */ @@ -9379,8 +9371,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 a1cf602..c85dc9a 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -231,7 +231,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; @@ -404,7 +403,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; @@ -586,7 +584,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 */ @@ -1285,9 +1282,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *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)); fprintf_unfiltered (file, @@ -2805,23 +2799,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 29abf65..65a6a6e 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -556,14 +556,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 b73c6fa..d7e4d87 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -564,10 +564,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 e73b6e1..10a1b08 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -7050,7 +7050,18 @@ gdb_print_insn_mips_n64 (bfd_vma memaddr, struct disassemble_info *info) return gdb_print_insn_mips (memaddr, info); } -/* Implement the breakpoint_kind_from_pc gdbarch method. */ +/* Implement the breakpoint_kind_from_pc gdbarch method. + + Determine the remote breakpoint kind suitable for the PC. The following + kinds are used: + + * 2 -- 16-bit MIPS16 mode breakpoint, + + * 3 -- 16-bit microMIPS mode breakpoint, + + * 4 -- 32-bit standard MIPS mode breakpoint, + + * 5 -- 32-bit microMIPS mode breakpoint. */ static int mips_breakpoint_kind_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr) @@ -7178,15 +7189,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. */ @@ -8798,8 +8800,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);