From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27343 invoked by alias); 15 Jun 2005 03:19:25 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 27301 invoked by uid 22791); 15 Jun 2005 03:19:07 -0000 Received: from viper.snap.net.nz (HELO viper.snap.net.nz) (202.37.101.8) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Wed, 15 Jun 2005 03:19:07 +0000 Received: from farnswood.snap.net.nz (p101-tnt1.snap.net.nz [202.124.110.101]) by viper.snap.net.nz (Postfix) with ESMTP id 299F254BEF6 for ; Wed, 15 Jun 2005 15:18:57 +1200 (NZST) Received: by farnswood.snap.net.nz (Postfix, from userid 501) id 3D80362A99; Wed, 15 Jun 2005 04:16:07 +0100 (BST) From: Nick Roberts MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <17071.40307.949193.158796@farnswood.snap.net.nz> Date: Wed, 15 Jun 2005 03:19:00 -0000 To: gdb-patches@sources.redhat.com Subject: [PATCH] Removal of markup annotations X-SW-Source: 2005-06/txt/msg00189.txt.bz2 Here's the patch for the removal of some of the level 2 annotations that I referred to yesterday. It primarily removes the markup annotations that worked just with level (annotation_level == 2) and leaves those which also worked with level 3 (annotation_level > 2). But it also restricts breakpoints_changed and annotate_frames_invalid to level 2. breakpoints_changed doesn't get called at the moment because currently deprecated_delete_breakpoint_hook and deprecated_modify_breakpoint_hook have been set to zero in clear_interpreter_hooks. I have already submitted a patch for this (2005-06-04). This patch cleans up the code quite considerably and hopefully will relieve some of the pressure to remove the remaining annotations. Nick 2005-06-15 Nick Roberts * annotate.c (print_value_flags, annotate_signal_name) (annotate_signal_name_end, annotate_signal_string) (annotate_signal_string_end, annotate_breakpoints_headers) (annotate_field, annotate_breakpoints_table, annotate_record) (annotate_breakpoints_table_end, annotate_field_begin) (annotate_field_name_end, annotate_field_value) (annotate_field_end, annotate_value_history_begin) (annotate_value_begin, annotate_value_history_value) (annotate_value_history_end, annotate_value_end) (annotate_display_begin, annotate_display_number_end) (annotate_display_format, annotate_display_expression) (annotate_display_expression_end, annotate_display_value) (annotate_display_end, annotate_arg_begin, annotate_arg_name_end) (annotate_arg_value, annotate_arg_end, annotate_frame_begin) (annotate_function_call, annotate_signal_handler_caller) (annotate_frame_address, annotate_frame_address_end) (annotate_frame_function_name, annotate_frame_args) (annotate_frame_source_begin, annotate_frame_source_file) (annotate_frame_source_file_end, annotate_frame_source_line) (annotate_frame_source_end, annotate_frame_where) (annotate_frame_end, annotate_array_section_begin) (annotate_elt_rep, annotate_elt_rep_end, annotate_elt) (annotate_array_section_end): Remove. (annotate_stopped): Call breakpoints_changed for level 2 annotations only. (annotate_frames_invalid, _initialize_annotate): Act only with level 2 annotations. * annotate.h: Remove extern declarations for markup annotations. * breakpoint.c (condition_command, commands_command) (set_raw_breakpoint, clear_command, breakpoint_re_set_one) (set_ignore_count, do_enable_breakpoint): Call breakpoints_changed for level 2 annotations only. (print_one_breakpoint, breakpoint_1) (print_one_exception_catchpoint): Remove markup annotations. Mainly calls to annotate_field. * blockframe.c, utils.c: Remove include for annotate.h. * valprint.c: Remove include for annotate.h. (val_print_array_elements): Remove markup annotations. * ada-valprint.c: Remove include for annotate.h. (val_print_packed_array_elements, print_field_values): Remove markup annotations. * cp-valprint.c: Remove include for annotate.h. (cp_print_value_fields): Remove markup annotations. * jv-valprint.c: Remove include for annotate.h. (java_print_value_fields): Remove markup annotations. * p-valprint.c: Remove include for annotate.h. (pascal_object_print_value_fields): Remove markup annotations. * printcmd.c: Remove include for annotate.h. (print_command_1, output_command, do_one_display): Remove markup annotations. * stack.c: Remove include for annotate.h. (print_frame_args, print_frame_info, print_frame): Remove markup annotations. * infrun.c (print_stop_reason): Remove markup annotations. *** /home/nick/src/gdb/annotate.c.~1.9~ 2005-06-11 20:49:45.000000000 +1200 --- /home/nick/src/gdb/annotate.c 2005-06-15 11:42:47.000000000 +1200 *************** *** 31,38 **** extern void _initialize_annotate (void); - static void print_value_flags (struct type *); - static void breakpoint_changed (struct breakpoint *); void (*deprecated_annotate_starting_hook) (void); --- 31,36 ---- *************** *** 41,56 **** void (*deprecated_annotate_signal_hook) (void); void (*deprecated_annotate_exited_hook) (void); static int ignore_count_changed = 0; - static void - print_value_flags (struct type *t) - { - if (can_dereference (t)) - printf_filtered (("*")); - else - printf_filtered (("-")); - } void breakpoints_changed (void) --- 39,49 ---- void (*deprecated_annotate_signal_hook) (void); void (*deprecated_annotate_exited_hook) (void); + extern void breakpoints_info (char *, int); + extern struct ui_file *raw_stdout; + static int ignore_count_changed = 0; void breakpoints_changed (void) *************** *** 123,129 **** if (annotation_level > 1) printf_filtered (("\n\032\032stopped\n")); } ! if (annotation_level > 1 && ignore_count_changed) { ignore_count_changed = 0; breakpoints_changed (); --- 116,122 ---- if (annotation_level > 1) printf_filtered (("\n\032\032stopped\n")); } ! if (annotation_level == 2 && ignore_count_changed) { ignore_count_changed = 0; breakpoints_changed (); *************** *** 153,186 **** } void - annotate_signal_name (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032signal-name\n")); - } - - void - annotate_signal_name_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032signal-name-end\n")); - } - - void - annotate_signal_string (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032signal-string\n")); - } - - void - annotate_signal_string_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032signal-string-end\n")); - } - - void annotate_signal (void) { if (deprecated_annotate_signal_hook) --- 146,151 ---- *************** *** 191,271 **** } void - annotate_breakpoints_headers (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032breakpoints-headers\n")); - } - - void - annotate_field (int num) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032field %d\n"), num); - } - - void - annotate_breakpoints_table (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032breakpoints-table\n")); - } - - void - annotate_record (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032record\n")); - } - - void - annotate_breakpoints_table_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032breakpoints-table-end\n")); - } - - void annotate_frames_invalid (void) { ! if (annotation_level > 1) { target_terminal_ours (); printf_unfiltered (("\n\032\032frames-invalid\n")); } } - - void - annotate_field_begin (struct type *type) - { - if (annotation_level == 2) - { - printf_filtered (("\n\032\032field-begin ")); - print_value_flags (type); - printf_filtered (("\n")); - } - } - - void - annotate_field_name_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032field-name-end\n")); - } - - void - annotate_field_value (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032field-value\n")); - } - - void - annotate_field_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032field-end\n")); - } void annotate_quit (void) --- 156,169 ---- } void annotate_frames_invalid (void) { ! if (annotation_level == 2) { target_terminal_ours (); printf_unfiltered (("\n\032\032frames-invalid\n")); } } void annotate_quit (void) *************** *** 289,418 **** } void - annotate_value_history_begin (int histindex, struct type *type) - { - if (annotation_level == 2) - { - printf_filtered (("\n\032\032value-history-begin %d "), histindex); - print_value_flags (type); - printf_filtered (("\n")); - } - } - - void - annotate_value_begin (struct type *type) - { - if (annotation_level == 2) - { - printf_filtered (("\n\032\032value-begin ")); - print_value_flags (type); - printf_filtered (("\n")); - } - } - - void - annotate_value_history_value (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032value-history-value\n")); - } - - void - annotate_value_history_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032value-history-end\n")); - } - - void - annotate_value_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032value-end\n")); - } - - void - annotate_display_begin (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032display-begin\n")); - } - - void - annotate_display_number_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032display-number-end\n")); - } - - void - annotate_display_format (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032display-format\n")); - } - - void - annotate_display_expression (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032display-expression\n")); - } - - void - annotate_display_expression_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032display-expression-end\n")); - } - - void - annotate_display_value (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032display-value\n")); - } - - void - annotate_display_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032display-end\n")); - } - - void - annotate_arg_begin (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032arg-begin\n")); - } - - void - annotate_arg_name_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032arg-name-end\n")); - } - - void - annotate_arg_value (struct type *type) - { - if (annotation_level == 2) - { - printf_filtered (("\n\032\032arg-value ")); - print_value_flags (type); - printf_filtered (("\n")); - } - } - - void - annotate_arg_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032arg-end\n")); - } - - void annotate_source (char *filename, int line, int character, int mid, CORE_ADDR pc) { if (annotation_level > 1) --- 187,192 ---- *************** *** 427,573 **** printf_filtered (("\n")); } - void - annotate_frame_begin (int level, CORE_ADDR pc) - { - if (annotation_level == 2) - { - printf_filtered (("\n\032\032frame-begin %d 0x"), level); - deprecated_print_address_numeric (pc, 0, gdb_stdout); - printf_filtered (("\n")); - } - } - - void - annotate_function_call (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032function-call\n")); - } - - void - annotate_signal_handler_caller (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032signal-handler-caller\n")); - } - - void - annotate_frame_address (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-address\n")); - } - - void - annotate_frame_address_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-address-end\n")); - } - - void - annotate_frame_function_name (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-function-name\n")); - } - - void - annotate_frame_args (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-args\n")); - } - - void - annotate_frame_source_begin (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-source-begin\n")); - } - - void - annotate_frame_source_file (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-source-file\n")); - } - - void - annotate_frame_source_file_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-source-file-end\n")); - } - - void - annotate_frame_source_line (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-source-line\n")); - } - - void - annotate_frame_source_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-source-end\n")); - } - - void - annotate_frame_where (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-where\n")); - } - - void - annotate_frame_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032frame-end\n")); - } - - void - annotate_array_section_begin (int index, struct type *elttype) - { - if (annotation_level == 2) - { - printf_filtered (("\n\032\032array-section-begin %d "), index); - print_value_flags (elttype); - printf_filtered (("\n")); - } - } - - void - annotate_elt_rep (unsigned int repcount) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032elt-rep %u\n"), repcount); - } - - void - annotate_elt_rep_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032elt-rep-end\n")); - } - - void - annotate_elt (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032elt\n")); - } - - void - annotate_array_section_end (void) - { - if (annotation_level == 2) - printf_filtered (("\n\032\032array-section-end\n")); - } - static void breakpoint_changed (struct breakpoint *b) { --- 201,206 ---- *************** *** 577,583 **** void _initialize_annotate (void) { ! if (annotation_level > 1) { deprecated_delete_breakpoint_hook = breakpoint_changed; deprecated_modify_breakpoint_hook = breakpoint_changed; --- 210,216 ---- void _initialize_annotate (void) { ! if (annotation_level == 2) { deprecated_delete_breakpoint_hook = breakpoint_changed; deprecated_modify_breakpoint_hook = breakpoint_changed; *** /home/nick/src/gdb/annotate.h.~1.5.~ 2004-05-26 07:52:30.000000000 +1200 --- /home/nick/src/gdb/annotate.h 2005-06-15 10:28:59.000000000 +1200 *************** *** 32,104 **** extern void annotate_stopped (void); extern void annotate_exited (int); extern void annotate_signalled (void); - extern void annotate_signal_name (void); - extern void annotate_signal_name_end (void); - extern void annotate_signal_string (void); - extern void annotate_signal_string_end (void); - extern void annotate_signal (void); - - extern void annotate_breakpoints_headers (void); - extern void annotate_field (int); - extern void annotate_breakpoints_table (void); - extern void annotate_record (void); - extern void annotate_breakpoints_table_end (void); extern void annotate_frames_invalid (void); - struct type; - - extern void annotate_field_begin (struct type *); - extern void annotate_field_name_end (void); - extern void annotate_field_value (void); - extern void annotate_field_end (void); - extern void annotate_quit (void); extern void annotate_error (void); extern void annotate_error_begin (void); - extern void annotate_value_history_begin (int, struct type *); - extern void annotate_value_begin (struct type *); - extern void annotate_value_history_value (void); - extern void annotate_value_history_end (void); - extern void annotate_value_end (void); - - extern void annotate_display_begin (void); - extern void annotate_display_number_end (void); - extern void annotate_display_format (void); - extern void annotate_display_expression (void); - extern void annotate_display_expression_end (void); - extern void annotate_display_value (void); - extern void annotate_display_end (void); - - extern void annotate_arg_begin (void); - extern void annotate_arg_name_end (void); - extern void annotate_arg_value (struct type *); - extern void annotate_arg_end (void); - extern void annotate_source (char *, int, int, int, CORE_ADDR); - extern void annotate_frame_begin (int, CORE_ADDR); - extern void annotate_function_call (void); - extern void annotate_signal_handler_caller (void); - extern void annotate_frame_address (void); - extern void annotate_frame_address_end (void); - extern void annotate_frame_function_name (void); - extern void annotate_frame_args (void); - extern void annotate_frame_source_begin (void); - extern void annotate_frame_source_file (void); - extern void annotate_frame_source_file_end (void); - extern void annotate_frame_source_line (void); - extern void annotate_frame_source_end (void); - extern void annotate_frame_where (void); - extern void annotate_frame_end (void); - - extern void annotate_array_section_begin (int, struct type *); - extern void annotate_elt_rep (unsigned int); - extern void annotate_elt_rep_end (void); - extern void annotate_elt (void); - extern void annotate_array_section_end (void); - extern void (*deprecated_annotate_starting_hook) (void); extern void (*deprecated_annotate_stopped_hook) (void); extern void (*deprecated_annotate_signalled_hook) (void); --- 32,46 ---- *** /home/nick/src/gdb/breakpoint.c.~1.217.~ 2005-06-03 09:14:55.000000000 +1200 --- /home/nick/src/gdb/breakpoint.c 2005-06-15 10:35:36.000000000 +1200 *************** *** 584,590 **** error (_("Junk at end of expression")); } } ! breakpoints_changed (); breakpoint_modify_event (b->number); return; } --- 584,591 ---- error (_("Junk at end of expression")); } } ! if (annotation_level == 2) ! breakpoints_changed (); breakpoint_modify_event (b->number); return; } *************** *** 623,629 **** do_cleanups (cleanups); free_command_lines (&b->commands); b->commands = l; ! breakpoints_changed (); breakpoint_modify_event (b->number); return; } --- 624,631 ---- do_cleanups (cleanups); free_command_lines (&b->commands); b->commands = l; ! if (annotation_level == 2) ! breakpoints_changed (); breakpoint_modify_event (b->number); return; } *************** *** 3332,3346 **** struct cleanup *old_chain = make_cleanup_ui_out_stream_delete (stb); struct cleanup *bkpt_chain; - annotate_record (); bkpt_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "bkpt"); /* 1 */ - annotate_field (0); ui_out_field_int (uiout, "number", b->number); /* 2 */ - annotate_field (1); if (((int) b->type > (sizeof (bptypes) / sizeof (bptypes[0]))) || ((int) b->type != bptypes[(int) b->type].type)) internal_error (__FILE__, __LINE__, --- 3334,3345 ---- *************** *** 3349,3359 **** ui_out_field_string (uiout, "type", bptypes[(int) b->type].description); /* 3 */ - annotate_field (2); ui_out_field_string (uiout, "disp", bpdisps[(int) b->disposition]); /* 4 */ - annotate_field (3); ui_out_field_fmt (uiout, "enabled", "%c", bpenables[(int) b->enable_state]); ui_out_spaces (uiout, 2); --- 3348,3356 ---- *************** *** 3386,3392 **** is relatively readable). */ if (addressprint) ui_out_field_skip (uiout, "addr"); - annotate_field (5); print_expression (b->exp, stb->stream); ui_out_field_stream (uiout, "what", stb); break; --- 3383,3388 ---- *************** *** 3398,3404 **** is relatively readable). */ if (addressprint) ui_out_field_skip (uiout, "addr"); - annotate_field (5); if (b->dll_pathname == NULL) { ui_out_field_string (uiout, "what", ""); --- 3394,3399 ---- *************** *** 3419,3425 **** is relatively readable). */ if (addressprint) ui_out_field_skip (uiout, "addr"); - annotate_field (5); if (b->forked_inferior_pid != 0) { ui_out_text (uiout, "process "); --- 3414,3419 ---- *************** *** 3433,3439 **** is relatively readable). */ if (addressprint) ui_out_field_skip (uiout, "addr"); - annotate_field (5); if (b->exec_pathname != NULL) { ui_out_text (uiout, "program \""); --- 3427,3432 ---- *************** *** 3448,3454 **** is relatively readable). */ if (addressprint) ui_out_field_skip (uiout, "addr"); - annotate_field (5); ui_out_field_string (uiout, "what", "exception catch"); ui_out_spaces (uiout, 1); break; --- 3441,3446 ---- *************** *** 3459,3465 **** is relatively readable). */ if (addressprint) ui_out_field_skip (uiout, "addr"); - annotate_field (5); ui_out_field_string (uiout, "what", "exception throw"); ui_out_spaces (uiout, 1); break; --- 3451,3456 ---- *************** *** 3479,3491 **** case bp_overlay_event: if (addressprint) { - annotate_field (4); if (b->pending) ui_out_field_string (uiout, "addr", ""); else ui_out_field_core_addr (uiout, "addr", b->loc->address); } - annotate_field (5); *last_addr = b->loc->address; if (b->source_file) { --- 3470,3480 ---- *************** *** 3526,3532 **** if (frame_id_p (b->frame_id)) { - annotate_field (6); ui_out_text (uiout, "\tstop only in stack frame at "); /* FIXME: cagney/2002-12-01: Shouldn't be poeking around inside the frame ID. */ --- 3515,3520 ---- *************** *** 3536,3542 **** if (b->cond) { - annotate_field (7); ui_out_text (uiout, "\tstop only if "); print_expression (b->cond, stb->stream); ui_out_field_stream (uiout, "cond", stb); --- 3524,3529 ---- *************** *** 3545,3551 **** if (b->pending && b->cond_string) { - annotate_field (7); ui_out_text (uiout, "\tstop only if "); ui_out_field_string (uiout, "cond", b->cond_string); ui_out_text (uiout, "\n"); --- 3532,3537 ---- *************** *** 3582,3588 **** if (b->ignore_count) { - annotate_field (8); ui_out_text (uiout, "\tignore next "); ui_out_field_int (uiout, "ignore", b->ignore_count); ui_out_text (uiout, " hits\n"); --- 3568,3573 ---- *************** *** 3592,3598 **** { struct cleanup *script_chain; - annotate_field (9); script_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "script"); print_command_lines (uiout, l, 4); do_cleanups (script_chain); --- 3577,3582 ---- *************** *** 3686,3720 **** = make_cleanup_ui_out_table_begin_end (uiout, 5, nr_printable_breakpoints, "BreakpointTable"); - if (nr_printable_breakpoints > 0) - annotate_breakpoints_headers (); - if (nr_printable_breakpoints > 0) - annotate_field (0); ui_out_table_header (uiout, 3, ui_left, "number", "Num"); /* 1 */ - if (nr_printable_breakpoints > 0) - annotate_field (1); ui_out_table_header (uiout, 14, ui_left, "type", "Type"); /* 2 */ - if (nr_printable_breakpoints > 0) - annotate_field (2); ui_out_table_header (uiout, 4, ui_left, "disp", "Disp"); /* 3 */ - if (nr_printable_breakpoints > 0) - annotate_field (3); ui_out_table_header (uiout, 3, ui_left, "enabled", "Enb"); /* 4 */ if (addressprint) { - if (nr_printable_breakpoints > 0) - annotate_field (4); if (TARGET_ADDR_BIT <= 32) ui_out_table_header (uiout, 10, ui_left, "addr", "Address");/* 5 */ else ui_out_table_header (uiout, 18, ui_left, "addr", "Address");/* 5 */ } - if (nr_printable_breakpoints > 0) - annotate_field (5); ui_out_table_header (uiout, 40, ui_noalign, "what", "What"); /* 6 */ ui_out_table_body (uiout); - if (nr_printable_breakpoints > 0) - annotate_breakpoints_table (); ALL_BREAKPOINTS (b) if (bnum == -1 --- 3670,3688 ---- *************** *** 3743,3752 **** if (last_addr != (CORE_ADDR) -1) set_next_address (last_addr); } - - /* FIXME? Should this be moved up so that it is only called when - there have been breakpoints? */ - annotate_breakpoints_table_end (); } static void --- 3711,3716 ---- *************** *** 4122,4128 **** } check_duplicates (b); ! breakpoints_changed (); return b; } --- 4086,4093 ---- } check_duplicates (b); ! if (annotation_level == 2) ! breakpoints_changed (); return b; } *************** *** 6329,6339 **** print_one_exception_catchpoint (struct breakpoint *b, CORE_ADDR *last_addr) { if (addressprint) ! { ! annotate_field (4); ! ui_out_field_core_addr (uiout, "addr", b->loc->address); ! } ! annotate_field (5); *last_addr = b->loc->address; if (strstr (b->addr_string, "throw") != NULL) ui_out_field_string (uiout, "what", "exception throw"); --- 6294,6300 ---- print_one_exception_catchpoint (struct breakpoint *b, CORE_ADDR *last_addr) { if (addressprint) ! ui_out_field_core_addr (uiout, "addr", b->loc->address); *last_addr = b->loc->address; if (strstr (b->addr_string, "throw") != NULL) ui_out_field_string (uiout, "what", "exception throw"); *************** *** 6696,6702 **** else printf_unfiltered (_("Deleted breakpoints ")); } ! breakpoints_changed (); while (found) { if (from_tty) --- 6657,6664 ---- else printf_unfiltered (_("Deleted breakpoints ")); } ! if (annotation_level == 2) ! breakpoints_changed (); while (found) { if (from_tty) *************** *** 7109,7115 **** /* Might be better to do this just once per breakpoint_re_set, rather than once for every breakpoint. */ ! breakpoints_changed (); } b->loc->section = sals.sals[i].section; b->enable_state = save_enable; /* Restore it, this worked. */ --- 7071,7078 ---- /* Might be better to do this just once per breakpoint_re_set, rather than once for every breakpoint. */ ! if (annotation_level == 2) ! breakpoints_changed (); } b->loc->section = sals.sals[i].section; b->enable_state = save_enable; /* Restore it, this worked. */ *************** *** 7296,7302 **** printf_filtered (_("Will ignore next %d crossings of breakpoint %d."), count, bptnum); } ! breakpoints_changed (); breakpoint_modify_event (b->number); return; } --- 7259,7266 ---- printf_filtered (_("Will ignore next %d crossings of breakpoint %d."), count, bptnum); } ! if (annotation_level == 2) ! breakpoints_changed (); breakpoint_modify_event (b->number); return; } *************** *** 7467,7473 **** /* When enabling a pending breakpoint, we need to check if the breakpoint is resolvable since shared libraries could have been loaded after the breakpoint was disabled. */ ! breakpoints_changed (); if (resolve_pending_breakpoint (bpt) == GDB_RC_OK) { delete_breakpoint (bpt); --- 7431,7438 ---- /* When enabling a pending breakpoint, we need to check if the breakpoint is resolvable since shared libraries could have been loaded after the breakpoint was disabled. */ ! if (annotation_level == 2) ! breakpoints_changed (); if (resolve_pending_breakpoint (bpt) == GDB_RC_OK) { delete_breakpoint (bpt); *************** *** 7483,7489 **** bpt->enable_state = bp_enabled; bpt->disposition = disposition; check_duplicates (bpt); ! breakpoints_changed (); if (bpt->type == bp_watchpoint || bpt->type == bp_hardware_watchpoint || --- 7448,7455 ---- bpt->enable_state = bp_enabled; bpt->disposition = disposition; check_duplicates (bpt); ! if (annotation_level == 2) ! breakpoints_changed (); if (bpt->type == bp_watchpoint || bpt->type == bp_hardware_watchpoint || *** /home/nick/src/gdb/blockframe.c.~1.108.~ 2004-11-14 22:47:48.000000000 +1300 --- /home/nick/src/gdb/blockframe.c 2005-06-13 20:39:51.000000000 +1200 *************** *** 31,37 **** #include "value.h" /* for read_register */ #include "target.h" /* for target_has_stack */ #include "inferior.h" /* for read_pc */ - #include "annotate.h" #include "regcache.h" #include "gdb_assert.h" #include "dummy-frame.h" --- 31,36 ---- *** /home/nick/src/gdb/utils.c.~1.160.~ 2005-03-19 15:48:48.000000000 +1300 --- /home/nick/src/gdb/utils.c 2005-06-13 20:37:24.000000000 +1200 *************** *** 50,56 **** #include "expression.h" #include "language.h" #include "charset.h" - #include "annotate.h" #include "filenames.h" #include "symfile.h" --- 50,55 ---- *** /home/nick/src/gdb/valprint.c.~1.54.~ 2005-06-11 19:41:42.000000000 +1200 --- /home/nick/src/gdb/valprint.c 2005-06-13 20:37:12.000000000 +1200 *************** *** 30,36 **** #include "gdbcmd.h" #include "target.h" #include "language.h" - #include "annotate.h" #include "valprint.h" #include "floatformat.h" #include "doublest.h" --- 30,35 ---- *************** *** 889,896 **** eltlen = TYPE_LENGTH (check_typedef (elttype)); len = TYPE_LENGTH (type) / eltlen; - annotate_array_section_begin (i, elttype); - for (; i < len && things_printed < print_max; i++) { if (i != 0) --- 888,893 ---- *************** *** 920,928 **** { val_print (elttype, valaddr + i * eltlen, 0, 0, stream, format, deref_ref, recurse + 1, pretty); - annotate_elt_rep (reps); fprintf_filtered (stream, " ", reps); - annotate_elt_rep_end (); i = rep1 - 1; things_printed += repeat_count_threshold; --- 917,923 ---- *************** *** 931,941 **** { val_print (elttype, valaddr + i * eltlen, 0, 0, stream, format, deref_ref, recurse + 1, pretty); - annotate_elt (); things_printed++; } } - annotate_array_section_end (); if (i < len) { fprintf_filtered (stream, "..."); --- 926,934 ---- *** /home/nick/src/gdb/ada-valprint.c.~1.23.~ 2005-05-18 20:17:17.000000000 +1200 --- /home/nick/src/gdb/ada-valprint.c 2005-06-13 20:39:34.000000000 +1200 *************** *** 29,35 **** #include "demangle.h" #include "valprint.h" #include "language.h" - #include "annotate.h" #include "ada-lang.h" #include "c-lang.h" #include "infcall.h" --- 29,34 ---- *************** *** 154,160 **** } i = 0; - annotate_array_section_begin (i, elttype); while (i < len && things_printed < print_max) { --- 153,158 ---- *************** *** 197,206 **** { val_print (elttype, value_contents (v0), 0, 0, stream, format, 0, recurse + 1, pretty); - annotate_elt_rep (i - i0); fprintf_filtered (stream, _(" "), i - i0); - annotate_elt_rep_end (); - } else { --- 195,201 ---- *************** *** 222,233 **** } val_print (elttype, value_contents (v0), 0, 0, stream, format, 0, recurse + 1, pretty); - annotate_elt (); } } things_printed += i - i0; } - annotate_array_section_end (); if (i < len) { fprintf_filtered (stream, "..."); --- 217,226 ---- *************** *** 1046,1058 **** } else { - annotate_field_begin (TYPE_FIELD_TYPE (type, i)); fprintf_filtered (stream, "%.*s", ada_name_prefix_len (TYPE_FIELD_NAME (type, i)), TYPE_FIELD_NAME (type, i)); - annotate_field_name_end (); fputs_filtered (" => ", stream); - annotate_field_value (); } if (TYPE_FIELD_PACKED (type, i)) --- 1039,1048 ---- *************** *** 1085,1091 **** ada_val_print (TYPE_FIELD_TYPE (type, i), valaddr + TYPE_FIELD_BITPOS (type, i) / HOST_CHAR_BIT, 0, 0, stream, format, 0, recurse + 1, pretty); - annotate_field_end (); } return comma_needed; --- 1075,1080 ---- *** /home/nick/src/gdb/cp-valprint.c.~1.42.~ 2005-05-18 20:17:20.000000000 +1200 --- /home/nick/src/gdb/cp-valprint.c 2005-06-13 20:41:08.000000000 +1200 *************** *** 29,35 **** #include "command.h" #include "gdbcmd.h" #include "demangle.h" - #include "annotate.h" #include "gdb_string.h" #include "c-lang.h" #include "target.h" --- 29,34 ---- *************** *** 359,376 **** } else { - annotate_field_begin (TYPE_FIELD_TYPE (type, i)); - if (TYPE_FIELD_STATIC (type, i)) fputs_filtered ("static ", stream); fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), current_language->la_language, DMGL_PARAMS | DMGL_ANSI); - annotate_field_name_end (); /* do not print leading '=' in case of anonymous unions */ if (strcmp (TYPE_FIELD_NAME (type, i), "")) fputs_filtered (" = ", stream); - annotate_field_value (); } if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i)) --- 358,371 ---- *************** *** 416,422 **** stream, format, 0, recurse + 1, pretty); } } - annotate_field_end (); } if (dont_print_statmem == 0) --- 411,416 ---- *** /home/nick/src/gdb/jv-valprint.c.~1.26.~ 2005-06-03 09:14:57.000000000 +1200 --- /home/nick/src/gdb/jv-valprint.c 2005-06-13 20:38:20.000000000 +1200 *************** *** 31,37 **** #include "language.h" #include "jv-lang.h" #include "c-lang.h" - #include "annotate.h" #include "gdb_string.h" /* Local functions */ --- 31,36 ---- *************** *** 355,370 **** } else { - annotate_field_begin (TYPE_FIELD_TYPE (type, i)); - if (TYPE_FIELD_STATIC (type, i)) fputs_filtered ("static ", stream); fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), language_cplus, DMGL_PARAMS | DMGL_ANSI); - annotate_field_name_end (); fputs_filtered (": ", stream); - annotate_field_value (); } if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i)) --- 354,365 ---- *************** *** 415,421 **** stream, format, 0, recurse + 1, pretty); } } - annotate_field_end (); } if (pretty) --- 410,415 ---- *** /home/nick/src/gdb/p-valprint.c.~1.39~ 2005-06-15 11:15:19.000000000 +1200 --- /home/nick/src/gdb/p-valprint.c 2005-06-13 19:34:23.000000000 +1200 *************** *** 34,40 **** #include "typeprint.h" #include "language.h" #include "target.h" - #include "annotate.h" #include "p-lang.h" #include "cp-abi.h" #include "cp-support.h" --- 34,39 ---- *************** *** 822,837 **** } else { - annotate_field_begin (TYPE_FIELD_TYPE (type, i)); - if (TYPE_FIELD_STATIC (type, i)) fputs_filtered ("static ", stream); fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), language_cplus, DMGL_PARAMS | DMGL_ANSI); - annotate_field_name_end (); fputs_filtered (" = ", stream); - annotate_field_value (); } if (!TYPE_FIELD_STATIC (type, i) && TYPE_FIELD_PACKED (type, i)) --- 821,832 ---- *************** *** 883,889 **** stream, format, 0, recurse + 1, pretty); } } - annotate_field_end (); } if (dont_print_statmem == 0) --- 878,883 ---- *** /home/nick/src/gdb/printcmd.c.~1.94.~ 2005-02-25 19:12:25.000000000 +1300 --- /home/nick/src/gdb/printcmd.c 2005-06-13 19:32:14.000000000 +1200 *************** *** 35,41 **** #include "breakpoint.h" #include "demangle.h" #include "valprint.h" - #include "annotate.h" #include "symfile.h" /* for overlay functions */ #include "objfiles.h" /* ditto */ #include "completer.h" /* for completion functions */ --- 35,40 ---- *************** *** 906,932 **** { int histindex = record_latest_value (val); - if (histindex >= 0) - annotate_value_history_begin (histindex, value_type (val)); - else - annotate_value_begin (value_type (val)); - if (inspect) printf_unfiltered ("\031(gdb-makebuffer \"%s\" %d '(\"", exp, histindex); else if (histindex >= 0) printf_filtered ("$%d = ", histindex); - if (histindex >= 0) - annotate_value_history_value (); - print_formatted (val, format, fmt.size, gdb_stdout); printf_filtered ("\n"); - if (histindex >= 0) - annotate_value_history_end (); - else - annotate_value_end (); - if (inspect) printf_unfiltered ("\") )\030"); } --- 905,918 ---- *************** *** 980,991 **** val = evaluate_expression (expr); - annotate_value_begin (value_type (val)); - print_formatted (val, format, fmt.size, gdb_stdout); - annotate_value_end (); - wrap_here (""); gdb_flush (gdb_stdout); --- 966,973 ---- *************** *** 1513,1529 **** current_display_number = d->number; - annotate_display_begin (); printf_filtered ("%d", d->number); - annotate_display_number_end (); printf_filtered (": "); if (d->format.size) { CORE_ADDR addr; struct value *val; - annotate_display_format (); - printf_filtered ("x/"); if (d->format.count != 1) printf_filtered ("%d", d->format.count); --- 1495,1507 ---- *************** *** 1532,1541 **** printf_filtered ("%c", d->format.size); printf_filtered (" "); - annotate_display_expression (); - print_expression (d->exp, gdb_stdout); - annotate_display_expression_end (); if (d->format.count != 1) printf_filtered ("\n"); --- 1510,1516 ---- *************** *** 1547,1579 **** if (d->format.format == 'i') addr = ADDR_BITS_REMOVE (addr); - annotate_display_value (); - do_examine (d->format, addr); } else { - annotate_display_format (); - if (d->format.format) printf_filtered ("/%c ", d->format.format); - annotate_display_expression (); - print_expression (d->exp, gdb_stdout); - annotate_display_expression_end (); printf_filtered (" = "); - annotate_display_expression (); - print_formatted (evaluate_expression (d->exp), d->format.format, d->format.size, gdb_stdout); printf_filtered ("\n"); } - annotate_display_end (); - gdb_flush (gdb_stdout); current_display_number = -1; } --- 1522,1543 ---- *** /home/nick/src/gdb/stack.c.~1.133.~ 2005-06-13 20:47:48.000000000 +1200 --- /home/nick/src/gdb/stack.c 2005-06-15 10:48:13.000000000 +1200 *************** *** 37,43 **** #include "breakpoint.h" #include "demangle.h" #include "inferior.h" - #include "annotate.h" #include "ui-out.h" #include "block.h" #include "stack.h" --- 37,42 ---- *************** *** 335,347 **** ui_out_text (uiout, ", "); ui_out_wrap_hint (uiout, " "); - annotate_arg_begin (); - list_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); fprintf_symbol_filtered (stb->stream, SYMBOL_PRINT_NAME (sym), SYMBOL_LANGUAGE (sym), DMGL_PARAMS | DMGL_ANSI); ui_out_field_stream (uiout, "name", stb); - annotate_arg_name_end (); ui_out_text (uiout, "="); /* Avoid value_print because it will deref ref parameters. We just --- 334,343 ---- *************** *** 351,358 **** 2 for each recurse. */ val = read_var_value (sym, fi); - annotate_arg_value (val == NULL ? NULL : value_type (val)); - if (val) { common_val_print (val, stb->stream, 0, 0, 2, Val_no_prettyprint); --- 347,352 ---- *************** *** 364,371 **** /* Invoke ui_out_tuple_end. */ do_cleanups (list_chain); - annotate_arg_end (); - first = 0; } } --- 358,363 ---- *************** *** 448,456 **** struct cleanup *uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, "frame"); - annotate_frame_begin (print_level ? frame_relative_level (fi) : 0, - get_frame_pc (fi)); - /* Do this regardless of SOURCE because we don't have any source to list for this frame. */ if (print_level) --- 440,445 ---- *************** *** 460,483 **** frame_relative_level (fi)); } if (ui_out_is_mi_like_p (uiout)) - { - annotate_frame_address (); ui_out_field_core_addr (uiout, "addr", get_frame_pc (fi)); - annotate_frame_address_end (); - } if (get_frame_type (fi) == DUMMY_FRAME) - { - annotate_function_call (); ui_out_field_string (uiout, "func", ""); - } else if (get_frame_type (fi) == SIGTRAMP_FRAME) - { - annotate_signal_handler_caller (); ui_out_field_string (uiout, "func", ""); - } ui_out_text (uiout, "\n"); - annotate_frame_end (); do_cleanups (uiout_cleanup); return; --- 449,461 ---- *************** *** 539,546 **** if (print_what != LOCATION) set_default_breakpoint (1, get_frame_pc (fi), sal.symtab, sal.line); - annotate_frame_end (); - gdb_flush (gdb_stdout); } --- 517,522 ---- *************** *** 628,636 **** } } - annotate_frame_begin (print_level ? frame_relative_level (fi) : 0, - get_frame_pc (fi)); - list_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "frame"); if (print_level) --- 604,609 ---- *************** *** 644,660 **** || !sal.symtab || print_what == LOC_AND_ADDRESS) { - annotate_frame_address (); ui_out_field_core_addr (uiout, "addr", get_frame_pc (fi)); - annotate_frame_address_end (); ui_out_text (uiout, " in "); } - annotate_frame_function_name (); fprintf_symbol_filtered (stb->stream, funname ? funname : "??", funlang, DMGL_ANSI); ui_out_field_stream (uiout, "func", stb); ui_out_wrap_hint (uiout, " "); - annotate_frame_args (); ui_out_text (uiout, " ("); if (print_args) --- 617,629 ---- *************** *** 675,684 **** ui_out_text (uiout, ")"); if (sal.symtab && sal.symtab->filename) { - annotate_frame_source_begin (); ui_out_wrap_hint (uiout, " "); ui_out_text (uiout, " at "); - annotate_frame_source_file (); ui_out_field_string (uiout, "file", sal.symtab->filename); if (ui_out_is_mi_like_p (uiout)) { --- 644,651 ---- *************** *** 686,696 **** if (fullname != NULL) ui_out_field_string (uiout, "fullname", fullname); } - annotate_frame_source_file_end (); ui_out_text (uiout, ":"); ! annotate_frame_source_line (); ! ui_out_field_int (uiout, "line", sal.line); ! annotate_frame_source_end (); } if (!funname || (!sal.symtab || !sal.symtab->filename)) --- 653,660 ---- if (fullname != NULL) ui_out_field_string (uiout, "fullname", fullname); } ui_out_text (uiout, ":"); ! ui_out_field_int (uiout, "line", sal.line); } if (!funname || (!sal.symtab || !sal.symtab->filename)) *************** *** 702,708 **** #endif if (lib) { - annotate_frame_where (); ui_out_wrap_hint (uiout, " "); ui_out_text (uiout, " from "); ui_out_field_string (uiout, "from", lib); --- 666,671 ---- *** /home/nick/src/gdb/infrun.c.~1.202.~ 2005-06-03 09:14:56.000000000 +1200 --- /home/nick/src/gdb/infrun.c 2005-06-13 20:29:52.000000000 +1200 *************** *** 2893,2907 **** (uiout, "reason", async_reason_lookup (EXEC_ASYNC_EXITED_SIGNALLED)); ui_out_text (uiout, "\nProgram terminated with signal "); - annotate_signal_name (); ui_out_field_string (uiout, "signal-name", target_signal_to_name (stop_info)); - annotate_signal_name_end (); ui_out_text (uiout, ", "); - annotate_signal_string (); ui_out_field_string (uiout, "signal-meaning", target_signal_to_string (stop_info)); - annotate_signal_string_end (); ui_out_text (uiout, ".\n"); ui_out_text (uiout, "The program no longer exists.\n"); break; --- 2893,2903 ---- *************** *** 2932,2949 **** it. */ annotate_signal (); ui_out_text (uiout, "\nProgram received signal "); - annotate_signal_name (); if (ui_out_is_mi_like_p (uiout)) ui_out_field_string (uiout, "reason", async_reason_lookup (EXEC_ASYNC_SIGNAL_RECEIVED)); ui_out_field_string (uiout, "signal-name", target_signal_to_name (stop_info)); - annotate_signal_name_end (); ui_out_text (uiout, ", "); - annotate_signal_string (); ui_out_field_string (uiout, "signal-meaning", target_signal_to_string (stop_info)); - annotate_signal_string_end (); ui_out_text (uiout, ".\n"); break; default: --- 2928,2941 ----