convert to_can_accel_watchpoint_condition

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_can_accel_watchpoint_condition.
	* target.h (struct target_ops)
	<to_can_accel_watchpoint_condition>: Use TARGET_DEFAULT_RETURN.

4 files changed, 27 insertions, 6 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a159898..43cb9a1 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -2,6 +2,14 @@
 
 	* target-delegates.c: Rebuild.
 	* target.c (update_current_target): Don't inherit or default
+	to_can_accel_watchpoint_condition.
+	* target.h (struct target_ops)
+	<to_can_accel_watchpoint_condition>: Use TARGET_DEFAULT_RETURN.
+
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+	* 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) <to_region_ok_for_hw_watchpoint>:
 	Use TARGET_DEFAULT_FUNC.
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 924c749..498f2b9 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -217,6 +217,19 @@ delegate_region_ok_for_hw_watchpoint (struct target_ops *self, CORE_ADDR arg1, i
   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_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
 {
@@ -318,6 +331,8 @@ install_delegators (struct target_ops *ops)
     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_rcmd == NULL)
     ops->to_rcmd = delegate_rcmd;
   if (ops->to_can_async_p == NULL)
@@ -354,6 +369,7 @@ install_dummy_methods (struct target_ops *ops)
   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_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 1b8dd39..a6f7b7c 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -618,7 +618,7 @@ update_current_target (void)
       /* Do not inherit to_stopped_by_watchpoint.  */
       /* Do not inherit to_watchpoint_addr_within_range.  */
       /* Do not inherit to_region_ok_for_hw_watchpoint.  */
-      INHERIT (to_can_accel_watchpoint_condition, t);
+      /* 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);
@@ -734,10 +734,6 @@ update_current_target (void)
 	    (int (*) (CORE_ADDR, gdb_byte *, int, int,
 		      struct mem_attrib *, struct target_ops *))
 	    nomemory);
-  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);
diff --git a/gdb/target.h b/gdb/target.h
index 9b803a1..5cdafbf 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -496,7 +496,8 @@ struct target_ops
 
     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 *);