Add target_ops argument to to_can_run_breakpoint_commands

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

	* target.h (struct target_ops) <to_can_run_breakpoint_commands>:
	Add argument.
	(target_can_run_breakpoint_commands): Add argument.
	* target.c (update_current_target): Update.
	* remote.c (remote_can_run_breakpoint_commands): Add 'self'
	argument.
	(remote_insert_breakpoint): Add 'self' argument.
	(remote_insert_hw_breakpoint): Add 'self' argument.
	(remote_can_run_breakpoint_commands): Add 'self' argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 527fc3b3933ebaa130235c306fa2304eb253cceb..8b262faf6c4292c8be0c1c43dd896780141e8b98 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_can_run_breakpoint_commands>:
+       Add argument.
+       (target_can_run_breakpoint_commands): Add argument.
+       * target.c (update_current_target): Update.
+       * remote.c (remote_can_run_breakpoint_commands): Add 'self'
+       argument.
+       (remote_insert_breakpoint): Add 'self' argument.
+       (remote_insert_hw_breakpoint): Add 'self' argument.
+       (remote_can_run_breakpoint_commands): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops)

diff --git a/gdb/remote.c b/gdb/remote.c
index 2d74bc166b477f7bb0e1252d33499c4f05509f1f..b62b5f2660a88034b3dbca3748c7dbb6cd00d99d 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -228,7 +228,7 @@ static void remote_console_output (char *msg);
 
 static int remote_supports_cond_breakpoints (struct target_ops *self);
 
-static int remote_can_run_breakpoint_commands (void);
+static int remote_can_run_breakpoint_commands (struct target_ops *self);
 
 /* For "remote".  */
 
@@ -8084,7 +8084,7 @@ remote_insert_breakpoint (struct target_ops *ops,
       if (remote_supports_cond_breakpoints (ops))
        remote_add_target_side_condition (gdbarch, bp_tgt, p, endbuf);
 
-      if (remote_can_run_breakpoint_commands ())
+      if (remote_can_run_breakpoint_commands (ops))
        remote_add_target_side_commands (gdbarch, bp_tgt, p);
 
       putpkt (rs->buf);
@@ -8363,7 +8363,7 @@ remote_insert_hw_breakpoint (struct target_ops *self, struct gdbarch *gdbarch,
   if (remote_supports_cond_breakpoints (self))
     remote_add_target_side_condition (gdbarch, bp_tgt, p, endbuf);
 
-  if (remote_can_run_breakpoint_commands ())
+  if (remote_can_run_breakpoint_commands (self))
     remote_add_target_side_commands (gdbarch, bp_tgt, p);
 
   putpkt (rs->buf);
@@ -10306,7 +10306,7 @@ remote_supports_string_tracing (struct target_ops *self)
 }
 
 static int
-remote_can_run_breakpoint_commands (void)
+remote_can_run_breakpoint_commands (struct target_ops *self)
 {
   struct remote_state *rs = get_remote_state ();
 

diff --git a/gdb/target.c b/gdb/target.c
index 4dfa8dd49f0ec429a0baec02b69e1076cf93ff73..bf4a513ad9031e048ca21182a3860b57602cb950 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -933,7 +933,7 @@ update_current_target (void)
            (int (*) (struct target_ops *))
            return_zero);
   de_fault (to_can_run_breakpoint_commands,
-           (int (*) (void))
+           (int (*) (struct target_ops *))
            return_zero);
   de_fault (to_use_agent,
            (int (*) (int))

diff --git a/gdb/target.h b/gdb/target.h
index ce73863e274144ed180f2a8f9b0a82aa3777eccf..c809c1babed776217375bdafd7cda1cecc6d3436 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -690,7 +690,7 @@ struct target_ops
 
     /* Does this target support evaluation of breakpoint commands on its
        end?  */
-    int (*to_can_run_breakpoint_commands) (void);
+    int (*to_can_run_breakpoint_commands) (struct target_ops *);
 
     /* Determine current architecture of thread PTID.
 
@@ -1129,7 +1129,7 @@ int target_supports_disable_randomization (void);
    on its end.  */
 
 #define target_can_run_breakpoint_commands() \
-  (*current_target.to_can_run_breakpoint_commands) ()
+  (*current_target.to_can_run_breakpoint_commands) (&current_target)
 
 extern int target_read_string (CORE_ADDR, char **, int, int *);