Use unfiltered output in annotate.c

It seems to me that annotations should not be filtered.  While it
might be weird for an annotation-based UI to use the pager, it's not,
I think, out of the question.  This patch makes this change.
This commit is contained in:
Tom Tromey
2022-01-08 16:23:18 -07:00
parent 2f761de2ba
commit 9e4902bfac

View File

@ -52,9 +52,9 @@ static void
print_value_flags (struct type *t) print_value_flags (struct type *t)
{ {
if (can_dereference (t)) if (can_dereference (t))
printf_filtered (("*")); printf_unfiltered (("*"));
else else
printf_filtered (("-")); printf_unfiltered (("-"));
} }
static void static void
@ -76,42 +76,42 @@ void
annotate_breakpoint (int num) annotate_breakpoint (int num)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032breakpoint %d\n"), num); printf_unfiltered (("\n\032\032breakpoint %d\n"), num);
} }
void void
annotate_catchpoint (int num) annotate_catchpoint (int num)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032catchpoint %d\n"), num); printf_unfiltered (("\n\032\032catchpoint %d\n"), num);
} }
void void
annotate_watchpoint (int num) annotate_watchpoint (int num)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032watchpoint %d\n"), num); printf_unfiltered (("\n\032\032watchpoint %d\n"), num);
} }
void void
annotate_starting (void) annotate_starting (void)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032starting\n")); printf_unfiltered (("\n\032\032starting\n"));
} }
void void
annotate_stopped (void) annotate_stopped (void)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032stopped\n")); printf_unfiltered (("\n\032\032stopped\n"));
} }
void void
annotate_exited (int exitstatus) annotate_exited (int exitstatus)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032exited %d\n"), exitstatus); printf_unfiltered (("\n\032\032exited %d\n"), exitstatus);
} }
void void
@ -121,35 +121,35 @@ annotate_signalled (void)
deprecated_annotate_signalled_hook (); deprecated_annotate_signalled_hook ();
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032signalled\n")); printf_unfiltered (("\n\032\032signalled\n"));
} }
void void
annotate_signal_name (void) annotate_signal_name (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032signal-name\n")); printf_unfiltered (("\n\032\032signal-name\n"));
} }
void void
annotate_signal_name_end (void) annotate_signal_name_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032signal-name-end\n")); printf_unfiltered (("\n\032\032signal-name-end\n"));
} }
void void
annotate_signal_string (void) annotate_signal_string (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032signal-string\n")); printf_unfiltered (("\n\032\032signal-string\n"));
} }
void void
annotate_signal_string_end (void) annotate_signal_string_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032signal-string-end\n")); printf_unfiltered (("\n\032\032signal-string-end\n"));
} }
void void
@ -159,42 +159,42 @@ annotate_signal (void)
deprecated_annotate_signal_hook (); deprecated_annotate_signal_hook ();
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032signal\n")); printf_unfiltered (("\n\032\032signal\n"));
} }
void void
annotate_breakpoints_headers (void) annotate_breakpoints_headers (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032breakpoints-headers\n")); printf_unfiltered (("\n\032\032breakpoints-headers\n"));
} }
void void
annotate_field (int num) annotate_field (int num)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032field %d\n"), num); printf_unfiltered (("\n\032\032field %d\n"), num);
} }
void void
annotate_breakpoints_table (void) annotate_breakpoints_table (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032breakpoints-table\n")); printf_unfiltered (("\n\032\032breakpoints-table\n"));
} }
void void
annotate_record (void) annotate_record (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032record\n")); printf_unfiltered (("\n\032\032record\n"));
} }
void void
annotate_breakpoints_table_end (void) annotate_breakpoints_table_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032breakpoints-table-end\n")); printf_unfiltered (("\n\032\032breakpoints-table-end\n"));
} }
void void
@ -237,7 +237,7 @@ annotate_thread_exited (struct thread_info *t, int silent)
{ {
if (annotation_level > 1) if (annotation_level > 1)
{ {
printf_filtered(("\n\032\032thread-exited," printf_unfiltered (("\n\032\032thread-exited,"
"id=\"%d\",group-id=\"i%d\"\n"), "id=\"%d\",group-id=\"i%d\"\n"),
t->global_num, t->inf->num); t->global_num, t->inf->num);
} }
@ -248,9 +248,9 @@ annotate_field_begin (struct type *type)
{ {
if (annotation_level == 2) if (annotation_level == 2)
{ {
printf_filtered (("\n\032\032field-begin ")); printf_unfiltered (("\n\032\032field-begin "));
print_value_flags (type); print_value_flags (type);
printf_filtered (("\n")); printf_unfiltered (("\n"));
} }
} }
@ -258,42 +258,42 @@ void
annotate_field_name_end (void) annotate_field_name_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032field-name-end\n")); printf_unfiltered (("\n\032\032field-name-end\n"));
} }
void void
annotate_field_value (void) annotate_field_value (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032field-value\n")); printf_unfiltered (("\n\032\032field-value\n"));
} }
void void
annotate_field_end (void) annotate_field_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032field-end\n")); printf_unfiltered (("\n\032\032field-end\n"));
} }
void void
annotate_quit (void) annotate_quit (void)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032quit\n")); printf_unfiltered (("\n\032\032quit\n"));
} }
void void
annotate_error (void) annotate_error (void)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032error\n")); printf_unfiltered (("\n\032\032error\n"));
} }
void void
annotate_error_begin (void) annotate_error_begin (void)
{ {
if (annotation_level > 1) if (annotation_level > 1)
fprintf_filtered (gdb_stderr, "\n\032\032error-begin\n"); fprintf_unfiltered (gdb_stderr, "\n\032\032error-begin\n");
} }
void void
@ -301,9 +301,9 @@ annotate_value_history_begin (int histindex, struct type *type)
{ {
if (annotation_level == 2) if (annotation_level == 2)
{ {
printf_filtered (("\n\032\032value-history-begin %d "), histindex); printf_unfiltered (("\n\032\032value-history-begin %d "), histindex);
print_value_flags (type); print_value_flags (type);
printf_filtered (("\n")); printf_unfiltered (("\n"));
} }
} }
@ -312,9 +312,9 @@ annotate_value_begin (struct type *type)
{ {
if (annotation_level == 2) if (annotation_level == 2)
{ {
printf_filtered (("\n\032\032value-begin ")); printf_unfiltered (("\n\032\032value-begin "));
print_value_flags (type); print_value_flags (type);
printf_filtered (("\n")); printf_unfiltered (("\n"));
} }
} }
@ -322,84 +322,84 @@ void
annotate_value_history_value (void) annotate_value_history_value (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032value-history-value\n")); printf_unfiltered (("\n\032\032value-history-value\n"));
} }
void void
annotate_value_history_end (void) annotate_value_history_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032value-history-end\n")); printf_unfiltered (("\n\032\032value-history-end\n"));
} }
void void
annotate_value_end (void) annotate_value_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032value-end\n")); printf_unfiltered (("\n\032\032value-end\n"));
} }
void void
annotate_display_begin (void) annotate_display_begin (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032display-begin\n")); printf_unfiltered (("\n\032\032display-begin\n"));
} }
void void
annotate_display_number_end (void) annotate_display_number_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032display-number-end\n")); printf_unfiltered (("\n\032\032display-number-end\n"));
} }
void void
annotate_display_format (void) annotate_display_format (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032display-format\n")); printf_unfiltered (("\n\032\032display-format\n"));
} }
void void
annotate_display_expression (void) annotate_display_expression (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032display-expression\n")); printf_unfiltered (("\n\032\032display-expression\n"));
} }
void void
annotate_display_expression_end (void) annotate_display_expression_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032display-expression-end\n")); printf_unfiltered (("\n\032\032display-expression-end\n"));
} }
void void
annotate_display_value (void) annotate_display_value (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032display-value\n")); printf_unfiltered (("\n\032\032display-value\n"));
} }
void void
annotate_display_end (void) annotate_display_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032display-end\n")); printf_unfiltered (("\n\032\032display-end\n"));
} }
void void
annotate_arg_begin (void) annotate_arg_begin (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032arg-begin\n")); printf_unfiltered (("\n\032\032arg-begin\n"));
} }
void void
annotate_arg_name_end (void) annotate_arg_name_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032arg-name-end\n")); printf_unfiltered (("\n\032\032arg-name-end\n"));
} }
void void
@ -407,9 +407,9 @@ annotate_arg_value (struct type *type)
{ {
if (annotation_level == 2) if (annotation_level == 2)
{ {
printf_filtered (("\n\032\032arg-value ")); printf_unfiltered (("\n\032\032arg-value "));
print_value_flags (type); print_value_flags (type);
printf_filtered (("\n")); printf_unfiltered (("\n"));
} }
} }
@ -417,7 +417,7 @@ void
annotate_arg_end (void) annotate_arg_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032arg-end\n")); printf_unfiltered (("\n\032\032arg-end\n"));
} }
static void static void
@ -425,11 +425,11 @@ annotate_source (const char *filename, int line, int character, int mid,
struct gdbarch *gdbarch, CORE_ADDR pc) struct gdbarch *gdbarch, CORE_ADDR pc)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032source ")); printf_unfiltered (("\n\032\032source "));
else else
printf_filtered (("\032\032")); printf_unfiltered (("\032\032"));
printf_filtered (("%s:%d:%d:%s:%s\n"), filename, line, character, printf_unfiltered (("%s:%d:%d:%s:%s\n"), filename, line, character,
mid ? "middle" : "beg", paddress (gdbarch, pc)); mid ? "middle" : "beg", paddress (gdbarch, pc));
} }
@ -469,7 +469,7 @@ void
annotate_frame_begin (int level, struct gdbarch *gdbarch, CORE_ADDR pc) annotate_frame_begin (int level, struct gdbarch *gdbarch, CORE_ADDR pc)
{ {
if (annotation_level > 1) if (annotation_level > 1)
printf_filtered (("\n\032\032frame-begin %d %s\n"), printf_unfiltered (("\n\032\032frame-begin %d %s\n"),
level, paddress (gdbarch, pc)); level, paddress (gdbarch, pc));
} }
@ -477,91 +477,91 @@ void
annotate_function_call (void) annotate_function_call (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032function-call\n")); printf_unfiltered (("\n\032\032function-call\n"));
} }
void void
annotate_signal_handler_caller (void) annotate_signal_handler_caller (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032signal-handler-caller\n")); printf_unfiltered (("\n\032\032signal-handler-caller\n"));
} }
void void
annotate_frame_address (void) annotate_frame_address (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-address\n")); printf_unfiltered (("\n\032\032frame-address\n"));
} }
void void
annotate_frame_address_end (void) annotate_frame_address_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-address-end\n")); printf_unfiltered (("\n\032\032frame-address-end\n"));
} }
void void
annotate_frame_function_name (void) annotate_frame_function_name (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-function-name\n")); printf_unfiltered (("\n\032\032frame-function-name\n"));
} }
void void
annotate_frame_args (void) annotate_frame_args (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-args\n")); printf_unfiltered (("\n\032\032frame-args\n"));
} }
void void
annotate_frame_source_begin (void) annotate_frame_source_begin (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-source-begin\n")); printf_unfiltered (("\n\032\032frame-source-begin\n"));
} }
void void
annotate_frame_source_file (void) annotate_frame_source_file (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-source-file\n")); printf_unfiltered (("\n\032\032frame-source-file\n"));
} }
void void
annotate_frame_source_file_end (void) annotate_frame_source_file_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-source-file-end\n")); printf_unfiltered (("\n\032\032frame-source-file-end\n"));
} }
void void
annotate_frame_source_line (void) annotate_frame_source_line (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-source-line\n")); printf_unfiltered (("\n\032\032frame-source-line\n"));
} }
void void
annotate_frame_source_end (void) annotate_frame_source_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-source-end\n")); printf_unfiltered (("\n\032\032frame-source-end\n"));
} }
void void
annotate_frame_where (void) annotate_frame_where (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-where\n")); printf_unfiltered (("\n\032\032frame-where\n"));
} }
void void
annotate_frame_end (void) annotate_frame_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032frame-end\n")); printf_unfiltered (("\n\032\032frame-end\n"));
} }
void void
@ -569,9 +569,9 @@ annotate_array_section_begin (int idx, struct type *elttype)
{ {
if (annotation_level == 2) if (annotation_level == 2)
{ {
printf_filtered (("\n\032\032array-section-begin %d "), idx); printf_unfiltered (("\n\032\032array-section-begin %d "), idx);
print_value_flags (elttype); print_value_flags (elttype);
printf_filtered (("\n")); printf_unfiltered (("\n"));
} }
} }
@ -579,28 +579,28 @@ void
annotate_elt_rep (unsigned int repcount) annotate_elt_rep (unsigned int repcount)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032elt-rep %u\n"), repcount); printf_unfiltered (("\n\032\032elt-rep %u\n"), repcount);
} }
void void
annotate_elt_rep_end (void) annotate_elt_rep_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032elt-rep-end\n")); printf_unfiltered (("\n\032\032elt-rep-end\n"));
} }
void void
annotate_elt (void) annotate_elt (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032elt\n")); printf_unfiltered (("\n\032\032elt\n"));
} }
void void
annotate_array_section_end (void) annotate_array_section_end (void)
{ {
if (annotation_level == 2) if (annotation_level == 2)
printf_filtered (("\n\032\032array-section-end\n")); printf_unfiltered (("\n\032\032array-section-end\n"));
} }
/* Called when GDB is about to display the prompt. Used to reset /* Called when GDB is about to display the prompt. Used to reset