convert to_can_use_hw_breakpoint

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

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ebeb7d6dd78d52f3a4d22b73ebd83ea62d6a89fc..604b5323b95dbc18775a2c70c5d6b220198beb9c 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_can_use_hw_breakpoint.
+       * target.h (struct target_ops) <to_can_use_hw_breakpoint>: Use
+       TARGET_DEFAULT_RETURN.
+
 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 3186a58033fdbedf3d375d32b3d369ba476a6e83..e5d7b28483d78a934555ba6a0d39c8daebbdc75e 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -112,6 +112,19 @@ delegate_remove_breakpoint (struct target_ops *self, struct gdbarch *arg1, struc
   return self->to_remove_breakpoint (self, arg1, arg2);
 }
 
+static int
+delegate_can_use_hw_breakpoint (struct target_ops *self, int arg1, int arg2, int arg3)
+{
+  self = self->beneath;
+  return self->to_can_use_hw_breakpoint (self, arg1, arg2, arg3);
+}
+
+static int
+tdefault_can_use_hw_breakpoint (struct target_ops *self, int arg1, int arg2, int arg3)
+{
+  return 0;
+}
+
 static int
 delegate_stopped_by_watchpoint (struct target_ops *self)
 {
@@ -221,6 +234,8 @@ install_delegators (struct target_ops *ops)
     ops->to_insert_breakpoint = delegate_insert_breakpoint;
   if (ops->to_remove_breakpoint == NULL)
     ops->to_remove_breakpoint = delegate_remove_breakpoint;
+  if (ops->to_can_use_hw_breakpoint == NULL)
+    ops->to_can_use_hw_breakpoint = delegate_can_use_hw_breakpoint;
   if (ops->to_stopped_by_watchpoint == NULL)
     ops->to_stopped_by_watchpoint = delegate_stopped_by_watchpoint;
   if (ops->to_stopped_data_address == NULL)
@@ -252,6 +267,7 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_files_info = tdefault_files_info;
   ops->to_insert_breakpoint = memory_insert_breakpoint;
   ops->to_remove_breakpoint = memory_remove_breakpoint;
+  ops->to_can_use_hw_breakpoint = tdefault_can_use_hw_breakpoint;
   ops->to_stopped_by_watchpoint = tdefault_stopped_by_watchpoint;
   ops->to_stopped_data_address = tdefault_stopped_data_address;
   ops->to_rcmd = default_rcmd;

diff --git a/gdb/target.c b/gdb/target.c
index fc16272e0e4147732c5272ab4bcc41cb611a9958..c48ee010d8e48de3a50e3532a57fabb77efea0a9 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -604,7 +604,7 @@ update_current_target (void)
       /* Do not inherit to_files_info.  */
       /* Do not inherit to_insert_breakpoint.  */
       /* Do not inherit to_remove_breakpoint.  */
-      INHERIT (to_can_use_hw_breakpoint, t);
+      /* Do not inherit to_can_use_hw_breakpoint.  */
       INHERIT (to_insert_hw_breakpoint, t);
       INHERIT (to_remove_hw_breakpoint, t);
       /* Do not inherit to_ranged_break_num_registers.  */
@@ -734,9 +734,6 @@ update_current_target (void)
            (int (*) (CORE_ADDR, gdb_byte *, int, int,
                      struct mem_attrib *, struct target_ops *))
            nomemory);
-  de_fault (to_can_use_hw_breakpoint,
-           (int (*) (struct target_ops *, int, int, int))
-           return_zero);
   de_fault (to_insert_hw_breakpoint,
            (int (*) (struct target_ops *, struct gdbarch *,
                      struct bp_target_info *))

diff --git a/gdb/target.h b/gdb/target.h
index fd0afcf4df4d2c72d1ac0ef5b784c1b0aa6f9e65..290f2f67a6e8f23e19a54dd9b3923aec499085dd 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -455,7 +455,8 @@ struct target_ops
     int (*to_remove_breakpoint) (struct target_ops *, struct gdbarch *,
                                 struct bp_target_info *)
       TARGET_DEFAULT_FUNC (memory_remove_breakpoint);
-    int (*to_can_use_hw_breakpoint) (struct target_ops *, int, int, int);
+    int (*to_can_use_hw_breakpoint) (struct target_ops *, int, int, int)
+      TARGET_DEFAULT_RETURN (0);
     int (*to_ranged_break_num_registers) (struct target_ops *);
     int (*to_insert_hw_breakpoint) (struct target_ops *,
                                    struct gdbarch *, struct bp_target_info *);