convert to_watchpoint_addr_within_range

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cba171fd99e7adc8c7da68d0c2337a88072fbff5..7f8ee2127c569dcd93382095ab967ce4a18b5a48 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target-delegates.c: Rebuild.
+       * target.c (update_current_target): Don't inherit or default
+       to_watchpoint_addr_within_range.
+       * target.h (struct target_ops) <to_watchpoint_addr_within_range>:
+       Use TARGET_DEFAULT_FUNC.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target-delegates.c: Rebuild.

diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 986ef1d072c50717b4b94426d242e8a31946c29a..13a2d6c8e0ac496d4ed19c58c187aa8e0c404833 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -203,6 +203,13 @@ 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 void
 delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
 {
@@ -300,6 +307,8 @@ install_delegators (struct target_ops *ops)
     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_rcmd == NULL)
     ops->to_rcmd = delegate_rcmd;
   if (ops->to_can_async_p == NULL)
@@ -334,6 +343,7 @@ install_dummy_methods (struct target_ops *ops)
   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_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 29fe2950c925775a0cb94c6c2e09f53cc4aa9e89..2f11588b6cb9b7d282b0ab1548c44d921e8457fa 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -616,7 +616,7 @@ update_current_target (void)
       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);
+      /* Do not inherit to_watchpoint_addr_within_range.  */
       INHERIT (to_region_ok_for_hw_watchpoint, t);
       INHERIT (to_can_accel_watchpoint_condition, t);
       /* Do not inherit to_masked_watch_num_registers.  */
@@ -734,8 +734,6 @@ update_current_target (void)
            (int (*) (CORE_ADDR, gdb_byte *, int, int,
                      struct mem_attrib *, struct target_ops *))
            nomemory);
-  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,

diff --git a/gdb/target.h b/gdb/target.h
index fbaf07212513b6c518b3b28f05f2841da07de50a..e75543a9d0ad4412219f0762653532e4195cbd1e 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -485,7 +485,8 @@ 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.  */