FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of VEC(static_tracepoint_marker_p)

Browse source 
This patch replaces VEC(static_tracepoint_marker_p) with std::vector,
and does some c++ification around that.  I thought a new overload of
hex2str was useful, so I added it as well as corresponding unit tests.
I also added an overload of ui_out::field_string that takes an
std::string directly.

gdb/ChangeLog:

	* tracepoint.h (struct static_tracepoint_marker): Initialize
	fields, define default constructor, move constructor and move
	assignment, disable the rest.
	<str_id, extra>: Make std::string.
	(release_static_tracepoint_marker): Remove.
	(free_current_marker): Remove.
	* tracepoint.c (free_current_marker): Remove.
	(parse_static_tracepoint_marker_definition): Adjust to
	std::string, use new hex2str overload.
	(release_static_tracepoint_marker): Remove.
	(print_one_static_tracepoint_marker): Get marker by reference
	and adjust to std::string.
	(info_static_tracepoint_markers_command): Adjust to std::vector
	changes
	* target.h (static_tracepoint_marker_p): Remove typedef.
	(DEF_VEC_P(static_tracepoint_marker_p)): Remove.
	(struct target_ops) <to_static_tracepoint_marker_at>: Return
	bool.
	<to_static_tracepoint_markers_by_strid>: Return std::vector.
	* target-debug.h
	(target_debug_print_VEC_static_tracepoint_marker_p_p): Remove.
	(target_debug_print_std_vector_static_tracepoint_marker): New.
	(target_debug_print_struct_static_tracepoint_marker_p): Rename
	to...
	(target_debug_print_static_tracepoint_marker_p): ... this.
	* target-delegates.c: Re-generate.
	* breakpoint.h (struct tracepoint) <static_trace_marker_id>:
	Make std::string.
	* breakpoint.c (init_breakpoint_sal): Adjust to std::string.
	(decode_static_tracepoint_spec): Adjust to std::vector.
	(tracepoint_print_one_detail): Adjust to std::string.
	(strace_marker_decode_location): Adjust to std::string.
	(update_static_tracepoint): Adjust to std::string, remove call
	to release_static_tracepoint_marker.
	* linux-nat.c (linux_child_static_tracepoint_markers_by_strid):
	Adjust to std::vector.
	* remote.c (remote_static_tracepoint_marker_at): Return bool.
	(remote_static_tracepoint_markers_by_strid): Adjust to
	std::vector.
	* common/rsp-low.h (hex2str): New overload with explicit count
	of bytes.
	* common/rsp-low.c (hex2str): New overload with explicit count
	of bytes.
	* unittests/rsp-low-selftests.c (test_hex2str): New function.
	(_initialize_rsp_low_selftests): Add test_hex2str test.
	* unittests/tracepoint-selftests.c
	(test_parse_static_tracepoint_marker_definition): Adjust to
	std::string.
This commit is contained in:
Simon Marchi 2018-03-22 00:27:19 -04:00 • committed by Simon Marchi
parent 62c222b6d9
commit 5d9310c4b8
14 changed files with 184 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

22
gdb/tracepoint.h
View file

@ -214,14 +214,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
@ -295,11 +301,9 @@ private:
std::vector<std::string> 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. */