convert to_insert_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_insert_hw_breakpoint.
	* target.h (struct target_ops) <to_insert_hw_breakpoint>: Use
	TARGET_DEFAULT_RETURN.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 604b5323b95dbc18775a2c70c5d6b220198beb9c..c137d6b545a21be620118f0ff93c91c024723fbd 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_insert_hw_breakpoint.
+       * target.h (struct target_ops) <to_insert_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 e5d7b28483d78a934555ba6a0d39c8daebbdc75e..9f72972f2a35bad40969c777742e204feecf809d 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -125,6 +125,19 @@ tdefault_can_use_hw_breakpoint (struct target_ops *self, int arg1, int arg2, int
   return 0;
 }
 
+static int
+delegate_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *arg1, struct bp_target_info *arg2)
+{
+  self = self->beneath;
+  return self->to_insert_hw_breakpoint (self, arg1, arg2);
+}
+
+static int
+tdefault_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *arg1, struct bp_target_info *arg2)
+{
+  return -1;
+}
+
 static int
 delegate_stopped_by_watchpoint (struct target_ops *self)
 {
@@ -236,6 +249,8 @@ install_delegators (struct target_ops *ops)
     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_insert_hw_breakpoint == NULL)
+    ops->to_insert_hw_breakpoint = delegate_insert_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)
@@ -268,6 +283,7 @@ install_dummy_methods (struct target_ops *ops)
   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_insert_hw_breakpoint = tdefault_insert_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 c48ee010d8e48de3a50e3532a57fabb77efea0a9..b03d9a95d1f7479e8325abe3067258c97c85ea25 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -605,7 +605,7 @@ update_current_target (void)
       /* Do not inherit to_insert_breakpoint.  */
       /* Do not inherit to_remove_breakpoint.  */
       /* Do not inherit to_can_use_hw_breakpoint.  */
-      INHERIT (to_insert_hw_breakpoint, t);
+      /* Do not inherit to_insert_hw_breakpoint.  */
       INHERIT (to_remove_hw_breakpoint, t);
       /* Do not inherit to_ranged_break_num_registers.  */
       INHERIT (to_insert_watchpoint, 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_insert_hw_breakpoint,
-           (int (*) (struct target_ops *, struct gdbarch *,
-                     struct bp_target_info *))
-           return_minus_one);
   de_fault (to_remove_hw_breakpoint,
            (int (*) (struct target_ops *, struct gdbarch *,
                      struct bp_target_info *))

diff --git a/gdb/target.h b/gdb/target.h
index 290f2f67a6e8f23e19a54dd9b3923aec499085dd..3b56b73af2ff7666e4f49567bb308655160e6a21 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -459,7 +459,8 @@ struct target_ops
       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 *);
+                                   struct gdbarch *, struct bp_target_info *)
+      TARGET_DEFAULT_RETURN (-1);
     int (*to_remove_hw_breakpoint) (struct target_ops *,
                                    struct gdbarch *, struct bp_target_info *);