This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[ob/commit] tracepoint.[ch] whitespace tweaks


2005-01-13  Michael Snyder  <msnyder@redhat.com>

	* tracepoint.[ch]: Whitespace tweaks.

Index: tracepoint.c
===================================================================
RCS file: /cvs/src/src/gdb/tracepoint.c,v
retrieving revision 1.66
diff -p -r1.66 tracepoint.c
*** tracepoint.c	12 Nov 2004 21:45:07 -0000	1.66
--- tracepoint.c	14 Jan 2005 03:57:28 -0000
***************
*** 54,61 ****
  #include <unistd.h>
  #endif
  
! /* maximum length of an agent aexpression.
!    this accounts for the fact that packets are limited to 400 bytes
     (which includes everything -- including the checksum), and assumes
     the worst case of maximum length for each of the pieces of a
     continuation packet.
--- 54,61 ----
  #include <unistd.h>
  #endif
  
! /* Maximum length of an agent aexpression.
!    This accounts for the fact that packets are limited to 400 bytes
     (which includes everything -- including the checksum), and assumes
     the worst case of maximum length for each of the pieces of a
     continuation packet.
*************** trace_error (char *buf)
*** 191,202 ****
      }
  }
  
! /* Utility: wait for reply from stub, while accepting "O" packets */
  static char *
  remote_get_noisy_reply (char *buf,
  			long sizeof_buf)
  {
!   do				/* loop on reply from remote stub */
      {
        QUIT;			/* allow user to bail out with ^C */
        getpkt (buf, sizeof_buf, 0);
--- 191,202 ----
      }
  }
  
! /* Utility: wait for reply from stub, while accepting "O" packets.  */
  static char *
  remote_get_noisy_reply (char *buf,
  			long sizeof_buf)
  {
!   do				/* Loop on reply from remote stub.  */
      {
        QUIT;			/* allow user to bail out with ^C */
        getpkt (buf, sizeof_buf, 0);
*************** set_tracepoint_num (int num)
*** 237,243 ****
  {
    tracepoint_number = num;
    set_internalvar (lookup_internalvar ("tracepoint"),
! 		   value_from_longest (builtin_type_int, (LONGEST) num));
  }
  
  /* Set externally visible debug variables for querying/printing
--- 237,244 ----
  {
    tracepoint_number = num;
    set_internalvar (lookup_internalvar ("tracepoint"),
! 		   value_from_longest (builtin_type_int, 
! 				       (LONGEST) num));
  }
  
  /* Set externally visible debug variables for querying/printing
*************** set_traceframe_context (CORE_ADDR trace_
*** 256,262 ****
    if (charstar == (struct type *) NULL)
      charstar = lookup_pointer_type (builtin_type_char);
  
!   if (trace_pc == -1)		/* cease debugging any trace buffers */
      {
        traceframe_fun = 0;
        traceframe_sal.pc = traceframe_sal.line = 0;
--- 257,263 ----
    if (charstar == (struct type *) NULL)
      charstar = lookup_pointer_type (builtin_type_char);
  
!   if (trace_pc == -1)		/* Cease debugging any trace buffers.  */
      {
        traceframe_fun = 0;
        traceframe_sal.pc = traceframe_sal.line = 0;
*************** set_traceframe_context (CORE_ADDR trace_
*** 266,285 ****
        set_internalvar (lookup_internalvar ("trace_file"),
  		       value_from_pointer (charstar, (LONGEST) 0));
        set_internalvar (lookup_internalvar ("trace_line"),
! 		       value_from_longest (builtin_type_int, (LONGEST) - 1));
        return;
      }
  
!   /* save as globals for internal use */
    traceframe_sal = find_pc_line (trace_pc, 0);
    traceframe_fun = find_pc_function (trace_pc);
  
!   /* save linenumber as "$trace_line", a debugger variable visible to users */
    set_internalvar (lookup_internalvar ("trace_line"),
  		   value_from_longest (builtin_type_int,
  				       (LONGEST) traceframe_sal.line));
  
!   /* save func name as "$trace_func", a debugger variable visible to users */
    if (traceframe_fun == NULL ||
        DEPRECATED_SYMBOL_NAME (traceframe_fun) == NULL)
      set_internalvar (lookup_internalvar ("trace_func"),
--- 267,289 ----
        set_internalvar (lookup_internalvar ("trace_file"),
  		       value_from_pointer (charstar, (LONGEST) 0));
        set_internalvar (lookup_internalvar ("trace_line"),
! 		       value_from_longest (builtin_type_int, 
! 					   (LONGEST) - 1));
        return;
      }
  
!   /* Save as globals for internal use.  */
    traceframe_sal = find_pc_line (trace_pc, 0);
    traceframe_fun = find_pc_function (trace_pc);
  
!   /* Save linenumber as "$trace_line", a debugger variable visible to
!      users.  */
    set_internalvar (lookup_internalvar ("trace_line"),
  		   value_from_longest (builtin_type_int,
  				       (LONGEST) traceframe_sal.line));
  
!   /* Save func name as "$trace_func", a debugger variable visible to
!      users.  */
    if (traceframe_fun == NULL ||
        DEPRECATED_SYMBOL_NAME (traceframe_fun) == NULL)
      set_internalvar (lookup_internalvar ("trace_func"),
*************** set_traceframe_context (CORE_ADDR trace_
*** 300,306 ****
        set_internalvar (lookup_internalvar ("trace_func"), func_val);
      }
  
!   /* save file name as "$trace_file", a debugger variable visible to users */
    if (traceframe_sal.symtab == NULL ||
        traceframe_sal.symtab->filename == NULL)
      set_internalvar (lookup_internalvar ("trace_file"),
--- 304,311 ----
        set_internalvar (lookup_internalvar ("trace_func"), func_val);
      }
  
!   /* Save file name as "$trace_file", a debugger variable visible to
!      users.  */
    if (traceframe_sal.symtab == NULL ||
        traceframe_sal.symtab->filename == NULL)
      set_internalvar (lookup_internalvar ("trace_file"),
*************** set_traceframe_context (CORE_ADDR trace_
*** 328,335 ****
     Does not print anything.
  
     ==> This routine should not be called if there is a chance of later
!    error(); otherwise it leaves a bogus tracepoint on the chain.  Validate
!    your arguments BEFORE calling this routine!  */
  
  static struct tracepoint *
  set_raw_tracepoint (struct symtab_and_line sal)
--- 333,340 ----
     Does not print anything.
  
     ==> This routine should not be called if there is a chance of later
!    error(); otherwise it leaves a bogus tracepoint on the chain.
!    Validate your arguments BEFORE calling this routine!  */
  
  static struct tracepoint *
  set_raw_tracepoint (struct symtab_and_line sal)
*************** set_raw_tracepoint (struct symtab_and_li
*** 374,380 ****
    return t;
  }
  
! /* Set a tracepoint according to ARG (function, linenum or *address) */
  static void
  trace_command (char *arg, int from_tty)
  {
--- 379,385 ----
    return t;
  }
  
! /* Set a tracepoint according to ARG (function, linenum or *address).  */
  static void
  trace_command (char *arg, int from_tty)
  {
*************** trace_command (char *arg, int from_tty)
*** 392,401 ****
      printf_filtered ("TRACE %s\n", arg);
  
    addr_start = arg;
!   sals = decode_line_1 (&arg, 1, (struct symtab *) NULL, 0, &canonical, NULL);
    addr_end = arg;
    if (!sals.nelts)
!     return;			/* ??? Presumably decode_line_1 has already warned? */
  
    /* Resolve all line numbers to PC's */
    for (i = 0; i < sals.nelts; i++)
--- 397,407 ----
      printf_filtered ("TRACE %s\n", arg);
  
    addr_start = arg;
!   sals = decode_line_1 (&arg, 1, (struct symtab *) NULL, 
! 			0, &canonical, NULL);
    addr_end = arg;
    if (!sals.nelts)
!     return;	/* ??? Presumably decode_line_1 has already warned?  */
  
    /* Resolve all line numbers to PC's */
    for (i = 0; i < sals.nelts; i++)
*************** trace_command (char *arg, int from_tty)
*** 427,433 ****
      }
  }
  
! /* Tell the user we have just set a tracepoint TP. */
  
  static void
  trace_mention (struct tracepoint *tp)
--- 433,439 ----
      }
  }
  
! /* Tell the user we have just set a tracepoint TP.  */
  
  static void
  trace_mention (struct tracepoint *tp)
*************** trace_mention (struct tracepoint *tp)
*** 446,452 ****
    printf_filtered ("\n");
  }
  
! /* Print information on tracepoint number TPNUM_EXP, or all if omitted.  */
  
  static void
  tracepoints_info (char *tpnum_exp, int from_tty)
--- 452,459 ----
    printf_filtered ("\n");
  }
  
! /* Print information on tracepoint number TPNUM_EXP, or all if
!    omitted.  */
  
  static void
  tracepoints_info (char *tpnum_exp, int from_tty)
*************** tracepoints_info (char *tpnum_exp, int f
*** 464,470 ****
    ALL_TRACEPOINTS (t)
      if (tpnum == -1 || tpnum == t->number)
      {
!       extern int addressprint;	/* print machine addresses? */
  
        if (!found_a_tracepoint++)
  	{
--- 471,477 ----
    ALL_TRACEPOINTS (t)
      if (tpnum == -1 || tpnum == t->number)
      {
!       extern int addressprint;	/* Print machine addresses?  */
  
        if (!found_a_tracepoint++)
  	{
*************** tracepoints_info (char *tpnum_exp, int f
*** 538,547 ****
      }
  }
  
! /* Optimization: the code to parse an enable, disable, or delete TP command
!    is virtually identical except for whether it performs an enable, disable,
!    or delete.  Therefore I've combined them into one function with an opcode.
!  */
  enum tracepoint_opcode
  {
    enable_op,
--- 545,554 ----
      }
  }
  
! /* Optimization: the code to parse an enable, disable, or delete TP
!    command is virtually identical except for whether it performs an
!    enable, disable, or delete.  Therefore I've combined them into one
!    function with an opcode.  */
  enum tracepoint_opcode
  {
    enable_op,
*************** enum tracepoint_opcode
*** 549,555 ****
    delete_op
  };
  
! /* This function implements enable, disable and delete commands. */
  static void
  tracepoint_operation (struct tracepoint *t, int from_tty,
  		      enum tracepoint_opcode opcode)
--- 556,562 ----
    delete_op
  };
  
! /* This function implements enable, disable and delete commands.  */
  static void
  tracepoint_operation (struct tracepoint *t, int from_tty,
  		      enum tracepoint_opcode opcode)
*************** get_tracepoint_by_number (char **arg, in
*** 617,623 ****
    if (tpnum <= 0)
      {
        if (instring && *instring)
! 	printf_filtered ("bad tracepoint number at or near '%s'\n", instring);
        else
  	printf_filtered ("Tracepoint argument missing and no previous tracepoint\n");
        return NULL;
--- 624,631 ----
    if (tpnum <= 0)
      {
        if (instring && *instring)
! 	printf_filtered ("bad tracepoint number at or near '%s'\n", 
! 			 instring);
        else
  	printf_filtered ("Tracepoint argument missing and no previous tracepoint\n");
        return NULL;
*************** get_tracepoint_by_number (char **arg, in
*** 636,642 ****
    return NULL;
  }
  
! /* Utility: parse a list of tracepoint numbers, and call a func for each. */
  static void
  map_args_over_tracepoints (char *args, int from_tty,
  			   enum tracepoint_opcode opcode)
--- 644,651 ----
    return NULL;
  }
  
! /* Utility: 
!    parse a list of tracepoint numbers, and call a func for each.  */
  static void
  map_args_over_tracepoints (char *args, int from_tty,
  			   enum tracepoint_opcode opcode)
*************** map_args_over_tracepoints (char *args, i
*** 649,655 ****
    else
      while (*args)
        {
! 	QUIT;			/* give user option to bail out with ^C */
  	t = get_tracepoint_by_number (&args, 1, 0);
  	tracepoint_operation (t, from_tty, opcode);
  	while (*args == ' ' || *args == '\t')
--- 658,664 ----
    else
      while (*args)
        {
! 	QUIT;		/* Give user option to bail out with ^C.  */
  	t = get_tracepoint_by_number (&args, 1, 0);
  	tracepoint_operation (t, from_tty, opcode);
  	while (*args == ' ' || *args == '\t')
*************** map_args_over_tracepoints (char *args, i
*** 657,663 ****
        }
  }
  
! /* The 'enable trace' command enables tracepoints.  Not supported by all targets.  */
  static void
  enable_trace_command (char *args, int from_tty)
  {
--- 666,673 ----
        }
  }
  
! /* The 'enable trace' command enables tracepoints.  
!    Not supported by all targets.  */
  static void
  enable_trace_command (char *args, int from_tty)
  {
*************** enable_trace_command (char *args, int fr
*** 665,671 ****
    map_args_over_tracepoints (args, from_tty, enable_op);
  }
  
! /* The 'disable trace' command enables tracepoints.  Not supported by all targets.  */
  static void
  disable_trace_command (char *args, int from_tty)
  {
--- 675,682 ----
    map_args_over_tracepoints (args, from_tty, enable_op);
  }
  
! /* The 'disable trace' command disables tracepoints.  
!    Not supported by all targets.  */
  static void
  disable_trace_command (char *args, int from_tty)
  {
*************** delete_trace_command (char *args, int fr
*** 679,686 ****
  {
    dont_repeat ();
    if (!args || !*args)		/* No args implies all tracepoints; */
!     if (from_tty)		/* confirm only if from_tty... */
!       if (tracepoint_chain)	/* and if there are tracepoints to delete! */
  	if (!query ("Delete all tracepoints? "))
  	  return;
  
--- 690,698 ----
  {
    dont_repeat ();
    if (!args || !*args)		/* No args implies all tracepoints; */
!     if (from_tty)		/* confirm only if from_tty...  */
!       if (tracepoint_chain)	/* and if there are tracepoints to
! 				   delete!  */
  	if (!query ("Delete all tracepoints? "))
  	  return;
  
*************** trace_pass_command (char *args, int from
*** 703,716 ****
    if (args == 0 || *args == 0)
      error ("passcount command requires an argument (count + optional TP num)");
  
!   count = strtoul (args, &args, 10);	/* count comes first, then TP num */
  
    while (*args && isspace ((int) *args))
      args++;
  
    if (*args && strncasecmp (args, "all", 3) == 0)
      {
!       args += 3;			/* skip special argument "all" */
        all = 1;
        if (*args)
  	error ("Junk at end of arguments.");
--- 715,728 ----
    if (args == 0 || *args == 0)
      error ("passcount command requires an argument (count + optional TP num)");
  
!   count = strtoul (args, &args, 10);	/* Count comes first, then TP num. */
  
    while (*args && isspace ((int) *args))
      args++;
  
    if (*args && strncasecmp (args, "all", 3) == 0)
      {
!       args += 3;			/* Skip special argument "all".  */
        all = 1;
        if (*args)
  	error ("Junk at end of arguments.");
*************** read_actions (struct tracepoint *t)
*** 830,837 ****
    old_chain = make_cleanup_free_actions (t);
    while (1)
      {
!       /* Make sure that all output has been output.  Some machines may let
!          you get away with leaving out some of the gdb_flush, but not all.  */
        wrap_here ("");
        gdb_flush (gdb_stdout);
        gdb_flush (gdb_stderr);
--- 842,850 ----
    old_chain = make_cleanup_free_actions (t);
    while (1)
      {
!       /* Make sure that all output has been output.  Some machines may
!          let you get away with leaving out some of the gdb_flush, but
!          not all.  */
        wrap_here ("");
        gdb_flush (gdb_stdout);
        gdb_flush (gdb_stderr);
*************** read_actions (struct tracepoint *t)
*** 883,890 ****
  	    {			/* end of actions */
  	      if (t->actions->next == NULL)
  		{
! 		  /* an "end" all by itself with no other actions means
! 		     this tracepoint has no actions.  Discard empty list. */
  		  free_actions (t);
  		}
  	      break;
--- 896,904 ----
  	    {			/* end of actions */
  	      if (t->actions->next == NULL)
  		{
! 		  /* An "end" all by itself with no other actions
! 		     means this tracepoint has no actions.
! 		     Discard empty list.  */
  		  free_actions (t);
  		}
  	      break;
*************** validate_actionline (char **line, struct
*** 915,922 ****
    for (p = *line; isspace ((int) *p);)
      p++;
  
!   /* symbol lookup etc. */
!   if (*p == '\0')		/* empty line: just prompt for another line. */
      return BADLINE;
  
    if (*p == '#')		/* comment line */
--- 929,936 ----
    for (p = *line; isspace ((int) *p);)
      p++;
  
!   /* Symbol lookup etc.  */
!   if (*p == '\0')	/* empty line: just prompt for another line.  */
      return BADLINE;
  
    if (*p == '#')		/* comment line */
*************** validate_actionline (char **line, struct
*** 925,931 ****
    c = lookup_cmd (&p, cmdlist, "", -1, 1);
    if (c == 0)
      {
!       warning ("'%s' is not an action that I know, or is ambiguous.", p);
        return BADLINE;
      }
  
--- 939,946 ----
    c = lookup_cmd (&p, cmdlist, "", -1, 1);
    if (c == 0)
      {
!       warning ("'%s' is not an action that I know, or is ambiguous.", 
! 	       p);
        return BADLINE;
      }
  
*************** validate_actionline (char **line, struct
*** 949,955 ****
  		  p = strchr (p, ',');
  		  continue;
  		}
! 	      /* else fall thru, treat p as an expression and parse it! */
  	    }
  	  exp = parse_exp_1 (&p, block_for_pc (t->address), 1);
  	  old_chain = make_cleanup (free_current_contents, &exp);
--- 964,970 ----
  		  p = strchr (p, ',');
  		  continue;
  		}
! 	      /* else fall thru, treat p as an expression and parse it!  */
  	    }
  	  exp = parse_exp_1 (&p, block_for_pc (t->address), 1);
  	  old_chain = make_cleanup (free_current_contents, &exp);
*************** validate_actionline (char **line, struct
*** 971,978 ****
  		}
  	    }
  
! 	  /* we have something to collect, make sure that the expr to
! 	     bytecode translator can handle it and that it's not too long */
  	  aexpr = gen_trace_for_expr (t->address, exp);
  	  make_cleanup_free_agent_expr (aexpr);
  
--- 986,994 ----
  		}
  	    }
  
! 	  /* We have something to collect, make sure that the expr to
! 	     bytecode translator can handle it and that it's not too
! 	     long.  */
  	  aexpr = gen_trace_for_expr (t->address, exp);
  	  make_cleanup_free_agent_expr (aexpr);
  
*************** memrange_cmp (const void *va, const void
*** 1100,1106 ****
    return 0;
  }
  
! /* Sort the memrange list using qsort, and merge adjacent memranges */
  static void
  memrange_sortmerge (struct collection_list *memranges)
  {
--- 1116,1122 ----
    return 0;
  }
  
! /* Sort the memrange list using qsort, and merge adjacent memranges.  */
  static void
  memrange_sortmerge (struct collection_list *memranges)
  {
*************** memrange_sortmerge (struct collection_li
*** 1130,1136 ****
      }
  }
  
! /* Add a register to a collection list */
  static void
  add_register (struct collection_list *collection, unsigned int regno)
  {
--- 1146,1152 ----
      }
  }
  
! /* Add a register to a collection list.  */
  static void
  add_register (struct collection_list *collection, unsigned int regno)
  {
*************** add_register (struct collection_list *co
*** 1144,1150 ****
  
  /* Add a memrange to a collection list */
  static void
! add_memrange (struct collection_list *memranges, int type, bfd_signed_vma base,
  	      unsigned long len)
  {
    if (info_verbose)
--- 1160,1167 ----
  
  /* Add a memrange to a collection list */
  static void
! add_memrange (struct collection_list *memranges, 
! 	      int type, bfd_signed_vma base,
  	      unsigned long len)
  {
    if (info_verbose)
*************** add_memrange (struct collection_list *me
*** 1156,1162 ****
  
    /* type: 0 == memory, n == basereg */
    memranges->list[memranges->next_memrange].type = type;
!   /* base: addr if memory, offset if reg relative. */
    memranges->list[memranges->next_memrange].start = base;
    /* len: we actually save end (base + len) for convenience */
    memranges->list[memranges->next_memrange].end = base + len;
--- 1173,1179 ----
  
    /* type: 0 == memory, n == basereg */
    memranges->list[memranges->next_memrange].type = type;
!   /* base: addr if memory, offset if reg relative.  */
    memranges->list[memranges->next_memrange].start = base;
    /* len: we actually save end (base + len) for convenience */
    memranges->list[memranges->next_memrange].end = base + len;
*************** add_memrange (struct collection_list *me
*** 1168,1180 ****
  				  memranges->listsize);
      }
  
!   if (type != -1)		/* better collect the base register! */
      add_register (memranges, type);
  }
  
! /* Add a symbol to a collection list */
  static void
! collect_symbol (struct collection_list *collect, struct symbol *sym,
  		long frame_regno, long frame_offset)
  {
    unsigned long len;
--- 1185,1198 ----
  				  memranges->listsize);
      }
  
!   if (type != -1)		/* Better collect the base register!  */
      add_register (memranges, type);
  }
  
! /* Add a symbol to a collection list.  */
  static void
! collect_symbol (struct collection_list *collect, 
! 		struct symbol *sym,
  		long frame_regno, long frame_offset)
  {
    unsigned long len;
*************** collect_symbol (struct collection_list *
*** 1186,1192 ****
      {
      default:
        printf_filtered ("%s: don't know symbol class %d\n",
! 		       DEPRECATED_SYMBOL_NAME (sym), SYMBOL_CLASS (sym));
        break;
      case LOC_CONST:
        printf_filtered ("constant %s (value %ld) will not be collected.\n",
--- 1204,1211 ----
      {
      default:
        printf_filtered ("%s: don't know symbol class %d\n",
! 		       DEPRECATED_SYMBOL_NAME (sym), 
! 		       SYMBOL_CLASS (sym));
        break;
      case LOC_CONST:
        printf_filtered ("constant %s (value %ld) will not be collected.\n",
*************** collect_symbol (struct collection_list *
*** 1200,1206 ****
  
  	  sprintf_vma (tmp, offset);
  	  printf_filtered ("LOC_STATIC %s: collect %ld bytes at %s.\n",
! 			   DEPRECATED_SYMBOL_NAME (sym), len, tmp /* address */);
  	}
        add_memrange (collect, -1, offset, len);	/* 0 == memory */
        break;
--- 1219,1226 ----
  
  	  sprintf_vma (tmp, offset);
  	  printf_filtered ("LOC_STATIC %s: collect %ld bytes at %s.\n",
! 			   DEPRECATED_SYMBOL_NAME (sym), len, 
! 			   tmp /* address */);
  	}
        add_memrange (collect, -1, offset, len);	/* 0 == memory */
        break;
*************** collect_symbol (struct collection_list *
*** 1208,1217 ****
      case LOC_REGPARM:
        reg = SYMBOL_VALUE (sym);
        if (info_verbose)
! 	printf_filtered ("LOC_REG[parm] %s: ", DEPRECATED_SYMBOL_NAME (sym));
        add_register (collect, reg);
!       /* check for doubles stored in two registers */
!       /* FIXME: how about larger types stored in 3 or more regs? */
        if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_FLT &&
  	  len > register_size (current_gdbarch, reg))
  	add_register (collect, reg + 1);
--- 1228,1238 ----
      case LOC_REGPARM:
        reg = SYMBOL_VALUE (sym);
        if (info_verbose)
! 	printf_filtered ("LOC_REG[parm] %s: ", 
! 			 DEPRECATED_SYMBOL_NAME (sym));
        add_register (collect, reg);
!       /* Check for doubles stored in two registers.  */
!       /* FIXME: how about larger types stored in 3 or more regs?  */
        if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_FLT &&
  	  len > register_size (current_gdbarch, reg))
  	add_register (collect, reg + 1);
*************** collect_symbol (struct collection_list *
*** 1272,1278 ****
        add_memrange (collect, reg, offset, len);
        break;
      case LOC_UNRESOLVED:
!       printf_filtered ("Don't know LOC_UNRESOLVED %s\n", DEPRECATED_SYMBOL_NAME (sym));
        break;
      case LOC_OPTIMIZED_OUT:
        printf_filtered ("%s has been optimized out of existence.\n",
--- 1293,1300 ----
        add_memrange (collect, reg, offset, len);
        break;
      case LOC_UNRESOLVED:
!       printf_filtered ("Don't know LOC_UNRESOLVED %s\n", 
! 		       DEPRECATED_SYMBOL_NAME (sym));
        break;
      case LOC_OPTIMIZED_OUT:
        printf_filtered ("%s has been optimized out of existence.\n",
*************** add_local_symbols (struct collection_lis
*** 1309,1315 ****
  	      if (type == 'L')	/* collecting Locals */
  		{
  		  count++;
! 		  collect_symbol (collect, sym, frame_regno, frame_offset);
  		}
  	      break;
  	    case LOC_ARG:
--- 1331,1338 ----
  	      if (type == 'L')	/* collecting Locals */
  		{
  		  count++;
! 		  collect_symbol (collect, sym, frame_regno, 
! 				  frame_offset);
  		}
  	      break;
  	    case LOC_ARG:
*************** add_local_symbols (struct collection_lis
*** 1321,1327 ****
  	      if (type == 'A')	/* collecting Arguments */
  		{
  		  count++;
! 		  collect_symbol (collect, sym, frame_regno, frame_offset);
  		}
  	    }
  	}
--- 1344,1351 ----
  	      if (type == 'A')	/* collecting Arguments */
  		{
  		  count++;
! 		  collect_symbol (collect, sym, frame_regno, 
! 				  frame_offset);
  		}
  	    }
  	}
*************** add_local_symbols (struct collection_lis
*** 1331,1337 ****
  	block = BLOCK_SUPERBLOCK (block);
      }
    if (count == 0)
!     warning ("No %s found in scope.", type == 'L' ? "locals" : "args");
  }
  
  /* worker function */
--- 1355,1362 ----
  	block = BLOCK_SUPERBLOCK (block);
      }
    if (count == 0)
!     warning ("No %s found in scope.", 
! 	     type == 'L' ? "locals" : "args");
  }
  
  /* worker function */
*************** stringify_collection_list (struct collec
*** 1431,1437 ****
        end += 10;		/* 'X' + 8 hex digits + ',' */
        count += 10;
  
!       end = mem2hex (list->aexpr_list[i]->buf, end, list->aexpr_list[i]->len);
        count += 2 * list->aexpr_list[i]->len;
      }
  
--- 1456,1463 ----
        end += 10;		/* 'X' + 8 hex digits + ',' */
        count += 10;
  
!       end = mem2hex (list->aexpr_list[i]->buf, 
! 		     end, list->aexpr_list[i]->len);
        count += 2 * list->aexpr_list[i]->len;
      }
  
*************** free_actions_list (char **actions_list)
*** 1470,1476 ****
    xfree (actions_list);
  }
  
! /* render all actions into gdb protocol */
  static void
  encode_actions (struct tracepoint *t, char ***tdp_actions,
  		char ***stepping_actions)
--- 1496,1502 ----
    xfree (actions_list);
  }
  
! /* Render all actions into gdb protocol.  */
  static void
  encode_actions (struct tracepoint *t, char ***tdp_actions,
  		char ***stepping_actions)
*************** encode_actions (struct tracepoint *t, ch
*** 1610,1616 ****
  				  for (ndx2 = 0; ndx2 < 8; ndx2++)
  				    if (areqs.reg_mask[ndx1] & (1 << ndx2))
  				      /* it's used -- record it */
! 				      add_register (collect, ndx1 * 8 + ndx2);
  				}
  			    }
  			}
--- 1636,1643 ----
  				  for (ndx2 = 0; ndx2 < 8; ndx2++)
  				    if (areqs.reg_mask[ndx1] & (1 << ndx2))
  				      /* it's used -- record it */
! 				      add_register (collect, 
! 						    ndx1 * 8 + ndx2);
  				}
  			    }
  			}
*************** encode_actions (struct tracepoint *t, ch
*** 1636,1643 ****
    memrange_sortmerge (&tracepoint_list);
    memrange_sortmerge (&stepping_list);
  
!   *tdp_actions = stringify_collection_list (&tracepoint_list, tdp_buff);
!   *stepping_actions = stringify_collection_list (&stepping_list, step_buff);
  }
  
  static void
--- 1663,1672 ----
    memrange_sortmerge (&tracepoint_list);
    memrange_sortmerge (&stepping_list);
  
!   *tdp_actions = stringify_collection_list (&tracepoint_list, 
! 					    tdp_buff);
!   *stepping_actions = stringify_collection_list (&stepping_list, 
! 						 step_buff);
  }
  
  static void
*************** remote_set_transparent_ranges (void)
*** 1673,1679 ****
    int anysecs = 0;
  
    if (!exec_bfd)
!     return;			/* no information to give. */
  
    strcpy (target_buf, "QTro");
    for (s = exec_bfd->sections; s; s = s->next)
--- 1702,1708 ----
    int anysecs = 0;
  
    if (!exec_bfd)
!     return;			/* No information to give.  */
  
    strcpy (target_buf, "QTro");
    for (s = exec_bfd->sections; s; s = s->next)
*************** remote_set_transparent_ranges (void)
*** 1709,1715 ****
  
  static void
  trace_start_command (char *args, int from_tty)
! {				/* STUB_COMM MOSTLY_IMPLEMENTED */
    struct tracepoint *t;
    char buf[2048];
    char **tdp_actions;
--- 1738,1744 ----
  
  static void
  trace_start_command (char *args, int from_tty)
! {
    struct tracepoint *t;
    char buf[2048];
    char **tdp_actions;
*************** trace_start_command (char *args, int fro
*** 1717,1723 ****
    int ndx;
    struct cleanup *old_chain = NULL;
  
!   dont_repeat ();		/* like "run", dangerous to repeat accidentally */
  
    if (target_is_remote ())
      {
--- 1746,1752 ----
    int ndx;
    struct cleanup *old_chain = NULL;
  
!   dont_repeat ();	/* Like "run", dangerous to repeat accidentally.  */
  
    if (target_is_remote ())
      {
*************** trace_start_command (char *args, int fro
*** 1731,1737 ****
  	char tmp[40];
  
  	sprintf_vma (tmp, t->address);
! 	sprintf (buf, "QTDP:%x:%s:%c:%lx:%x", t->number, tmp, /* address */
  		 t->enabled_p ? 'E' : 'D',
  		 t->step_count, t->pass_count);
  
--- 1760,1767 ----
  	char tmp[40];
  
  	sprintf_vma (tmp, t->address);
! 	sprintf (buf, "QTDP:%x:%s:%c:%lx:%x", t->number, 
! 		 tmp, /* address */
  		 t->enabled_p ? 'E' : 'D',
  		 t->step_count, t->pass_count);
  
*************** trace_start_command (char *args, int fro
*** 1762,1768 ****
  			     ((tdp_actions[ndx + 1] || stepping_actions)
  			      ? '-' : 0));
  		    putpkt (buf);
! 		    remote_get_noisy_reply (target_buf, sizeof (target_buf));
  		    if (strcmp (target_buf, "OK"))
  		      error ("Error on target while setting tracepoints.");
  		  }
--- 1792,1799 ----
  			     ((tdp_actions[ndx + 1] || stepping_actions)
  			      ? '-' : 0));
  		    putpkt (buf);
! 		    remote_get_noisy_reply (target_buf, 
! 					    sizeof (target_buf));
  		    if (strcmp (target_buf, "OK"))
  		      error ("Error on target while setting tracepoints.");
  		  }
*************** trace_start_command (char *args, int fro
*** 1778,1784 ****
  			     stepping_actions[ndx],
  			     (stepping_actions[ndx + 1] ? "-" : ""));
  		    putpkt (buf);
! 		    remote_get_noisy_reply (target_buf, sizeof (target_buf));
  		    if (strcmp (target_buf, "OK"))
  		      error ("Error on target while setting tracepoints.");
  		  }
--- 1809,1816 ----
  			     stepping_actions[ndx],
  			     (stepping_actions[ndx + 1] ? "-" : ""));
  		    putpkt (buf);
! 		    remote_get_noisy_reply (target_buf, 
! 					    sizeof (target_buf));
  		    if (strcmp (target_buf, "OK"))
  		      error ("Error on target while setting tracepoints.");
  		  }
*************** trace_start_command (char *args, int fro
*** 1787,1800 ****
  	    do_cleanups (old_chain);
  	  }
        }
!       /* Tell target to treat text-like sections as transparent */
        remote_set_transparent_ranges ();
!       /* Now insert traps and begin collecting data */
        putpkt ("QTStart");
        remote_get_noisy_reply (target_buf, sizeof (target_buf));
        if (strcmp (target_buf, "OK"))
  	error ("Bogus reply from target: %s", target_buf);
!       set_traceframe_num (-1);	/* all old traceframes invalidated */
        set_tracepoint_num (-1);
        set_traceframe_context (-1);
        trace_running_p = 1;
--- 1819,1832 ----
  	    do_cleanups (old_chain);
  	  }
        }
!       /* Tell target to treat text-like sections as transparent.  */
        remote_set_transparent_ranges ();
!       /* Now insert traps and begin collecting data.  */
        putpkt ("QTStart");
        remote_get_noisy_reply (target_buf, sizeof (target_buf));
        if (strcmp (target_buf, "OK"))
  	error ("Bogus reply from target: %s", target_buf);
!       set_traceframe_num (-1);	/* All old traceframes invalidated.  */
        set_tracepoint_num (-1);
        set_traceframe_context (-1);
        trace_running_p = 1;
*************** trace_start_command (char *args, int fro
*** 1809,1815 ****
  /* tstop command */
  static void
  trace_stop_command (char *args, int from_tty)
! {				/* STUB_COMM IS_IMPLEMENTED */
    if (target_is_remote ())
      {
        putpkt ("QTStop");
--- 1841,1847 ----
  /* tstop command */
  static void
  trace_stop_command (char *args, int from_tty)
! {
    if (target_is_remote ())
      {
        putpkt ("QTStop");
*************** unsigned long trace_running_p;
*** 1829,1835 ****
  /* tstatus command */
  static void
  trace_status_command (char *args, int from_tty)
! {				/* STUB_COMM IS_IMPLEMENTED */
    if (target_is_remote ())
      {
        putpkt ("qTStatus");
--- 1861,1867 ----
  /* tstatus command */
  static void
  trace_status_command (char *args, int from_tty)
! {
    if (target_is_remote ())
      {
        putpkt ("qTStatus");
*************** trace_status_command (char *args, int fr
*** 1846,1852 ****
      error ("Trace can only be run on remote targets.");
  }
  
! /* Worker function for the various flavors of the tfind command */
  static void
  finish_tfind_command (char *msg,
  		      long sizeof_msg,
--- 1878,1884 ----
      error ("Trace can only be run on remote targets.");
  }
  
! /* Worker function for the various flavors of the tfind command.  */
  static void
  finish_tfind_command (char *msg,
  		      long sizeof_msg,
*************** finish_tfind_command (char *msg,
*** 1896,1905 ****
  	      {
  		if (info_verbose)
  		  printf_filtered ("End of trace buffer.\n");
! 		/* The following will not recurse, since it's special-cased */
  		trace_find_command ("-1", from_tty);
! 		reply = NULL;	/* break out of loop, 
! 				   (avoid recursive nonsense) */
  	      }
  	  }
  	break;
--- 1928,1938 ----
  	      {
  		if (info_verbose)
  		  printf_filtered ("End of trace buffer.\n");
! 		/* The following will not recurse, since it's
! 		   special-cased.  */
  		trace_find_command ("-1", from_tty);
! 		reply = NULL;	/* Break out of loop 
! 				   (avoid recursive nonsense).  */
  	      }
  	  }
  	break;
*************** finish_tfind_command (char *msg,
*** 1932,1945 ****
        enum print_what print_what;
  
        /* NOTE: in immitation of the step command, try to determine
!          whether we have made a transition from one function to another.
!          If so, we'll print the "stack frame" (ie. the new function and
!          it's arguments) -- otherwise we'll just show the new source line.
! 
!          This determination is made by checking (1) whether the current
!          function has changed, and (2) whether the current FP has changed.
!          Hack: if the FP wasn't collected, either at the current or the
!          previous frame, assume that the FP has NOT changed.  */
  
        if (old_func == find_pc_function (read_pc ()) &&
  	  (old_frame_addr == 0 ||
--- 1965,1980 ----
        enum print_what print_what;
  
        /* NOTE: in immitation of the step command, try to determine
!          whether we have made a transition from one function to
!          another.  If so, we'll print the "stack frame" (ie. the new
!          function and it's arguments) -- otherwise we'll just show the
!          new source line.
! 
!          This determination is made by checking (1) whether the
!          current function has changed, and (2) whether the current FP
!          has changed.  Hack: if the FP wasn't collected, either at the
!          current or the previous frame, assume that the FP has NOT
!          changed.  */
  
        if (old_func == find_pc_function (read_pc ()) &&
  	  (old_frame_addr == 0 ||
*************** finish_tfind_command (char *msg,
*** 1971,1978 ****
  /* tfind command */
  static void
  trace_find_command (char *args, int from_tty)
! {				/* STUB_COMM PART_IMPLEMENTED */
!   /* this should only be called with a numeric argument */
    int frameno = -1;
  
    if (target_is_remote ())
--- 2006,2012 ----
  /* tfind command */
  static void
  trace_find_command (char *args, int from_tty)
! { /* this should only be called with a numeric argument */
    int frameno = -1;
  
    if (target_is_remote ())
*************** trace_find_command (char *args, int from
*** 1981,1987 ****
  	deprecated_trace_find_hook (args, from_tty);
  
        if (args == 0 || *args == 0)
! 	{			/* TFIND with no args means find NEXT trace frame. */
  	  if (traceframe_number == -1)
  	    frameno = 0;	/* "next" is first one */
  	  else
--- 2015,2021 ----
  	deprecated_trace_find_hook (args, from_tty);
  
        if (args == 0 || *args == 0)
! 	{ /* TFIND with no args means find NEXT trace frame.  */
  	  if (traceframe_number == -1)
  	    frameno = 0;	/* "next" is first one */
  	  else
*************** trace_find_start_command (char *args, in
*** 2033,2039 ****
  /* tfind pc command */
  static void
  trace_find_pc_command (char *args, int from_tty)
! {				/* STUB_COMM PART_IMPLEMENTED */
    CORE_ADDR pc;
    char tmp[40];
  
--- 2067,2073 ----
  /* tfind pc command */
  static void
  trace_find_pc_command (char *args, int from_tty)
! {
    CORE_ADDR pc;
    char tmp[40];
  
*************** trace_find_pc_command (char *args, int f
*** 2055,2061 ****
  /* tfind tracepoint command */
  static void
  trace_find_tracepoint_command (char *args, int from_tty)
! {				/* STUB_COMM PART_IMPLEMENTED */
    int tdp;
  
    if (target_is_remote ())
--- 2089,2095 ----
  /* tfind tracepoint command */
  static void
  trace_find_tracepoint_command (char *args, int from_tty)
! {
    int tdp;
  
    if (target_is_remote ())
*************** trace_find_tracepoint_command (char *arg
*** 2080,2093 ****
  /* TFIND LINE command:
  
     This command will take a sourceline for argument, just like BREAK
!    or TRACE (ie. anything that "decode_line_1" can handle).  
  
     With no argument, this command will find the next trace frame 
     corresponding to a source line OTHER THAN THE CURRENT ONE.  */
  
  static void
  trace_find_line_command (char *args, int from_tty)
! {				/* STUB_COMM PART_IMPLEMENTED */
    static CORE_ADDR start_pc, end_pc;
    struct symtabs_and_lines sals;
    struct symtab_and_line sal;
--- 2114,2127 ----
  /* TFIND LINE command:
  
     This command will take a sourceline for argument, just like BREAK
!    or TRACE (ie. anything that "decode_line_1" can handle).
  
     With no argument, this command will find the next trace frame 
     corresponding to a source line OTHER THAN THE CURRENT ONE.  */
  
  static void
  trace_find_line_command (char *args, int from_tty)
! {
    static CORE_ADDR start_pc, end_pc;
    struct symtabs_and_lines sals;
    struct symtab_and_line sal;
*************** trace_find_line_command (char *args, int
*** 2116,2124 ****
  	  printf_filtered ("TFIND: No line number information available");
  	  if (sal.pc != 0)
  	    {
! 	      /* This is useful for "info line *0x7f34".  If we can't tell the
! 	         user about a source line, at least let them have the symbolic
! 	         address.  */
  	      printf_filtered (" for address ");
  	      wrap_here ("  ");
  	      print_address (sal.pc, gdb_stdout);
--- 2150,2158 ----
  	  printf_filtered ("TFIND: No line number information available");
  	  if (sal.pc != 0)
  	    {
! 	      /* This is useful for "info line *0x7f34".  If we can't
! 	         tell the user about a source line, at least let them
! 	         have the symbolic address.  */
  	      printf_filtered (" for address ");
  	      wrap_here ("  ");
  	      print_address (sal.pc, gdb_stdout);
*************** trace_find_line_command (char *args, int
*** 2127,2133 ****
  	  else
  	    {
  	      printf_filtered (".\n");
! 	      return;		/* no line, no PC; what can we do? */
  	    }
  	}
        else if (sal.line > 0
--- 2161,2167 ----
  	  else
  	    {
  	      printf_filtered (".\n");
! 	      return;		/* No line, no PC; what can we do?  */
  	    }
  	}
        else if (sal.line > 0
*************** trace_find_line_command (char *args, int
*** 2154,2171 ****
  	}
        else
  	/* Is there any case in which we get here, and have an address
! 	   which the user would want to see?  If we have debugging symbols
! 	   and no line numbers?  */
  	error ("Line number %d is out of range for \"%s\".\n",
  	       sal.line, sal.symtab->filename);
  
        sprintf_vma (startpc_str, start_pc);
        sprintf_vma (endpc_str, end_pc - 1);
!       if (args && *args)	/* find within range of stated line */
! 	sprintf (target_buf, "QTFrame:range:%s:%s", startpc_str, endpc_str);
!       else			/* find OUTSIDE OF range of CURRENT line */
! 	sprintf (target_buf, "QTFrame:outside:%s:%s", startpc_str, endpc_str);
!       finish_tfind_command (target_buf, sizeof (target_buf), from_tty);
        do_cleanups (old_chain);
      }
    else
--- 2188,2210 ----
  	}
        else
  	/* Is there any case in which we get here, and have an address
! 	   which the user would want to see?  If we have debugging
! 	   symbols and no line numbers?  */
  	error ("Line number %d is out of range for \"%s\".\n",
  	       sal.line, sal.symtab->filename);
  
        sprintf_vma (startpc_str, start_pc);
        sprintf_vma (endpc_str, end_pc - 1);
!       /* Find within range of stated line.  */
!       if (args && *args)
! 	sprintf (target_buf, "QTFrame:range:%s:%s", 
! 		 startpc_str, endpc_str);
!       /* Find OUTSIDE OF range of CURRENT line.  */
!       else
! 	sprintf (target_buf, "QTFrame:outside:%s:%s", 
! 		 startpc_str, endpc_str);
!       finish_tfind_command (target_buf, sizeof (target_buf), 
! 			    from_tty);
        do_cleanups (old_chain);
      }
    else
*************** trace_find_range_command (char *args, in
*** 2183,2189 ****
    if (target_is_remote ())
      {
        if (args == 0 || *args == 0)
! 	{		/* XXX FIXME: what should default behavior be? */
  	  printf_filtered ("Usage: tfind range <startaddr>,<endaddr>\n");
  	  return;
  	}
--- 2222,2228 ----
    if (target_is_remote ())
      {
        if (args == 0 || *args == 0)
! 	{ /* XXX FIXME: what should default behavior be?  */
  	  printf_filtered ("Usage: tfind range <startaddr>,<endaddr>\n");
  	  return;
  	}
*************** trace_find_outside_command (char *args, 
*** 2222,2228 ****
    if (target_is_remote ())
      {
        if (args == 0 || *args == 0)
! 	{		/* XXX FIXME: what should default behavior be? */
  	  printf_filtered ("Usage: tfind outside <startaddr>,<endaddr>\n");
  	  return;
  	}
--- 2261,2267 ----
    if (target_is_remote ())
      {
        if (args == 0 || *args == 0)
! 	{ /* XXX FIXME: what should default behavior be? */
  	  printf_filtered ("Usage: tfind outside <startaddr>,<endaddr>\n");
  	  return;
  	}
*************** trace_dump_command (char *args, int from
*** 2550,2559 ****
        else if (cmd_cfunc_eq (cmd, collect_pseudocommand))
  	{
  	  /* Display the collected data.
! 	     For the trap frame, display only what was collected at the trap.
! 	     Likewise for stepping frames, display only what was collected
! 	     while stepping.  This means that the two boolean variables,
! 	     STEPPING_FRAME and STEPPING_ACTIONS should be equal.  */
  	  if (stepping_frame == stepping_actions)
  	    {
  	      do
--- 2589,2599 ----
        else if (cmd_cfunc_eq (cmd, collect_pseudocommand))
  	{
  	  /* Display the collected data.
! 	     For the trap frame, display only what was collected at
! 	     the trap.  Likewise for stepping frames, display only
! 	     what was collected while stepping.  This means that the
! 	     two boolean variables, STEPPING_FRAME and
! 	     STEPPING_ACTIONS should be equal.  */
  	  if (stepping_frame == stepping_actions)
  	    {
  	      do
*************** Use the 'source' command in another debu
*** 2693,2699 ****
  
    add_prefix_cmd ("tfind", class_trace, trace_find_command,
  		  "Select a trace frame;\n\
! No argument means forward by one frame; '-' meand backward by one frame.",
  		  &tfindlist, "tfind ", 1, &cmdlist);
  
    add_cmd ("outside", class_trace, trace_find_outside_command,
--- 2733,2739 ----
  
    add_prefix_cmd ("tfind", class_trace, trace_find_command,
  		  "Select a trace frame;\n\
! No argument means forward by one frame; '-' means backward by one frame.",
  		  &tfindlist, "tfind ", 1, &cmdlist);
  
    add_cmd ("outside", class_trace, trace_find_outside_command,
Index: tracepoint.h
===================================================================
RCS file: /cvs/src/src/gdb/tracepoint.h,v
retrieving revision 1.7
diff -p -r1.7 tracepoint.h
*** tracepoint.h	21 Apr 2004 23:52:21 -0000	1.7
--- tracepoint.h	14 Jan 2005 03:57:28 -0000
*************** struct tracepoint
*** 37,75 ****
      int enabled_p;
  
  #if 0
!     /* Type of tracepoint (MVS FIXME: needed?). */
      enum tptype type;
  
!     /* What to do with this tracepoint after we hit it MVS FIXME: needed?). */
      enum tpdisp disposition;
  #endif
      /* Number assigned to distinguish tracepoints.  */
      int number;
  
!     /* Address to trace at, or NULL if not an instruction tracepoint (MVS ?). */
      CORE_ADDR address;
  
!     /* Line number of this address.  Only matters if address is non-NULL.  */
      int line_number;
  
!     /* Source file name of this address.  Only matters if address is non-NULL. */
      char *source_file;
  
      /* Number of times this tracepoint should single-step 
!        and collect additional data */
      long step_count;
  
!     /* Number of times this tracepoint should be hit before disabling/ending. */
      int pass_count;
  
!     /* Chain of action lines to execute when this tracepoint is hit. */
      struct action_line *actions;
  
      /* Conditional (MVS ?).  */
      struct expression *cond;
  
!     /* String we used to set the tracepoint (malloc'd).  Only matters if
!        address is non-NULL.  */
      char *addr_string;
  
      /* Language we used to set the tracepoint.  */
--- 37,80 ----
      int enabled_p;
  
  #if 0
!     /* Type of tracepoint.  (MVS FIXME: needed?) */
      enum tptype type;
  
!     /* What to do with this tracepoint after we hit it 
!        MVS FIXME: needed?).  */
      enum tpdisp disposition;
  #endif
      /* Number assigned to distinguish tracepoints.  */
      int number;
  
!     /* Address to trace at, or NULL if not an instruction tracepoint.
!        (MVS ?) */
      CORE_ADDR address;
  
!     /* Line number of this address.  
!        Only matters if address is non-NULL.  */
      int line_number;
  
!     /* Source file name of this address.  
!        Only matters if address is non-NULL.  */
      char *source_file;
  
      /* Number of times this tracepoint should single-step 
!        and collect additional data.  */
      long step_count;
  
!     /* Number of times this tracepoint should be hit before 
!        disabling/ending.  */
      int pass_count;
  
!     /* Chain of action lines to execute when this tracepoint is hit.  */
      struct action_line *actions;
  
      /* Conditional (MVS ?).  */
      struct expression *cond;
  
!     /* String we used to set the tracepoint (malloc'd).
!        Only matters if address is non-NULL.  */
      char *addr_string;
  
      /* Language we used to set the tracepoint.  */
*************** struct tracepoint
*** 84,94 ****
         aborting, so you can back up to just before the abort.  */
      int hit_count;
  
!     /* Thread number for thread-specific tracepoint, or -1 if don't care */
      int thread;
  
!     /* BFD section, in case of overlays: 
!        no, I don't know if tracepoints are really gonna work with overlays.  */
      asection *section;
    };
  
--- 89,100 ----
         aborting, so you can back up to just before the abort.  */
      int hit_count;
  
!     /* Thread number for thread-specific tracepoint, 
!        or -1 if don't care.  */
      int thread;
  
!     /* BFD section, in case of overlays: no, I don't know if
!        tracepoints are really gonna work with overlays.  */
      asection *section;
    };
  
*************** enum actionline_type
*** 101,113 ****
    };
  
  
! /* The tracepoint chain of all tracepoints */
  
  extern struct tracepoint *tracepoint_chain;
  
  extern unsigned long trace_running_p;
  
! /* A hook used to notify the UI of tracepoint operations */
  
  void (*deprecated_create_tracepoint_hook) (struct tracepoint *);
  void (*deprecated_delete_tracepoint_hook) (struct tracepoint *);
--- 107,119 ----
    };
  
  
! /* The tracepoint chain of all tracepoints.  */
  
  extern struct tracepoint *tracepoint_chain;
  
  extern unsigned long trace_running_p;
  
! /* A hook used to notify the UI of tracepoint operations.  */
  
  void (*deprecated_create_tracepoint_hook) (struct tracepoint *);
  void (*deprecated_delete_tracepoint_hook) (struct tracepoint *);
*************** enum actionline_type validate_actionline
*** 122,129 ****
  
  
  /* Walk the following statement or block through all tracepoints.
!    ALL_TRACEPOINTS_SAFE does so even if the statment deletes the current
!    breakpoint.  */
  
  #define ALL_TRACEPOINTS(t)  for (t = tracepoint_chain; t; t = t->next)
  
--- 128,135 ----
  
  
  /* Walk the following statement or block through all tracepoints.
!    ALL_TRACEPOINTS_SAFE does so even if the statment deletes the
!    current breakpoint.  */
  
  #define ALL_TRACEPOINTS(t)  for (t = tracepoint_chain; t; t = t->next)
  
*************** enum actionline_type validate_actionline
*** 131,134 ****
  	for (t = tracepoint_chain;	\
  	     t ? (tmp = t->next, 1) : 0;\
  	     t = tmp)
! #endif /* TRACEPOINT_H */
--- 137,140 ----
  	for (t = tracepoint_chain;	\
  	     t ? (tmp = t->next, 1) : 0;\
  	     t = tmp)
! #endif	/* TRACEPOINT_H */

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]