gas: slightly relax .startof.()/.sizeof.() testcase

[deliverable/binutils-gdb.git] / gdb / tracepoint.h

diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 6b00b3085422d844cf03a3582c63b7337b3c274d..8c4dedcecffe1d5a3e35f543fab18d64c91b34e4 100644 (file)
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -1,5 +1,5 @@
 /* Data structures associated with tracepoints in GDB.
-   Copyright (C) 1997-2014 Free Software Foundation, Inc.
+   Copyright (C) 1997-2017 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,6 +24,9 @@
 #include "memrange.h"
 #include "gdb_vecs.h"
 
+#include <vector>
+#include <string>
+
 /* An object describing the contents of a traceframe.  */
 
 struct traceframe_info
@@ -74,7 +77,7 @@ enum trace_stop_reason
   {
     trace_stop_reason_unknown,
     trace_never_run,
-    tstop_command,
+    trace_stop_command,
     trace_buffer_full,
     trace_disconnected,
     tracepoint_passcount,
@@ -222,6 +225,13 @@ struct static_tracepoint_marker
 
 struct memrange
 {
+  memrange (int type_, bfd_signed_vma start_, bfd_signed_vma end_)
+    : type (type_), start (start_), end (end_)
+  {}
+
+  memrange ()
+  {}
+
   /* memrange_absolute for absolute memory range, else basereg
      number.  */
   int type;
@@ -229,27 +239,59 @@ struct memrange
   bfd_signed_vma end;
 };
 
-struct collection_list
+class collection_list
 {
+public:
+  collection_list ();
+
+  void add_wholly_collected (const char *print_name);
+
+  void append_exp (struct expression *exp);
+
+  /* Add AEXPR to the list, taking ownership.  */
+  void add_aexpr (agent_expr_up aexpr);
+
+  void add_register (unsigned int regno);
+  void add_memrange (struct gdbarch *gdbarch,
+                    int type, bfd_signed_vma base,
+                    unsigned long len);
+  void collect_symbol (struct symbol *sym,
+                      struct gdbarch *gdbarch,
+                      long frame_regno, long frame_offset,
+                      CORE_ADDR scope,
+                      int trace_string);
+
+  void add_local_symbols (struct gdbarch *gdbarch, CORE_ADDR pc,
+                         long frame_regno, long frame_offset, int type,
+                         int trace_string);
+  void add_static_trace_data ();
+
+  void finish ();
+
+  char **stringify ();
+
+  const std::vector<std::string> &wholly_collected ()
+  { return m_wholly_collected; }
+
+  const std::vector<std::string> &computed ()
+  { return m_computed; }
+
+private:
   /* room for up to 256 regs */
-  unsigned char regs_mask[32];
-  long listsize;
-  long next_memrange;
-  struct memrange *list;
+  unsigned char m_regs_mask[32];
+
+  std::vector<memrange> m_memranges;
 
-  /* size of array pointed to by expr_list elt.  */
-  long aexpr_listsize;
-  long next_aexpr_elt;
-  struct agent_expr **aexpr_list;
+  std::vector<agent_expr_up> m_aexprs;
 
   /* True is the user requested a collection of "$_sdata", "static
      tracepoint data".  */
-  int strace_data;
+  bool m_strace_data;
 
   /* A set of names of wholly collected objects.  */
-  VEC(char_ptr) *wholly_collected;
+  std::vector<std::string> m_wholly_collected;
   /* A set of computed expressions.  */
-  VEC(char_ptr) *computed;
+  std::vector<std::string> m_computed;
 };
 
 extern void parse_static_tracepoint_marker_definition
@@ -269,30 +311,20 @@ extern int get_traceframe_number (void);
 /* Returns the tracepoint number for current traceframe.  */
 extern int get_tracepoint_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 const char *decode_agent_options (const char *exp, int *trace_string);
 
-extern struct cleanup *
-  encode_actions_and_make_cleanup (struct bp_location *tloc,
-                                  struct collection_list *tracepoint_list,
-                                  struct collection_list *stepping_list);
+extern void encode_actions (struct bp_location *tloc,
+                           struct collection_list *tracepoint_list,
+                           struct collection_list *stepping_list);
 
 extern void encode_actions_rsp (struct bp_location *tloc,
                                char ***tdp_actions, char ***stepping_actions);
@@ -307,7 +339,7 @@ extern struct trace_state_variable *
 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,
+                                char *srctype, const char *src,
                                 char *buf, int buf_size);
 
 extern void parse_trace_status (char *line, struct trace_status *ts);
@@ -334,6 +366,8 @@ extern void query_if_trace_running (int from_tty);
 extern void disconnect_tracing (void);
 extern void trace_reset_local_state (void);
 
+extern void check_trace_running (struct trace_status *);
+
 extern void start_tracing (char *notes);
 extern void stop_tracing (char *notes);