convert to_region_ok_for_hw_watchpoint

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.

4 files changed, 21 insertions, 4 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f8ee21..a159898 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_region_ok_for_hw_watchpoint.
+	* target.h (struct target_ops) <to_region_ok_for_hw_watchpoint>:
+	Use TARGET_DEFAULT_FUNC.
+
+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/target-delegates.c b/gdb/target-delegates.c
index 13a2d6c..924c749 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -210,6 +210,13 @@ delegate_watchpoint_addr_within_range (struct target_ops *self, CORE_ADDR arg1,
   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 void
 delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
 {
@@ -309,6 +316,8 @@ install_delegators (struct target_ops *ops)
     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_rcmd == NULL)
     ops->to_rcmd = delegate_rcmd;
   if (ops->to_can_async_p == NULL)
@@ -344,6 +353,7 @@ install_dummy_methods (struct target_ops *ops)
   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_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 2f11588..1b8dd39 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -617,7 +617,7 @@ update_current_target (void)
       INHERIT (to_have_continuable_watchpoint, t);
       /* Do not inherit to_stopped_by_watchpoint.  */
       /* Do not inherit to_watchpoint_addr_within_range.  */
-      INHERIT (to_region_ok_for_hw_watchpoint, t);
+      /* Do not inherit to_region_ok_for_hw_watchpoint.  */
       INHERIT (to_can_accel_watchpoint_condition, t);
       /* Do not inherit to_masked_watch_num_registers.  */
       INHERIT (to_terminal_init, t);
@@ -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_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 *))
diff --git a/gdb/target.h b/gdb/target.h
index e75543a..9b803a1 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -491,7 +491,8 @@ struct target_ops
     /* 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,