X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftracepoint.h;h=56a1f92d9d0cfe0848ea53a6aa0cd5dcd8be72f7;hb=c0b0a14290e1909a6cc3febb443560c3e95562c2;hp=60caa7ad39bc36da3f5baa0e065d2cda6430205a;hpb=b44ec61915f10a953ca85da5bf7a97911554f1aa;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h index 60caa7ad39..56a1f92d9d 100644 --- a/gdb/tracepoint.h +++ b/gdb/tracepoint.h @@ -1,5 +1,5 @@ /* Data structures associated with tracepoints in GDB. - Copyright (C) 1997-2017 Free Software Foundation, Inc. + Copyright (C) 1997-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -21,7 +21,7 @@ #include "breakpoint.h" #include "memrange.h" -#include "gdb_vecs.h" +#include "gdbsupport/gdb_vecs.h" #include #include @@ -47,29 +47,33 @@ typedef std::unique_ptr traceframe_info_up; tracepoints. */ struct trace_state_variable - { - /* The variable's name. The user has to prefix with a dollar sign, - but we don't store that internally. */ - const char *name; +{ + trace_state_variable (std::string &&name_, int number_) + : name (name_), number (number_) + {} + + /* The variable's name. The user has to prefix with a dollar sign, + but we don't store that internally. */ + std::string name; - /* An id number assigned by GDB, and transmitted to targets. */ - int number; + /* An id number assigned by GDB, and transmitted to targets. */ + int number = 0; - /* The initial value of a variable is a 64-bit signed integer. */ - LONGEST initial_value; + /* The initial value of a variable is a 64-bit signed integer. */ + LONGEST initial_value = 0; - /* 1 if the value is known, else 0. The value is known during a - trace run, or in tfind mode if the variable was collected into - the current trace frame. */ - int value_known; + /* 1 if the value is known, else 0. The value is known during a + trace run, or in tfind mode if the variable was collected into + the current trace frame. */ + int value_known = 0; - /* The value of a variable is a 64-bit signed integer. */ - LONGEST value; + /* The value of a variable is a 64-bit signed integer. */ + LONGEST value = 0; - /* This is true for variables that are predefined and built into - the target. */ - int builtin; - }; + /* This is true for variables that are predefined and built into + the target. */ + int builtin = 0; + }; /* The trace status encompasses various info about the general state of the tracing run. */ @@ -165,38 +169,38 @@ extern const char *stop_reason_names[]; struct uploaded_tp { - int number; - enum bptype type; - ULONGEST addr; - int enabled; - int step; - int pass; - int orig_size; + int number = 0; + enum bptype type = bp_none; + ULONGEST addr = 0; + int enabled = 0; + int step = 0; + int pass = 0; + int orig_size = 0; /* String that is the encoded form of the tracepoint's condition. */ - char *cond; + gdb::unique_xmalloc_ptr cond; /* Vectors of strings that are the encoded forms of a tracepoint's actions. */ - VEC(char_ptr) *actions; - VEC(char_ptr) *step_actions; + std::vector> actions; + std::vector> step_actions; /* The original string defining the location of the tracepoint. */ - char *at_string; + gdb::unique_xmalloc_ptr at_string; /* The original string defining the tracepoint's condition. */ - char *cond_string; + gdb::unique_xmalloc_ptr cond_string; /* List of original strings defining the tracepoint's actions. */ - VEC(char_ptr) *cmd_strings; + std::vector> cmd_strings; /* The tracepoint's current hit count. */ - int hit_count; + int hit_count = 0; /* The tracepoint's current traceframe usage. */ - ULONGEST traceframe_usage; + ULONGEST traceframe_usage = 0; - struct uploaded_tp *next; + struct uploaded_tp *next = nullptr; }; /* Struct recording info about trace state variables on the target. */ @@ -214,14 +218,20 @@ struct uploaded_tsv struct static_tracepoint_marker { - struct gdbarch *gdbarch; - CORE_ADDR address; + DISABLE_COPY_AND_ASSIGN (static_tracepoint_marker); + + static_tracepoint_marker () = default; + static_tracepoint_marker (static_tracepoint_marker &&) = default; + static_tracepoint_marker &operator= (static_tracepoint_marker &&) = default; + + struct gdbarch *gdbarch = NULL; + CORE_ADDR address = 0; /* The string ID of the marker. */ - char *str_id; + std::string str_id; /* Extra target reported info associated with the marker. */ - char *extra; + std::string extra; }; struct memrange @@ -252,10 +262,14 @@ public: /* Add AEXPR to the list, taking ownership. */ void add_aexpr (agent_expr_up aexpr); - void add_register (unsigned int regno); + void add_remote_register (unsigned int regno); + void add_ax_registers (struct agent_expr *aexpr); + void add_local_register (struct gdbarch *gdbarch, + unsigned int regno, + CORE_ADDR scope); void add_memrange (struct gdbarch *gdbarch, int type, bfd_signed_vma base, - unsigned long len); + unsigned long len, CORE_ADDR scope); void collect_symbol (struct symbol *sym, struct gdbarch *gdbarch, long frame_regno, long frame_offset, @@ -278,8 +292,9 @@ public: { return m_computed; } private: - /* room for up to 256 regs */ - unsigned char m_regs_mask[32]; + /* We need the allocator zero-initialize the mask, so we don't use + gdb::byte_vector. */ + std::vector m_regs_mask; std::vector m_memranges; @@ -295,11 +310,9 @@ private: std::vector m_computed; }; -extern void parse_static_tracepoint_marker_definition - (const char *line, const char **pp, - struct static_tracepoint_marker *marker); -extern void release_static_tracepoint_marker (struct static_tracepoint_marker *); -extern void free_current_marker (void *arg); +extern void + parse_static_tracepoint_marker_definition (const char *line, const char **pp, + static_tracepoint_marker *marker); /* A hook used to notify the UI of tracepoint operations. */ @@ -317,7 +330,22 @@ extern int get_tracepoint_number (void); etc.). */ extern void set_current_traceframe (int num); -struct cleanup *make_cleanup_restore_current_traceframe (void); +struct scoped_restore_current_traceframe +{ + scoped_restore_current_traceframe (); + + ~scoped_restore_current_traceframe () + { + set_current_traceframe (m_traceframe_number); + } + + DISABLE_COPY_AND_ASSIGN (scoped_restore_current_traceframe); + +private: + + /* The traceframe we were inspecting. */ + int m_traceframe_number; +}; void free_actions (struct breakpoint *); @@ -408,4 +436,7 @@ extern struct traceframe_info *get_traceframe_info (void); extern struct bp_location *get_traceframe_location (int *stepping_frame_p); +/* Command element for the 'while-stepping' command. */ +extern cmd_list_element *while_stepping_cmd_element; + #endif /* TRACEPOINT_H */