Merge GDB 7.5.1

gdb/tracepoint.h

 /* Data structures associated with tracepoints in GDB.
    Copyright (C) 1997-2000, 2007-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #if !defined (TRACEPOINT_H)
 #define TRACEPOINT_H 1
 
 #include "breakpoint.h"
 #include "target.h"
 #include "memrange.h"
+#include "gdb_vecs.h"
 
 /* A trace state variable is a value managed by a target being
    traced.  A trace state variable (or tsv for short) can be accessed
    and assigned to by tracepoint actions and conditionals, but is not
    part of the program being traced, and it doesn't have to be
    collected.  Effectively the variables are scratch space for
    tracepoints.  */
 
 struct trace_state_variable
   {
@@ skipping 101 matching lines @@
   LONGEST start_time;
   LONGEST stop_time;
 };
 
 struct trace_status *current_trace_status (void);
 
 extern char *default_collect;
 
 /* Struct to collect random info about tracepoints on the target.  */
 
-DEF_VEC_P (char_ptr);
-
 struct uploaded_tp
 {
   int number;
   enum bptype type;
   ULONGEST addr;
   int enabled;
   int step;
   int pass;
   int orig_size;
 
@@ skipping 45 matching lines @@
   char *str_id;
 
   /* Extra target reported info associated with the marker.  */
   char *extra;
 };
 
 extern void parse_static_tracepoint_marker_definition
   (char *line, char **pp,
    struct static_tracepoint_marker *marker);
 extern void release_static_tracepoint_marker (struct static_tracepoint_marker *);
+extern void free_current_marker (void *arg);
 
 /* A hook used to notify the UI of tracepoint operations.  */
 
 extern void (*deprecated_trace_find_hook) (char *arg, int from_tty);
 extern void (*deprecated_trace_start_stop_hook) (int start, int from_tty);
 
 /* Returns the current traceframe number.  */
 extern int get_traceframe_number (void);
 
 /* Make the traceframe NUM be the current GDB trace frame number, and
    do nothing more.  In particular, this does not flush the
    register/frame caches or notify the target about the trace frame
    change, so that is can be used when we need to momentarily access
    live memory.  Targets lazily switch their current traceframe to
    match GDB's traceframe number, at the appropriate times.  */
 extern void set_traceframe_number (int);
 
 /* Make the traceframe NUM be the current trace frame, all the way to
    the target, and flushes all global state (register/frame caches,
    etc.).  */
 extern void set_current_traceframe (int num);
 
 struct cleanup *make_cleanup_restore_current_traceframe (void);
 struct cleanup *make_cleanup_restore_traceframe_number (void);
 
 void free_actions (struct breakpoint *);
 
 extern char *decode_agent_options (char *exp);
 
+extern void encode_actions (struct breakpoint *t, struct bp_location *tloc,
+                            char ***tdp_actions, char ***stepping_actions);
+
 extern void validate_actionline (char **, struct breakpoint *);
 
 extern void end_actions_pseudocommand (char *args, int from_tty);
 extern void while_stepping_pseudocommand (char *args, int from_tty);
 
 extern struct trace_state_variable *find_trace_state_variable (const char *name);
 extern struct trace_state_variable *create_trace_state_variable (const char *name);
 
 extern int encode_source_string (int num, ULONGEST addr,
                                  char *srctype, char *src,
@@ skipping 29 matching lines @@
                      int from_tty);
 
 extern void trace_save (const char *filename, int target_does_save);
 
 extern struct traceframe_info *parse_traceframe_info (const char *tframe_info);
 
 extern int traceframe_available_memory (VEC(mem_range_s) **result,
                                         CORE_ADDR memaddr, ULONGEST len);
 
 #endif  /* TRACEPOINT_H */