From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24703 invoked by alias); 13 Jan 2014 19:23:39 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 24691 invoked by uid 89); 13 Jan 2014 19:23:38 -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,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 13 Jan 2014 19:23:36 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0DJD7Yj031894 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 13 Jan 2014 14:13:07 -0500 Received: from barimba.redhat.com (ovpn-113-85.phx2.redhat.com [10.3.113.85]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0DJCptQ016701; Mon, 13 Jan 2014 14:13:06 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 20/32] convert to_remove_watchpoint Date: Mon, 13 Jan 2014 19:23:00 -0000 Message-Id: <1389640367-5571-21-git-send-email-tromey@redhat.com> In-Reply-To: <1389640367-5571-1-git-send-email-tromey@redhat.com> References: <1389640367-5571-1-git-send-email-tromey@redhat.com> X-SW-Source: 2014-01/txt/msg00350.txt.bz2 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_remove_watchpoint. * target.h (struct target_ops) : Use TARGET_DEFAULT_NORETURN. convert to_watchpoint_addr_within_range 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_watchpoint_addr_within_range. * target.h (struct target_ops) : Use TARGET_DEFAULT_FUNC. convert to_region_ok_for_hw_watchpoint 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_region_ok_for_hw_watchpoint. * target.h (struct target_ops) : Use TARGET_DEFAULT_FUNC. convert to_can_acce_watchpoint_condition 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_can_accel_watchpoint_condition. * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. convert to_terminal_init 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_terminal_init. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. convert to_terminal_inferior 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_terminal_inferior. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. convert to_terminal_ours_for_output 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_terminal_ours_for_output. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. convert to_terminal_ours 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_terminal_ours. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. convert to_terminal_save_ours 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_terminal_save_ours. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. convert to_terminal_info 2014-01-08 Tom Tromey * target-delegates.c : Rebuild. * target.c (update_current_target): Don't inherit or default to_terminal_info. * target.h (struct target_ops) : Use TARGET_DEFAULT_FUNC. --- gdb/ChangeLog | 80 +++++++++++++++++++++++++++++ gdb/target-delegates.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++ gdb/target.c | 49 ++++-------------- gdb/target.h | 30 +++++++---- 4 files changed, 247 insertions(+), 49 deletions(-) diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 5a5954d..00dc2c5 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -152,6 +152,19 @@ tdefault_remove_hw_breakpoint (struct target_ops *self, struct gdbarch *arg1, st } static int +delegate_remove_watchpoint (struct target_ops *self, CORE_ADDR arg1, int arg2, int arg3, struct expression *arg4) +{ + self = self->beneath; + return self->to_remove_watchpoint (self, arg1, arg2, arg3, arg4); +} + +static int +tdefault_remove_watchpoint (struct target_ops *self, CORE_ADDR arg1, int arg2, int arg3, struct expression *arg4) +{ + return -1; +} + +static int delegate_insert_watchpoint (struct target_ops *self, CORE_ADDR arg1, int arg2, int arg3, struct expression *arg4) { self = self->beneath; @@ -190,6 +203,100 @@ tdefault_stopped_data_address (struct target_ops *self, CORE_ADDR *arg1) return 0; } +static int +delegate_watchpoint_addr_within_range (struct target_ops *self, CORE_ADDR arg1, CORE_ADDR arg2, int arg3) +{ + self = self->beneath; + return self->to_watchpoint_addr_within_range (self, arg1, arg2, arg3); +} + +static int +delegate_region_ok_for_hw_watchpoint (struct target_ops *self, CORE_ADDR arg1, int arg2) +{ + self = self->beneath; + return self->to_region_ok_for_hw_watchpoint (self, arg1, arg2); +} + +static int +delegate_can_accel_watchpoint_condition (struct target_ops *self, CORE_ADDR arg1, int arg2, int arg3, struct expression *arg4) +{ + self = self->beneath; + return self->to_can_accel_watchpoint_condition (self, arg1, arg2, arg3, arg4); +} + +static int +tdefault_can_accel_watchpoint_condition (struct target_ops *self, CORE_ADDR arg1, int arg2, int arg3, struct expression *arg4) +{ + return 0; +} + +static void +delegate_terminal_init (struct target_ops *self) +{ + self = self->beneath; + self->to_terminal_init (self); +} + +static void +tdefault_terminal_init (struct target_ops *self) +{ +} + +static void +delegate_terminal_inferior (struct target_ops *self) +{ + self = self->beneath; + self->to_terminal_inferior (self); +} + +static void +tdefault_terminal_inferior (struct target_ops *self) +{ +} + +static void +delegate_terminal_ours_for_output (struct target_ops *self) +{ + self = self->beneath; + self->to_terminal_ours_for_output (self); +} + +static void +tdefault_terminal_ours_for_output (struct target_ops *self) +{ +} + +static void +delegate_terminal_ours (struct target_ops *self) +{ + self = self->beneath; + self->to_terminal_ours (self); +} + +static void +tdefault_terminal_ours (struct target_ops *self) +{ +} + +static void +delegate_terminal_save_ours (struct target_ops *self) +{ + self = self->beneath; + self->to_terminal_save_ours (self); +} + +static void +tdefault_terminal_save_ours (struct target_ops *self) +{ +} + +static void +delegate_terminal_info (struct target_ops *self, const char *arg1, int arg2) +{ + self = self->beneath; + self->to_terminal_info (self, arg1, arg2); +} + static void delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2) { @@ -279,12 +386,32 @@ install_delegators (struct target_ops *ops) ops->to_insert_hw_breakpoint = delegate_insert_hw_breakpoint; if (ops->to_remove_hw_breakpoint == NULL) ops->to_remove_hw_breakpoint = delegate_remove_hw_breakpoint; + if (ops->to_remove_watchpoint == NULL) + ops->to_remove_watchpoint = delegate_remove_watchpoint; if (ops->to_insert_watchpoint == NULL) ops->to_insert_watchpoint = delegate_insert_watchpoint; if (ops->to_stopped_by_watchpoint == NULL) ops->to_stopped_by_watchpoint = delegate_stopped_by_watchpoint; if (ops->to_stopped_data_address == NULL) ops->to_stopped_data_address = delegate_stopped_data_address; + if (ops->to_watchpoint_addr_within_range == NULL) + ops->to_watchpoint_addr_within_range = delegate_watchpoint_addr_within_range; + if (ops->to_region_ok_for_hw_watchpoint == NULL) + ops->to_region_ok_for_hw_watchpoint = delegate_region_ok_for_hw_watchpoint; + if (ops->to_can_accel_watchpoint_condition == NULL) + ops->to_can_accel_watchpoint_condition = delegate_can_accel_watchpoint_condition; + if (ops->to_terminal_init == NULL) + ops->to_terminal_init = delegate_terminal_init; + if (ops->to_terminal_inferior == NULL) + ops->to_terminal_inferior = delegate_terminal_inferior; + if (ops->to_terminal_ours_for_output == NULL) + ops->to_terminal_ours_for_output = delegate_terminal_ours_for_output; + if (ops->to_terminal_ours == NULL) + ops->to_terminal_ours = delegate_terminal_ours; + if (ops->to_terminal_save_ours == NULL) + ops->to_terminal_save_ours = delegate_terminal_save_ours; + if (ops->to_terminal_info == NULL) + ops->to_terminal_info = delegate_terminal_info; if (ops->to_rcmd == NULL) ops->to_rcmd = delegate_rcmd; if (ops->to_can_async_p == NULL) @@ -315,9 +442,19 @@ install_dummy_methods (struct target_ops *ops) ops->to_can_use_hw_breakpoint = tdefault_can_use_hw_breakpoint; ops->to_insert_hw_breakpoint = tdefault_insert_hw_breakpoint; ops->to_remove_hw_breakpoint = tdefault_remove_hw_breakpoint; + ops->to_remove_watchpoint = tdefault_remove_watchpoint; ops->to_insert_watchpoint = tdefault_insert_watchpoint; ops->to_stopped_by_watchpoint = tdefault_stopped_by_watchpoint; ops->to_stopped_data_address = tdefault_stopped_data_address; + ops->to_watchpoint_addr_within_range = default_watchpoint_addr_within_range; + ops->to_region_ok_for_hw_watchpoint = default_region_ok_for_hw_watchpoint; + ops->to_can_accel_watchpoint_condition = tdefault_can_accel_watchpoint_condition; + ops->to_terminal_init = tdefault_terminal_init; + ops->to_terminal_inferior = tdefault_terminal_inferior; + ops->to_terminal_ours_for_output = tdefault_terminal_ours_for_output; + ops->to_terminal_ours = tdefault_terminal_ours; + ops->to_terminal_save_ours = tdefault_terminal_save_ours; + ops->to_terminal_info = default_terminal_info; ops->to_rcmd = default_rcmd; ops->to_can_async_p = find_default_can_async_p; ops->to_is_async_p = find_default_is_async_p; diff --git a/gdb/target.c b/gdb/target.c index 794d099..f77fb77 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -605,23 +605,23 @@ update_current_target (void) /* Do not inherit to_remove_hw_breakpoint. */ /* Do not inherit to_ranged_break_num_registers. */ /* Do not inherit to_insert_watchpoint. */ - INHERIT (to_remove_watchpoint, t); + /* Do not inherit to_remove_watchpoint. */ /* Do not inherit to_insert_mask_watchpoint. */ /* Do not inherit to_remove_mask_watchpoint. */ /* Do not inherit to_stopped_data_address. */ INHERIT (to_have_steppable_watchpoint, t); INHERIT (to_have_continuable_watchpoint, t); /* Do not inherit to_stopped_by_watchpoint. */ - INHERIT (to_watchpoint_addr_within_range, t); - INHERIT (to_region_ok_for_hw_watchpoint, t); - INHERIT (to_can_accel_watchpoint_condition, t); + /* Do not inherit to_watchpoint_addr_within_range. */ + /* Do not inherit to_region_ok_for_hw_watchpoint. */ + /* Do not inherit to_can_accel_watchpoint_condition. */ /* Do not inherit to_masked_watch_num_registers. */ - INHERIT (to_terminal_init, t); - INHERIT (to_terminal_inferior, t); - INHERIT (to_terminal_ours_for_output, t); - INHERIT (to_terminal_ours, t); - INHERIT (to_terminal_save_ours, t); - INHERIT (to_terminal_info, t); + /* Do not inherit to_terminal_init. */ + /* Do not inherit to_terminal_inferior. */ + /* Do not inherit to_terminal_ours_for_output. */ + /* Do not inherit to_terminal_ours. */ + /* Do not inherit to_terminal_save_ours. */ + /* Do not inherit to_terminal_info. */ /* Do not inherit to_kill. */ INHERIT (to_load, t); /* Do no inherit to_create_inferior. */ @@ -730,35 +730,6 @@ update_current_target (void) (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) nomemory); - de_fault (to_remove_watchpoint, - (int (*) (struct target_ops *, CORE_ADDR, int, int, - struct expression *)) - return_minus_one); - de_fault (to_watchpoint_addr_within_range, - default_watchpoint_addr_within_range); - de_fault (to_region_ok_for_hw_watchpoint, - default_region_ok_for_hw_watchpoint); - de_fault (to_can_accel_watchpoint_condition, - (int (*) (struct target_ops *, CORE_ADDR, int, int, - struct expression *)) - return_zero); - de_fault (to_terminal_init, - (void (*) (struct target_ops *)) - target_ignore); - de_fault (to_terminal_inferior, - (void (*) (struct target_ops *)) - target_ignore); - de_fault (to_terminal_ours_for_output, - (void (*) (struct target_ops *)) - target_ignore); - de_fault (to_terminal_ours, - (void (*) (struct target_ops *)) - target_ignore); - de_fault (to_terminal_save_ours, - (void (*) (struct target_ops *)) - target_ignore); - de_fault (to_terminal_info, - default_terminal_info); de_fault (to_load, (void (*) (struct target_ops *, char *, int)) tcomplain); diff --git a/gdb/target.h b/gdb/target.h index 5f521c5..e16ff52 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -454,7 +454,8 @@ struct target_ops /* Documentation of what the two routines below are expected to do is provided with the corresponding target_* macros. */ int (*to_remove_watchpoint) (struct target_ops *, - CORE_ADDR, int, int, struct expression *); + CORE_ADDR, int, int, struct expression *) + TARGET_DEFAULT_RETURN (-1); int (*to_insert_watchpoint) (struct target_ops *, CORE_ADDR, int, int, struct expression *) TARGET_DEFAULT_RETURN (-1); @@ -470,24 +471,33 @@ struct target_ops int (*to_stopped_data_address) (struct target_ops *, CORE_ADDR *) TARGET_DEFAULT_RETURN (0); int (*to_watchpoint_addr_within_range) (struct target_ops *, - CORE_ADDR, CORE_ADDR, int); + CORE_ADDR, CORE_ADDR, int) + TARGET_DEFAULT_FUNC (default_watchpoint_addr_within_range); /* Documentation of this routine is provided with the corresponding target_* macro. */ int (*to_region_ok_for_hw_watchpoint) (struct target_ops *, - CORE_ADDR, int); + CORE_ADDR, int) + TARGET_DEFAULT_FUNC (default_region_ok_for_hw_watchpoint); int (*to_can_accel_watchpoint_condition) (struct target_ops *, CORE_ADDR, int, int, - struct expression *); + struct expression *) + TARGET_DEFAULT_RETURN (0); int (*to_masked_watch_num_registers) (struct target_ops *, CORE_ADDR, CORE_ADDR); - void (*to_terminal_init) (struct target_ops *); - void (*to_terminal_inferior) (struct target_ops *); - void (*to_terminal_ours_for_output) (struct target_ops *); - void (*to_terminal_ours) (struct target_ops *); - void (*to_terminal_save_ours) (struct target_ops *); - void (*to_terminal_info) (struct target_ops *, const char *, int); + void (*to_terminal_init) (struct target_ops *) + TARGET_DEFAULT_IGNORE (); + void (*to_terminal_inferior) (struct target_ops *) + TARGET_DEFAULT_IGNORE (); + void (*to_terminal_ours_for_output) (struct target_ops *) + TARGET_DEFAULT_IGNORE (); + void (*to_terminal_ours) (struct target_ops *) + TARGET_DEFAULT_IGNORE (); + void (*to_terminal_save_ours) (struct target_ops *) + TARGET_DEFAULT_IGNORE (); + void (*to_terminal_info) (struct target_ops *, const char *, int) + TARGET_DEFAULT_FUNC (default_terminal_info); void (*to_kill) (struct target_ops *); void (*to_load) (struct target_ops *, char *, int); void (*to_create_inferior) (struct target_ops *, -- 1.8.1.4