diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ada-lang.c | 2 | ||||
| -rw-r--r-- | gdb/break-catch-exec.c | 2 | ||||
| -rw-r--r-- | gdb/break-catch-fork.c | 2 | ||||
| -rw-r--r-- | gdb/break-catch-syscall.c | 2 | ||||
| -rw-r--r-- | gdb/break-catch-throw.c | 2 | ||||
| -rw-r--r-- | gdb/breakpoint.c | 22 | ||||
| -rw-r--r-- | gdb/breakpoint.h | 21 |
7 files changed, 27 insertions, 26 deletions
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 54bcd86..5f6f167 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -12519,7 +12519,7 @@ ada_catchpoint::print_recreate (struct ui_file *fp) default: internal_error (__FILE__, __LINE__, _("unexpected catchpoint type")); } - print_recreate_thread (this, fp); + print_recreate_thread (fp); } /* See ada-lang.h. */ diff --git a/gdb/break-catch-exec.c b/gdb/break-catch-exec.c index ac4ea18..2ae9ebf 100644 --- a/gdb/break-catch-exec.c +++ b/gdb/break-catch-exec.c @@ -144,7 +144,7 @@ void exec_catchpoint::print_recreate (struct ui_file *fp) { gdb_printf (fp, "catch exec"); - print_recreate_thread (this, fp); + print_recreate_thread (fp); } /* This function attempts to parse an optional "if <cond>" clause diff --git a/gdb/break-catch-fork.c b/gdb/break-catch-fork.c index eb88e78..75e32af 100644 --- a/gdb/break-catch-fork.c +++ b/gdb/break-catch-fork.c @@ -172,7 +172,7 @@ void fork_catchpoint::print_recreate (struct ui_file *fp) { gdb_printf (fp, "catch %s", is_vfork ? "vfork" : "fork"); - print_recreate_thread (this, fp); + print_recreate_thread (fp); } static void diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c index 3b160bf..ff2566b 100644 --- a/gdb/break-catch-syscall.c +++ b/gdb/break-catch-syscall.c @@ -331,7 +331,7 @@ syscall_catchpoint::print_recreate (struct ui_file *fp) gdb_printf (fp, " %d", s.number); } - print_recreate_thread (this, fp); + print_recreate_thread (fp); } /* Returns non-zero if 'b' is a syscall catchpoint. */ diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c index 4b79e0f..8742bc9 100644 --- a/gdb/break-catch-throw.c +++ b/gdb/break-catch-throw.c @@ -338,7 +338,7 @@ exception_catchpoint::print_recreate (struct ui_file *fp) gdb_printf (fp, "rethrow"); break; } - print_recreate_thread (this, fp); + print_recreate_thread (fp); } /* Implement the "allocate_location" method for throw and catch diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 7241b7b..3a2d37e 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -9335,7 +9335,7 @@ ranged_breakpoint::print_recreate (struct ui_file *fp) gdb_printf (fp, "break-range %s, %s", event_location_to_string (location.get ()), event_location_to_string (location_range_end.get ())); - print_recreate_thread (this, fp); + print_recreate_thread (fp); } /* Find the address where the end of the breakpoint range should be @@ -9739,7 +9739,7 @@ watchpoint::print_recreate (struct ui_file *fp) } gdb_printf (fp, " %s", exp_string.get ()); - print_recreate_thread (this, fp); + print_recreate_thread (fp); } /* Implement the "explains_signal" method for watchpoints. */ @@ -9927,7 +9927,7 @@ masked_watchpoint::print_recreate (struct ui_file *fp) gdb_printf (fp, " %s mask 0x%s", exp_string.get (), phex (hw_wp_mask, sizeof (CORE_ADDR))); - print_recreate_thread (this, fp); + print_recreate_thread (fp); } /* Tell whether the given watchpoint is a masked hardware watchpoint. */ @@ -11807,7 +11807,7 @@ ordinary_breakpoint::print_recreate (struct ui_file *fp) if (loc == NULL && extra_string != NULL) gdb_printf (fp, " %s", extra_string.get ()); - print_recreate_thread (this, fp); + print_recreate_thread (fp); } std::vector<symtab_and_line> @@ -12055,7 +12055,7 @@ tracepoint::print_recreate (struct ui_file *fp) _("unhandled tracepoint type %d"), (int) type); gdb_printf (fp, " %s", event_location_to_string (location.get ())); - print_recreate_thread (this, fp); + print_recreate_thread (fp); if (pass_count) gdb_printf (fp, " passcount %d\n", pass_count); @@ -12112,7 +12112,7 @@ dprintf_breakpoint::print_recreate (struct ui_file *fp) gdb_printf (fp, "dprintf %s,%s", event_location_to_string (location.get ()), extra_string.get ()); - print_recreate_thread (this, fp); + print_recreate_thread (fp); } /* Implement the "after_condition_true" method for dprintf. @@ -14044,13 +14044,13 @@ get_tracepoint_by_number (const char **arg, } void -print_recreate_thread (struct breakpoint *b, struct ui_file *fp) +breakpoint::print_recreate_thread (struct ui_file *fp) const { - if (b->thread != -1) - gdb_printf (fp, " thread %d", b->thread); + if (thread != -1) + gdb_printf (fp, " thread %d", thread); - if (b->task != 0) - gdb_printf (fp, " task %d", b->task); + if (task != 0) + gdb_printf (fp, " task %d", task); gdb_printf (fp, "\n"); } diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 1322bc1..7d4e874 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -586,15 +586,6 @@ struct breakpoint_ops int, int, int, unsigned); }; -/* Helper for breakpoint_ops->print_recreate implementations. Prints - the "thread" or "task" condition of B, and then a newline. - - Necessary because most breakpoint implementations accept - thread/task conditions at the end of the spec line, like "break foo - thread 1", which needs outputting before any breakpoint-type - specific extra command necessary for B's recreation. */ -extern void print_recreate_thread (struct breakpoint *b, struct ui_file *fp); - enum watchpoint_triggered { /* This watchpoint definitely did not trigger. */ @@ -742,7 +733,6 @@ struct breakpoint /* Nothing to do. */ } - /* Return a range of this breakpoint's locations. */ bp_location_range locations (); @@ -846,6 +836,17 @@ struct breakpoint /* Same as py_bp_object, but for Scheme. */ gdbscm_breakpoint_object *scm_bp_object = NULL; + +protected: + + /* Helper for breakpoint_ops->print_recreate implementations. Prints + the "thread" or "task" condition of B, and then a newline. + + Necessary because most breakpoint implementations accept + thread/task conditions at the end of the spec line, like "break foo + thread 1", which needs outputting before any breakpoint-type + specific extra command necessary for B's recreation. */ + void print_recreate_thread (struct ui_file *fp) const; }; /* The structure to be inherit by all kinds of breakpoints (real |