[PATCH] Removal of markup annotations

[PATCH] Removal of markup annotations

[Nick Roberts]

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  <nickrob@snap.net.nz>

	* 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 (("-"));
- }
  \f
  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;
  
  \f
  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 ****
  }
  \f
  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"));
- }
  \f
  void
  annotate_quit (void)
--- 156,169 ----
  }
  \f
  void
  annotate_frames_invalid (void)
  {
!   if (annotation_level == 2)
      {
        target_terminal_ours ();
        printf_unfiltered (("\n\032\032frames-invalid\n"));
      }
  }
  \f
  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"));
- }
- \f
- 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", "<any library>");
--- 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", "<PENDING>");
  	    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, " <repeats %u times>", 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, _(" <repeats %u times>"), 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", "<function called from gdb>");
- 	}
        else if (get_frame_type (fi) == SIGTRAMP_FRAME)
-         {
- 	  annotate_signal_handler_caller ();
            ui_out_field_string (uiout, "func", "<signal handler called>");
-         }
        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 ----

Re: [PATCH] Removal of markup annotations

[Bob Rossi]

On Wed, Jun 15, 2005 at 03:16:03PM +1200, Nick Roberts wrote:
> 
> 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  <nickrob@snap.net.nz>
> 
> 	* 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.
> 

Hi Nick,

Out of all of the annotations that you are removing here, CGDB only
depends on annotate_breakpoints_headers, annotate_field,
annotate_breakpoints_table, annotate_record and
annotate_breakpoints_table_end.

I'll have to look deeper to verify this, but if this is true, it would
really simplify my life if we could leave those in. That at least would
allow CGDB to work with the next release of GDB while I work on
GDB/MI and getting CGDB to integrate with it.

Thanks,
Bob Rossi

Re: [PATCH] Removal of markup annotations

[Eli Zaretskii]

> From: Nick Roberts <nickrob@snap.net.nz>
> Date: Wed, 15 Jun 2005 15:16:03 +1200
> 
> 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.

If we are going to remove level-2 annotations, we should update the
manual to that effect.  Please review the "Annotations" chapter in
gdb.texinfo and the text in annotate.texinfo, and see if anything
there needs to be changed.

TIA

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > > 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.
 > 
 > If we are going to remove level-2 annotations, we should update the
 > manual to that effect.  Please review the "Annotations" chapter in
 > gdb.texinfo and the text in annotate.texinfo, and see if anything
 > there needs to be changed.

When we have agreed what can go, then I will do this.  I would like to write
the documentation just once, if thats possible.

Nick

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > Out of all of the annotations that you are removing here, CGDB only
 > depends on annotate_breakpoints_headers, annotate_field,
 > annotate_breakpoints_table, annotate_record and
 > annotate_breakpoints_table_end.

These are undocumented annotations and just mark up the output.  Could
you parse it from the syntax instead?

 > I'll have to look deeper to verify this, but if this is true, it would
 > really simplify my life if we could leave those in. That at least would
 > allow CGDB to work with the next release of GDB while I work on
 > GDB/MI and getting CGDB to integrate with it.

I've come to the conclusion that a fully working GDB/MI is a major task.
Sorting out annotations could be done much more quickly.

Nick

Re: [PATCH] Removal of markup annotations

[Bob Rossi]

On Thu, Jun 16, 2005 at 11:05:04AM +1200, Nick Roberts wrote:
>  > Out of all of the annotations that you are removing here, CGDB only
>  > depends on annotate_breakpoints_headers, annotate_field,
>  > annotate_breakpoints_table, annotate_record and
>  > annotate_breakpoints_table_end.
> 
> These are undocumented annotations and just mark up the output.  Could
> you parse it from the syntax instead?

These were documented when I wrote the CGDB annotation subsystem.
Between now and then, someone changed the documentation.

This link may work to demonstrate the fact.
http://web.archive.org/web/20030627071226/sources.redhat.com/gdb/current/onlinedocs/gdb_toc.html

I could look into parsing the syntax, but I would prefered if these
stayed. Is this not desirable for some reason?

>  > I'll have to look deeper to verify this, but if this is true, it would
>  > really simplify my life if we could leave those in. That at least would
>  > allow CGDB to work with the next release of GDB while I work on
>  > GDB/MI and getting CGDB to integrate with it.
> 
> I've come to the conclusion that a fully working GDB/MI is a major task.
> Sorting out annotations could be done much more quickly.

I've been extremely busy. When I finish up some tasks, I'm going to
devote myself full time to this task. I would like nothing better than
to see CGDB work with a fully functional GDB/MI.

Bob Rossi

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > >  > Out of all of the annotations that you are removing here, CGDB only
 > >  > depends on annotate_breakpoints_headers, annotate_field,
 > >  > annotate_breakpoints_table, annotate_record and
 > >  > annotate_breakpoints_table_end.
 > > 
 > > These are undocumented annotations and just mark up the output.  Could
 > > you parse it from the syntax instead?
 > 
 > These were documented when I wrote the CGDB annotation subsystem.
 > Between now and then, someone changed the documentation.
 > 
 > This link may work to demonstrate the fact.
 > http://web.archive.org/web/20030627071226/sources.redhat.com/gdb/current/onlinedocs/gdb_toc.html

OK but they still just mark up the output.

 > I could look into parsing the syntax, but I would prefered if these
 > stayed. Is this not desirable for some reason?

They make the code in breakpoint.c harder to read.  It's a question of
balancing the inconvenience of keeping them with that of removing them.

Nick

Re: [PATCH] Removal of markup annotations

[Eli Zaretskii]

> Date: Wed, 15 Jun 2005 19:35:29 -0400
> From: Bob Rossi <bob@brasko.net>
> Cc: gdb-patches@sources.redhat.com
> 
> On Thu, Jun 16, 2005 at 11:05:04AM +1200, Nick Roberts wrote:
> >  > Out of all of the annotations that you are removing here, CGDB only
> >  > depends on annotate_breakpoints_headers, annotate_field,
> >  > annotate_breakpoints_table, annotate_record and
> >  > annotate_breakpoints_table_end.
> > 
> > These are undocumented annotations and just mark up the output.  Could
> > you parse it from the syntax instead?
> 
> These were documented when I wrote the CGDB annotation subsystem.
> Between now and then, someone changed the documentation.

The annotations are now documented in a separate file, see
annotate.texinfo.

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > If we are going to remove level-2 annotations, we should update the
 > manual to that effect.  Please review the "Annotations" chapter in
 > gdb.texinfo and the text in annotate.texinfo, and see if anything
 > there needs to be changed.

In gdb.texinfo I suggest:

1) Moving the node "Server Prefix" out of "Annotations" and into "Controlling
   GDB" betweed "History" and "Screen Size".  I think this should be done
   even if we don't remove level-2 annotations.

2) In the node "Running the Program" the markup annotations described after
   signalled should be removed (signal-name, signal-name-end etc).

I suggest removing annotate.texinfo from the repository as it largely
covers the material in gdb.texinfo plus the markup annotations.


Nick

Re: [PATCH] Removal of markup annotations

[Eli Zaretskii]

> From: Nick Roberts <nickrob@snap.net.nz>
> Date: Mon, 20 Jun 2005 23:55:59 +1200
> Cc: gdb-patches@sources.redhat.com
> 
> In gdb.texinfo I suggest:
> 
> 1) Moving the node "Server Prefix" out of "Annotations" and into "Controlling
>    GDB" betweed "History" and "Screen Size".

You are right that it should be moved out of "Annotations", but I'm
not sure the place you suggest is the right one (it's not about
controlling GDB).  I will try to find a better place.

> 2) In the node "Running the Program" the markup annotations described after
>    signalled should be removed (signal-name, signal-name-end etc).

Why? do those annotations belong to those you propose to remove?

> I suggest removing annotate.texinfo from the repository as it largely
> covers the material in gdb.texinfo plus the markup annotations.

??? AFAIK, gdb.texinfo only covers level-3 annotations.  The rest are
in annotate.texinfo.

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > > In gdb.texinfo I suggest:
 > > 
 > > 1) Moving the node "Server Prefix" out of "Annotations" and into "Controlling
 > >    GDB" betweed "History" and "Screen Size".
 > 
 > You are right that it should be moved out of "Annotations", but I'm
 > not sure the place you suggest is the right one (it's not about
 > controlling GDB).  I will try to find a better place.

Its related to "History" which also isn't about controlling GDB, so perhaps
that node should also be moved

 > > 2) In the node "Running the Program" the markup annotations described after
 > >    signalled should be removed (signal-name, signal-name-end etc).
 > 
 > Why? do those annotations belong to those you propose to remove?

Yes

 > > I suggest removing annotate.texinfo from the repository as it largely
 > > covers the material in gdb.texinfo plus the markup annotations.
 > 
 > ??? AFAIK, gdb.texinfo only covers level-3 annotations.  The rest are
 > in annotate.texinfo.

Thats right.  They're the ones that I'm proposing that we remove now.  If that
patch is approved, I'll check the documentation more carefully to ensure that
we're not losing anything.

Nick

Re: [PATCH] Removal of markup annotations

[Bob Rossi]

On Thu, Jun 16, 2005 at 12:00:28PM +1200, Nick Roberts wrote:
>  > >  > Out of all of the annotations that you are removing here, CGDB only
>  > >  > depends on annotate_breakpoints_headers, annotate_field,
>  > >  > annotate_breakpoints_table, annotate_record and
>  > >  > annotate_breakpoints_table_end.
>  > > 
>  > > These are undocumented annotations and just mark up the output.  Could
>  > > you parse it from the syntax instead?
>  > 
>  > These were documented when I wrote the CGDB annotation subsystem.
>  > Between now and then, someone changed the documentation.
>  > 
>  > This link may work to demonstrate the fact.
>  > http://web.archive.org/web/20030627071226/sources.redhat.com/gdb/current/onlinedocs/gdb_toc.html
> 
> OK but they still just mark up the output.

Well, it is not as easy for me to just parse the output without the
annotations. Since I am still going to use annotate=2 (we are not
depricating the whole thing, right?), then if you remove the breakpoints
markup I'll have to handle old GDB's that have the markup, and new GDB's
that don't.

This would be a serious pain.

>  > I could look into parsing the syntax, but I would prefered if these
>  > stayed. Is this not desirable for some reason?
> 
> They make the code in breakpoint.c harder to read.  It's a question of
> balancing the inconvenience of keeping them with that of removing them.

I really only need 3 annotations out of the ones you are removing.
breakpoint-table (to set a state that breakpoints are coming), field 5
(which we could rename to breakpoint-at), and breakpoint-table-end (to
set a state that the breakpoints are over.

To make things even easier, there could simply be a -breakpoint-begin,
and a -breakpoint-end annotation, and those two annotations could mark
up around the breakpoint. Would this clean up the code in breakpoint.c at
all?

Thanks,
Bob Rossi

Re: [PATCH] Removal of markup annotations

[Eli Zaretskii]

> From: Nick Roberts <nickrob@snap.net.nz>
> Date: Tue, 21 Jun 2005 09:49:06 +1200
> Cc: gdb-patches@sources.redhat.com
> 
>  > > In gdb.texinfo I suggest:
>  > > 
>  > > 1) Moving the node "Server Prefix" out of "Annotations" and into "Controlling
>  > >    GDB" betweed "History" and "Screen Size".
>  > 
>  > You are right that it should be moved out of "Annotations", but I'm
>  > not sure the place you suggest is the right one (it's not about
>  > controlling GDB).  I will try to find a better place.
> 
> Its related to "History" which also isn't about controlling GDB, so perhaps
> that node should also be moved

Maybe we simply should describe the "server CMD" feature in the
"History" node, instead of having it in a separate node.

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > Well, it is not as easy for me to just parse the output without the
 > annotations. Since I am still going to use annotate=2 (we are not
 > depricating the whole thing, right?), then if you remove the breakpoints
 > markup I'll have to handle old GDB's that have the markup, and new GDB's
 > that don't.
 > 
 > This would be a serious pain.

Its not that hard to do.  You have to filter the annotations in any case.
Emacs in CVS works with --annotate=2 or --annotate=3.  Lisp is ideally suited
to this kind of thing, but I think it should be quite straightforward in C
too.  An association list stores a list of keys (the annotations) with an
associated value (a function to call).  There are no keys for the markup
annotations so it just ignores them.

 > I really only need 3 annotations out of the ones you are removing.
 > breakpoint-table (to set a state that breakpoints are coming), field 5
 > (which we could rename to breakpoint-at), and breakpoint-table-end (to
 > set a state that the breakpoints are over.
 > 
 > To make things even easier, there could simply be a -breakpoint-begin,
 > and a -breakpoint-end annotation, and those two annotations could mark
 > up around the breakpoint. Would this clean up the code in breakpoint.c at
 > all?

I don't think we should introduce new annotations.  Until now I've never
really looked at breakpoint.c.  I've just submitted this patch to make it less
likely that they all get removed when I'm not following the mailing list.

If no-one else is interested in their removal, I will just submit another
much smaller patch that removes the breakpoints-invalid and frames-invalid
from level 3, which AFAIK only Emacs uses.

Nick

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > > Its related to "History" which also isn't about controlling GDB, so perhaps
 > > that node should also be moved
 > 
 > Maybe we simply should describe the "server CMD" feature in the
 > "History" node, instead of having it in a separate node.

That seems sensible.  I can see now that "History" is in "Controlling GDB"
because it describes the setting of parameters.  However, I think the
"Commands" section might be a better place. I think "History" should also be
called "Command History" to differentiate it from "Values History".

Nick

Re: [PATCH] Removal of markup annotations

[Bob Rossi]

On Tue, Jun 21, 2005 at 05:38:28PM +1200, Nick Roberts wrote:
>  > Well, it is not as easy for me to just parse the output without the
>  > annotations. Since I am still going to use annotate=2 (we are not
>  > depricating the whole thing, right?), then if you remove the breakpoints
>  > markup I'll have to handle old GDB's that have the markup, and new GDB's
>  > that don't.
>  > 
>  > This would be a serious pain.
> 
> Its not that hard to do.  You have to filter the annotations in any case.
> Emacs in CVS works with --annotate=2 or --annotate=3.  Lisp is ideally suited
> to this kind of thing, but I think it should be quite straightforward in C
> too.  An association list stores a list of keys (the annotations) with an
> associated value (a function to call).  There are no keys for the markup
> annotations so it just ignores them.

OK, I'm extremly busy, but I'll look at this some more. Please give me a
little time before the breakpoint annotations go, if they go at all.

>  > I really only need 3 annotations out of the ones you are removing.
>  > breakpoint-table (to set a state that breakpoints are coming), field 5
>  > (which we could rename to breakpoint-at), and breakpoint-table-end (to
>  > set a state that the breakpoints are over.
>  > 
>  > To make things even easier, there could simply be a -breakpoint-begin,
>  > and a -breakpoint-end annotation, and those two annotations could mark
>  > up around the breakpoint. Would this clean up the code in breakpoint.c at
>  > all?
> 
> I don't think we should introduce new annotations.  Until now I've never
> really looked at breakpoint.c.  I've just submitted this patch to make it less
> likely that they all get removed when I'm not following the mailing list.
> 
> If no-one else is interested in their removal, I will just submit another
> much smaller patch that removes the breakpoints-invalid and frames-invalid
> from level 3, which AFAIK only Emacs uses.

Wait, don't get me wrong. I support the patch, it was just those few
(breakpoint markup) annotations that will mess me up. The other 20 or so 
are good to go as far as I'm concerned. In fact, they are buggy, and are
not reliable. I submitted bug reports 2 years ago and Andrew  told me
that they would not be fixed.

Bob Rossi

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > > That seems sensible.  I can see now that "History" is in "Controlling GDB"
 > > because it describes the setting of parameters.  However, I think the
 > > "Commands" section might be a better place.
 > 
 > No, I think "Controlling GDB" is the right place, since
 > history-related features are really about controlling the debugger.
 > By contrast, "Commands" is a name that doesn't convey any real
 > information about what's in it and what's not, since almost everything
 > is a command in GDB.

"Controlling GDB" is a bit of a hotchpotch and seems to describe the setting
of parameters for which no other suitable place could be found.  "Commands"
describes the general properties of commands without reference to any
particular one.  That is why I think "Command history" and, indeed, "Command
editing" would fit there.  But its your choice.

Nick


2005-06-22  Nick Roberts  <nickrob@snap.net.nz>

	* gdb.texinfo (History) Rename "Command History".
	(Command History): Move node "Server Prefix" from section on
	Annotations here.


*** gdb.texinfo	19 Jun 2005 15:00:52 +1200	1.270
--- gdb.texinfo	22 Jun 2005 11:42:10 +1200	
***************
*** 1188,1194 ****
  
  @item
  Reads the command history recorded in the @dfn{history file}.
! @xref{History}, for more details about the command history and the
  files where @value{GDBN} records it.
  @end enumerate
  
--- 1188,1194 ----
  
  @item
  Reads the command history recorded in the @dfn{history file}.
! @xref{Command History}, for more details about the command history and the
  files where @value{GDBN} records it.
  @end enumerate
  
***************
*** 15023,15029 ****
  @menu
  * Prompt::                      Prompt
  * Editing::                     Command editing
! * History::                     Command history
  * Screen Size::                 Screen size
  * Numbers::                     Numbers
  * ABI::                         Configuring the current ABI
--- 15023,15029 ----
  @menu
  * Prompt::                      Prompt
  * Editing::                     Command editing
! * Command History::             Command history
  * Screen Size::                 Screen size
  * Numbers::                     Numbers
  * ABI::                         Configuring the current ABI
***************
*** 15091,15097 ****
  interface.  Users unfamiliar with @sc{gnu} Emacs or @code{vi} are
  encouraged to read that chapter.
  
! @node History
  @section Command history
  @cindex command history
  
--- 15091,15097 ----
  interface.  Users unfamiliar with @sc{gnu} Emacs or @code{vi} are
  encouraged to read that chapter.
  
! @node Command History
  @section Command history
  @cindex command history
  
***************
*** 15104,15109 ****
--- 15104,15119 ----
  package, to provide the history facility.  @xref{Using History
  Interactively}, for the detailed description of the History library.
  
+ To issue a command to @value{GDBN} without affecting certain aspects of
+ the state which is seen by users, prefix it with @samp{server }.  This
+ means that this command will not affect the command history, nor will it
+ affect @value{GDBN}'s notion of which command to repeat if @key{RET} is
+ pressed on a line by itself.
+ 
+ The server prefix does not affect the recording of values into the value
+ history; to print a value without recording it into the value history,
+ use the @code{output} command instead of the @code{print} command.
+ 
  Here is the description of @value{GDBN} commands related to command
  history.
  
***************
*** 20604,20610 ****
  
  @menu
  * Annotations Overview::  What annotations are; the general syntax.
- * Server Prefix::       Issuing a command without affecting user state.
  * Prompting::           Annotations marking @value{GDBN}'s need for input.
  * Errors::              Annotations for error messages.
  * Invalidation::        Some annotations describe things now invalid.
--- 20614,20619 ----
***************
*** 20683,20702 ****
  denotes a @samp{control-z} character) are annotations; the rest is
  output from @value{GDBN}.
  
- @node Server Prefix
- @section The Server Prefix
- @cindex server prefix for annotations
- 
- To issue a command to @value{GDBN} without affecting certain aspects of
- the state which is seen by users, prefix it with @samp{server }.  This
- means that this command will not affect the command history, nor will it
- affect @value{GDBN}'s notion of which command to repeat if @key{RET} is
- pressed on a line by itself.
- 
- The server prefix does not affect the recording of values into the value
- history; to print a value without recording it into the value history,
- use the @code{output} command instead of the @code{print} command.
- 
  @node Prompting
  @section Annotation for @value{GDBN} Input
  
--- 20692,20697 ----

Re: [PATCH] Removal of markup annotations

[Eli Zaretskii]

> From: Nick Roberts <nickrob@snap.net.nz>
> Date: Wed, 22 Jun 2005 11:48:41 +1200
> Cc: gdb-patches@sources.redhat.com
> 
> 2005-06-22  Nick Roberts  <nickrob@snap.net.nz>
> 
> 	* gdb.texinfo (History) Rename "Command History".
> 	(Command History): Move node "Server Prefix" from section on
> 	Annotations here.

Fine with me, but please add indexing, so that this information could
be found quickly and efficiently.  At the very least, "@cindex
@code{server}, command prefix" should be there, and possibly also
something else, like perhaps "@cindex hide commands from history" or
some such (think about a user who'd wish to find the description of
the feature without knowing its exact name).

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > > 2005-06-22  Nick Roberts  <nickrob@snap.net.nz>
 > > 
 > > 	* gdb.texinfo (History) Rename "Command History".
 > > 	(Command History): Move node "Server Prefix" from section on
 > > 	Annotations here.
 > 
 > Fine with me, but please add indexing, so that this information could
 > be found quickly and efficiently.  At the very least, "@cindex
 > @code{server}, command prefix" should be there, and possibly also
 > something else, like perhaps "@cindex hide commands from history" or
 > some such (think about a user who'd wish to find the description of
 > the feature without knowing its exact name).

OK. Comitted.

I see that "Value History" and the output command are similarly disconnected
in the manual.  I have not added a link as I did not want to risk censure.

Nick

Re: [PATCH] Removal of markup annotations

[Daniel Jacobowitz]

On Wed, Jun 15, 2005 at 03:16:03PM +1200, Nick Roberts wrote:
> 
> 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.

Is there "pressure"?  I don't see the point in snipping out bits of
-annotate=2 until we're ready to remove it entirely, which I would like
to do but I accept that we are not yet ready for.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > > This patch cleans up the code quite considerably and hopefully will relieve
 > > some of the pressure to remove the remaining annotations.
 > 
 > Is there "pressure"?  I don't see the point in snipping out bits of
 > -annotate=2 until we're ready to remove it entirely, which I would like
 > to do but I accept that we are not yet ready for.

Its hard for me to tell if the pressure is real or imagined.  There _was_
pressure two years ago (around Jan 2002) but the people involved aren't
currently active on the mailing list.  The idea behind level 3 annotations
_was_ to allow snipping out a (large) bit of the sprinkled code for
annotations.  Its not a problem for me.  If its not a problem for anyone else,
then it might as well stay (although that does beg the question as to why
it needs to be removed at all).

Nick

Re: [PATCH] Removal of markup annotations

[Daniel Jacobowitz]

On Mon, Jul 04, 2005 at 10:01:35AM +1200, Nick Roberts wrote:
>  > > This patch cleans up the code quite considerably and hopefully will relieve
>  > > some of the pressure to remove the remaining annotations.
>  > 
>  > Is there "pressure"?  I don't see the point in snipping out bits of
>  > -annotate=2 until we're ready to remove it entirely, which I would like
>  > to do but I accept that we are not yet ready for.
> 
> Its hard for me to tell if the pressure is real or imagined.  There _was_
> pressure two years ago (around Jan 2002) but the people involved aren't
> currently active on the mailing list.  The idea behind level 3 annotations
> _was_ to allow snipping out a (large) bit of the sprinkled code for
> annotations.  Its not a problem for me.  If its not a problem for anyone else,
> then it might as well stay (although that does beg the question as to why
> it needs to be removed at all).

Eventually, we'll make changes to GDB that will make it hard to
preserve the structure of annotations.  We've probably made several
already - an example is the interps.c change that you're talking about
fixing in another thread.  The nature of annotations makes it hard to
preserve their reliability.

I just want to approach it from the other side.  When MI is ready, or
we've got a patch that is otherwise good but hoses some annotations,
then let's start deleting them.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

[PATCH] Removal of markup annotations

[Nick Roberts]

Nick Roberts (Wed, 15 Jun 2005 15:16:03 +1200) writes:
 > 
 > 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)...  

Since no-one seems that interested, I would like to submit this much smaller
patch that just removes the breakpoints-invalid and frames-invalid from level
3, which AFAIK only Emacs uses.

Nick


2005-09-28  Nick Roberts  <nickrob@snap.net.nz>

	* annotate.c (breakpoints_changed, annotate_frames_invalid)
	(_initialize_annotate): Print breakpoints-invalid and
	frames-invalid for level 2 annotations only.


*** annotate.c	15 Feb 2005 03:37:37 +1300	1.9
--- annotate.c	28 Sep 2005 12:06:16 +1200	
***************
*** 55,61 ****
  void
  breakpoints_changed (void)
  {
!   if (annotation_level > 1)
      {
        target_terminal_ours ();
        printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
--- 55,61 ----
  void
  breakpoints_changed (void)
  {
!   if (annotation_level == 2)
      {
        target_terminal_ours ();
        printf_unfiltered (("\n\032\032breakpoints-invalid\n"));
***************
*** 228,234 ****
  void
  annotate_frames_invalid (void)
  {
!   if (annotation_level > 1)
      {
        target_terminal_ours ();
        printf_unfiltered (("\n\032\032frames-invalid\n"));
--- 228,234 ----
  void
  annotate_frames_invalid (void)
  {
!   if (annotation_level == 2)
      {
        target_terminal_ours ();
        printf_unfiltered (("\n\032\032frames-invalid\n"));
***************
*** 577,583 ****
  void
  _initialize_annotate (void)
  {
!   if (annotation_level > 1)
      {
        deprecated_delete_breakpoint_hook = breakpoint_changed;
        deprecated_modify_breakpoint_hook = breakpoint_changed;
--- 577,583 ----
  void
  _initialize_annotate (void)
  {
!   if (annotation_level == 2)
      {
        deprecated_delete_breakpoint_hook = breakpoint_changed;
        deprecated_modify_breakpoint_hook = breakpoint_changed;

Re: [PATCH] Removal of markup annotations

[Bob Rossi]

On Wed, Sep 28, 2005 at 12:16:44PM +1200, Nick Roberts wrote:
> Nick Roberts (Wed, 15 Jun 2005 15:16:03 +1200) writes:
>  > 
>  > 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)...  
> 
> Since no-one seems that interested, I would like to submit this much smaller
> patch that just removes the breakpoints-invalid and frames-invalid from level
> 3, which AFAIK only Emacs uses.

Nick, I would support removing those markups from the annotate 2 level
also or simply removing them completly. They are unreliable.

Bob Rossi

Re: [PATCH] Removal of markup annotations

[Daniel Jacobowitz]

On Wed, Sep 28, 2005 at 12:16:44PM +1200, Nick Roberts wrote:
> Nick Roberts (Wed, 15 Jun 2005 15:16:03 +1200) writes:
>  > 
>  > 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)...  
> 
> Since no-one seems that interested, I would like to submit this much smaller
> patch that just removes the breakpoints-invalid and frames-invalid from level
> 3, which AFAIK only Emacs uses.
> 
> Nick
> 
> 
> 2005-09-28  Nick Roberts  <nickrob@snap.net.nz>
> 
> 	* annotate.c (breakpoints_changed, annotate_frames_invalid)
> 	(_initialize_annotate): Print breakpoints-invalid and
> 	frames-invalid for level 2 annotations only.

I'm indifferent on removing them entirely, but I support removing them
from level three.  However other programs have definitely started to
use level 3 - e.g. google found clewn.sf.net/clewn.txt.html.  Actually
that was the only one I could easily turn up.  Want to double-check
that it doesn't use these?

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 DJ> I'm indifferent on removing them entirely, but I support removing them
 DJ> from level three.  However other programs have definitely started to
 DJ> use level 3 - e.g. google found clewn.sf.net/clewn.txt.html.  Actually
 DJ> that was the only one I could easily turn up.  Want to double-check
 DJ> that it doesn't use these?

Level 3 was intended as a transition to GDB/MI.  clewn started as VimGDB
and I pointed out to Andrew Cagney that they were using annotations back
then.

http://article.gmane.org/gmane.editors.vim.devel/6069 shows some of that
dialogue:

> Date: 2004-03-29 12:59:10 GMT (1 year, 26 weeks, 11 hours and 26 minutes ago)

> The last patch #6 (soon on Mikolaj web site) supports GDB/MI and
> annotations level 3. It also provides hooks for a future
> implementation based on an interface with only GDB/MI.

> On Tue, 10 Feb 2004 5:32:52 PM EST, Andrew Cagney wrote:

> > It's been pointed out to me that VIM is using GDB's deprecated, never
> > documented, never tested, annotation level 2 interface.  In a word, 
> > argh!
> > 
> > GDB developers are strongly encouraged to migrate their application to MI
> > (which is documented and is tested).

They also seem not to understand that level 3 annotations are just a subset
of level 2 and think that they are necessary to access GDB/MI.

> Clewn may run in two different modes called level 2 and level 3. Level 2 uses
> GDB annotations level 2. Level 3 uses GDB/MI and annotations level 3. The
> behaviour of |clewn-variables| is different, depending on the mode setting.
> When starting, Clewn automatically selects the appropriate mode.

They could just use level 2 and I don't think they can reasonably complain if
we remove two dysfunctional annotations from level 3.

Nick

Re: [PATCH] Removal of markup annotations

[Daniel Jacobowitz]

On Wed, Sep 28, 2005 at 06:42:12PM +1200, Nick Roberts wrote:
> > > It's been pointed out to me that VIM is using GDB's deprecated, never
> > > documented, never tested, annotation level 2 interface.  In a word, 
> > > argh!
> > > 
> > > GDB developers are strongly encouraged to migrate their application to MI
> > > (which is documented and is tested).
> 
> They also seem not to understand that level 3 annotations are just a subset
> of level 2 and think that they are necessary to access GDB/MI.

I buy it.  The patch is OK.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [PATCH] Removal of markup annotations

[Nick Roberts]

 > I buy it.  The patch is OK.

Trying not to break the testsuite this time, here's a patch for
gdb.base/annota3.exp and gdb.cp/annota3.exp to go with it.

Nick


2005-09-29  Nick Roberts  <nickrob@snap.net.nz>

	* gdb.base/annota3.exp, gdb.cp/annota3.exp: The annotations
	frames-invalid and breakpoints-invalid are no longer generated
	with level 3 so don't expect them in the output.


*** gdb.base/annota3.exp.~1.5.~	2004-07-20 12:24:41.000000000 +1200
--- gdb.base/annota3.exp	2005-09-29 09:26:00.000000000 +1200
***************
*** 118,126 ****
  gdb_expect_list "run until main breakpoint" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
      "Starting program: .*annota3 \r\n"
-     "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
      "\r\n\032\032starting\r\n"
-     "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
      "\r\n\032\032breakpoint 1\r\n"
      "\r\n"
      "Breakpoint 1, main \\(\\) at .*annota3.c:32\r\n"
--- 118,124 ----
***************
*** 139,145 ****
  gdb_expect_list "go after array init line" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
      "\r\n\032\032starting\r\n"
-     "\(\r\n\032\032frames-invalid\r\n\)+"
      "\r\n\032\032source .*annota3.c:\[0-9\]+:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
      "\r\n\032\032stopped\r\n"
  }
--- 137,142 ----
***************
*** 177,183 ****
  send_gdb "break handle_USR1\n"
  gdb_expect_list "breakpoint handle_USR1" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
-     "\r\n\032\032breakpoints-invalid\r\n"
      "Breakpoint.*at 0x\[0-9a-z\]+: file.*annota3.c, line.*\r\n"
  }
  
--- 174,179 ----
***************
*** 187,193 ****
  send_gdb "break printf\n"
  gdb_expect_list "breakpoint printf" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
-     "\r\n\032\032breakpoints-invalid\r\n"
      "Breakpoint.*at 0x\[0-9a-z\]+.*"
  }
  
--- 183,188 ----
***************
*** 199,205 ****
      "\r\n\032\032post-prompt\r\n"
      "Continuing.\r\n"
      "\r\n\032\032starting\r\n"
-     "\r\n\032\032frames-invalid\r\n"
      "\r\n\032\032breakpoint 3\r\n"
      "\r\n"
      "Breakpoint 3, \[^\r\n\]*\r\n"
--- 194,199 ----
***************
*** 227,233 ****
  	"\r\n\032\032post-prompt\r\n"
  	"Continuing with signal SIGUSR1.\r\n"
  	"\r\n\032\032starting\r\n"
- 	"\r\n\032\032frames-invalid\r\n"
  	"\r\n\032\032breakpoint 2\r\n"
  	"Breakpoint 2, handle_USR1 \\(sig=\[0-9\]+\\) at .*annota3.c:\[0-9\]+\r\n"
  	"\r\n\032\032source .*annota3.c:\[0-9\]+:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
--- 221,226 ----
***************
*** 277,283 ****
  send_gdb "break main\n"
  gdb_expect_list "break at 28" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
-     "\r\n\032\032breakpoints-invalid\r\n"
      "Breakpoint 4 at 0x\[0-9a-z\]+: file .*annota3.c, line 32.\r\n"
  }
  
--- 270,275 ----
***************
*** 312,322 ****
  #
  # Test that breakpoints-invalid is issued once and only once for
  # breakpoint ignore count changes, after annotation stopped.
! #
  send_gdb "break 46\n"
  gdb_expect_list  "break at 46" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
-     "\r\n\032\032breakpoints-invalid\r\n"
      "Breakpoint 5 at 0x\[0-9a-z\]+: file .*annota3.c, line 46.\r\n"
  }
  
--- 304,315 ----
  #
  # Test that breakpoints-invalid is issued once and only once for
  # breakpoint ignore count changes, after annotation stopped.
! # NOTE: breakpoints-invalid annotations have been removed from
! # level 3 but keep these tests for continuity and comparison
! # with annota1.exp.
  send_gdb "break 46\n"
  gdb_expect_list  "break at 46" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
      "Breakpoint 5 at 0x\[0-9a-z\]+: file .*annota3.c, line 46.\r\n"
  }
  
***************
*** 324,343 ****
  gdb_expect_list "ignore 5 4" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
      "Will ignore next 4 crossings of breakpoint 5"
-     "\r\n\032\032breakpoints-invalid\r\n"
      "\r\n"
  }
  
  send_gdb "continue\n"
  gdb_expect_list "annotate ignore count change" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
-     "\(\r\n\032\032frames-invalid\r\n\)+"
      "\r\n\032\032breakpoint 5\r\n"
      "Breakpoint 5, main \\(\\) at .*annota3.c:46\r\n"
      "\r\n\032\032source .*annota3.c:46:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
      "1: value = 11\r\n"
      "\r\n\032\032stopped\r\n"
-     "\r\n\032\032breakpoints-invalid\r\n"
  }
  
  # check that ignore command is working, or the above can provide
--- 317,333 ----
***************
*** 347,353 ****
  gdb_expect_list "next to exit loop" "$gdb_prompt$"  {
      "\r\n\032\032post-prompt\r\n"
      "\r\n\032\032starting\r\n"
-     "\(\r\n\032\032frames-invalid\r\n\)+"
      "\r\n\032\032source.*annota3.c:\[0-9\]+:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
      "1: value = 12\r\n"
      "\r\n\032\032stopped\r\n"
--- 337,342 ----
***************
*** 357,363 ****
  gdb_expect_list "breakpoint ignore count" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
      "\r\n\032\032starting\r\n"
-     "\(\r\n\032\032frames-invalid\r\n\)+"
      "\r\n\032\032source.*annota3.c:49:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
      "1: value = 12\r\n"
      "\r\n\032\032stopped\r\n"
--- 346,351 ----
***************
*** 384,391 ****
  	"\r\n\032\032post-prompt\r\n"
  	"Continuing with signal SIGTRAP.\r\n"
  	"\r\n\032\032starting\r\n"
- 	"\r\n\032\032frames-invalid\r\n"
- 	"\r\n\032\032frames-invalid\r\n"
  	"\r\n\032\032signalled\r\n"
  	"\r\nProgram terminated with signal SIGTRAP, Trace.breakpoint trap.\r\n"
  	"The program no longer exists.\r\n"
--- 372,377 ----


*** gdb.cp/annota3.exp.~1.3.~	2004-02-12 03:01:25.000000000 +1300
--- gdb.cp/annota3.exp	2005-09-29 10:32:07.000000000 +1200
***************
*** 93,101 ****
  gdb_expect_list "first run until main breakpoint" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
      "Starting program: .*annota3 \r\n"
-     "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
      "\r\n\032\032starting\r\n"
-     "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
      "\r\n\032\032breakpoint 1\r\n"
      "\r\n"
      "Breakpoint 1, main \\(\\) at .*annota3.cc:25\r\n"
--- 93,99 ----
***************
*** 122,134 ****
      "\r\n\032\032post-prompt\r\n"
      "Continuing.\r\n"
      "\r\n\032\032starting\r\n"
-     "\r\n\032\032frames-invalid\r\n"
      "a.x is 1\r\n"
-     "\r\n\032\032frames-invalid\r\n"
      "\r\n\032\032exited 0\r\n"
      "\r\n"
      "Program exited normally.\r\n"
-     "\r\n\032\032frames-invalid\r\n"
      "\r\n\032\032stopped\r\n"
  }
  
--- 120,129 ----
***************
*** 155,161 ****
  send_gdb "break 22\n"
  gdb_expect_list "break at main" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
-     "\r\n\032\032breakpoints-invalid\r\n"
      "Breakpoint.*at 0x\[a-z0-9\]+: file.*annota3.cc, line 22.\r\n"
  }
  
--- 150,155 ----
***************
*** 167,175 ****
  send_gdb "run\n"
  gdb_expect_list "second run until main breakpoint" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
-     "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
      "\r\n\032\032starting\r\n"
-     "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+"
      "\r\n\032\032breakpoint 2\r\n"
      "\r\n"
      "Breakpoint 2, main \\(\\) at .*annota3.cc:22\r\n"
--- 161,167 ----
***************
*** 183,189 ****
  send_gdb "watch a.x\n"
  gdb_expect_list "set watch on a.x" "$gdb_prompt$" {
      "\r\n\032\032post-prompt\r\n"
-     "\r\n\032\032breakpoints-invalid\r\n"
      ".*atchpoint 3: a.x\r\n" \
  }
  
--- 175,180 ----
***************
*** 193,202 ****
  #
  send_gdb "next\n"
  gdb_expect {
!     -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\(\r\n\032\032frames-invalid\r\n\)+\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\nmain \\(\\) at .*$srcfile:$decimal\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" { 
  	pass "watch triggered on a.x"
      }
!     -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n$gdb_prompt$" {
  	kfail "gdb/38" "watch triggered on a.x"
      }
      -re ".*$gdb_prompt$" {
--- 184,193 ----
  #
  send_gdb "next\n"
  gdb_expect {
!     -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\nmain \\(\\) at .*$srcfile:$decimal\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" { 
  	pass "watch triggered on a.x"
      }
!     -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n$gdb_prompt$" {
  	kfail "gdb/38" "watch triggered on a.x"
      }
      -re ".*$gdb_prompt$" {

Re: [PATCH] Removal of markup annotations

[Daniel Jacobowitz]

On Thu, Sep 29, 2005 at 10:51:17AM +1200, Nick Roberts wrote:
>  > I buy it.  The patch is OK.
> 
> Trying not to break the testsuite this time, here's a patch for
> gdb.base/annota3.exp and gdb.cp/annota3.exp to go with it.

Oops, yeah, that would be nice.  This is OK too.

-- 
Daniel Jacobowitz
CodeSourcery, LLC