Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 09:08:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

'struct agent_expr *' -> unique_ptr<agent_expr>

Browse Source 
This patch makes the gen_* functions return a unique_ptr instead of
raw pointer:

  typedef gdb::unique_ptr<agent_expr> agent_expr_up;

and then adjusts the codebase throughout to stop using
make_cleanup_free_agent_expr.

The cond_bytecode and cmd_bytecode fields of struct bp_location are
owning pointers, so they're changed to be unique_ptr's instead of raw
pointers.

gdb/ChangeLog:
2016-11-08  Pedro Alves  <palves@redhat.com>

	* ax-gdb.c (is_nontrivial_conversion): Use agent_expr_up.
	(gen_trace_for_var, gen_trace_for_expr, gen_eval_for_expr)
	(gen_trace_for_return_address, gen_printf): Use and return an
	agent_expr_up.  Don't use make_cleanup_free_agent_expr.
	(agent_eval_command_one, maint_agent_printf_command): Use
	agent_expr_up.  Don't use make_cleanup_free_agent_expr.
	* ax-gdb.h (gen_trace_for_expr, gen_trace_for_var)
	(gen_trace_for_return_address, gen_eval_for_expr, gen_printf): Use
	agent_expr_up.
	* ax-general.c (new_agent_expr): Rename to ...
	(agent_expr::agent_expr): ... this, and now a constructor.
	(free_agent_expr): Rename to ...
	(agent_expr::~agent_exp): ... this, and now a destructor.
	(do_free_agent_expr_cleanup, make_cleanup_free_agent_expr):
	Delete.
	* ax.h (struct agent_expr): Add ctor/dtor.
	(agent_expr_up): New typedef.
	(new_agent_expr, free_agent_expr, make_cleanup_free_agent_expr):
	Delete declarations.
	* breakpoint.c (parse_cond_to_aexpr): Use and return an
	agent_expr_up.  Don't use make_cleanup_free_agent_expr.
	(build_target_condition_list): Adjust to use agent_expr_up.
	(parse_cmd_to_aexpr): Use and return an agent_expr_up.  Don't use
	make_cleanup_free_agent_expr.
	(build_target_command_list): Adjust to use agent_expr_up.
	(force_breakpoint_reinsertion): Adjust to use agent_expr_up.
	(bp_location_dtor): Remove unnecessary free_agent_expr and xfree
	calls.
	* breakpoint.h (struct bp_target_info) <cond_bytecode,
	cmd_bytecode>: Now agent_expr_up's.
	* remote.c (remote_download_tracepoint): Adjust to use
	agent_expr_up and remove use of make_cleanup_free_agent_expr.
	* tracepoint.c (validate_actionline, collect_symbol): Adjust to
	use agent_expr_up and remove uses of make_cleanup_free_agent_expr.
	(collection_list::~collection_list): Call delete instead of
	free_agent_expr.
	(encode_actions_1): Adjust to use agent_expr_up and remove uses of
	make_cleanup_free_agent_expr.
	(add_aexpr): Change parameter type to agent_expr_up; Return a raw
	agent_expr pointer.
This commit is contained in:
Pedro Alves
2016-11-08 15:26:47 +00:00
parent 2f408ecb92
commit 833177a4a5
10 changed files with 194 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
gdb/tracepoint.c
View File

@@ -702,7 +702,6 @@ validate_actionline (const char *line, struct breakpoint *b)
const char *tmp_p;
const char *p;
struct bp_location *loc;
struct agent_expr *aexpr;
struct tracepoint *t = (struct tracepoint *) b;
/* If EOF is typed, *line is NULL. */
@@ -775,17 +774,16 @@ validate_actionline (const char *line, struct breakpoint *b)
/* 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 (loc->address, exp.get (), trace_string);
old_chain = make_cleanup_free_agent_expr (aexpr);
agent_expr_up aexpr = gen_trace_for_expr (loc->address,
exp.get (),
trace_string);
if (aexpr->len > MAX_AGENT_EXPR_LEN)
error (_("Expression is too complicated."));
ax_reqs (aexpr);
ax_reqs (aexpr.get ());
report_agent_reqs_errors (aexpr);
do_cleanups (old_chain);
report_agent_reqs_errors (aexpr.get ());
}
}
while (p && *p++ == ',');
@@ -810,16 +808,13 @@ validate_actionline (const char *line, struct breakpoint *b)
/* We have something to evaluate, make sure that the expr to
bytecode translator can handle it and that it's not too
long. */
aexpr = gen_eval_for_expr (loc->address, exp.get ());
old_chain = make_cleanup_free_agent_expr (aexpr);
agent_expr_up aexpr = gen_eval_for_expr (loc->address, exp.get ());
if (aexpr->len > MAX_AGENT_EXPR_LEN)
error (_("Expression is too complicated."));
ax_reqs (aexpr);
report_agent_reqs_errors (aexpr);
do_cleanups (old_chain);
ax_reqs (aexpr.get ());
report_agent_reqs_errors (aexpr.get ());
}
}
while (p && *p++ == ',');
@@ -1045,10 +1040,10 @@ collection_list::collect_symbol (struct symbol *sym,
/* Expressions are the most general case. */
if (treat_as_expr)
{
struct agent_expr *aexpr;
struct cleanup *old_chain1 = NULL;
aexpr = gen_trace_for_var (scope, gdbarch, sym, trace_string);
agent_expr_up aexpr = gen_trace_for_var (scope, gdbarch,
sym, trace_string);
/* It can happen that the symbol is recorded as a computed
location, but it's been optimized away and doesn't actually
@@ -1060,33 +1055,28 @@ collection_list::collect_symbol (struct symbol *sym,
return;
}
old_chain1 = make_cleanup_free_agent_expr (aexpr);
ax_reqs (aexpr.get ());
ax_reqs (aexpr);
report_agent_reqs_errors (aexpr);
discard_cleanups (old_chain1);
add_aexpr (aexpr);
report_agent_reqs_errors (aexpr.get ());
/* Take care of the registers. */
if (aexpr->reg_mask_len > 0)
{
int ndx1, ndx2;
for (ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
for (int ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
{
QUIT; /* Allow user to bail out with ^C. */
if (aexpr->reg_mask[ndx1] != 0)
{
/* Assume chars have 8 bits. */
for (ndx2 = 0; ndx2 < 8; ndx2++)
for (int ndx2 = 0; ndx2 < 8; ndx2++)
if (aexpr->reg_mask[ndx1] & (1 << ndx2))
/* It's used -- record it. */
add_register (ndx1 * 8 + ndx2);
}
}
}
add_aexpr (gdb::move (aexpr));
}
}
@@ -1193,7 +1183,7 @@ collection_list::collection_list ()
collection_list::~collection_list ()
{
for (int ndx = 0; ndx < m_aexprs.size (); ndx++)
free_agent_expr (m_aexprs[ndx]);
delete m_aexprs[ndx];
}
/* Reduce a collection list to string form (for gdb protocol). */
@@ -1351,7 +1341,6 @@ encode_actions_1 (struct command_line *action,
int i;
struct value *tempval;
struct cmd_list_element *cmd;
struct agent_expr *aexpr;
for (; action; action = action->next)
{
@@ -1403,32 +1392,24 @@ encode_actions_1 (struct command_line *action,
}
else if (0 == strncasecmp ("$_ret", action_exp, 5))
{
struct cleanup *old_chain1 = NULL;
agent_expr_up aexpr
= gen_trace_for_return_address (tloc->address,
target_gdbarch (),
trace_string);
aexpr = gen_trace_for_return_address (tloc->address,
target_gdbarch (),
trace_string);
old_chain1 = make_cleanup_free_agent_expr (aexpr);
ax_reqs (aexpr);
report_agent_reqs_errors (aexpr);
discard_cleanups (old_chain1);
collect->add_aexpr (aexpr);
ax_reqs (aexpr.get ());
report_agent_reqs_errors (aexpr.get ());
/* take care of the registers */
if (aexpr->reg_mask_len > 0)
{
int ndx1, ndx2;
for (ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
for (int ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
{
QUIT; /* allow user to bail out with ^C */
if (aexpr->reg_mask[ndx1] != 0)
{
/* assume chars have 8 bits */
for (ndx2 = 0; ndx2 < 8; ndx2++)
for (int ndx2 = 0; ndx2 < 8; ndx2++)
if (aexpr->reg_mask[ndx1] & (1 << ndx2))
{
/* It's used -- record it. */
@@ -1438,6 +1419,7 @@ encode_actions_1 (struct command_line *action,
}
}
collect->add_aexpr (gdb::move (aexpr));
action_exp = strchr (action_exp, ','); /* more? */
}
else if (0 == strncasecmp ("$_sdata", action_exp, 7))
@@ -1499,31 +1481,24 @@ encode_actions_1 (struct command_line *action,
break;
default: /* Full-fledged expression. */
aexpr = gen_trace_for_expr (tloc->address, exp.get (),
trace_string);
agent_expr_up aexpr = gen_trace_for_expr (tloc->address,
exp.get (),
trace_string);
old_chain1 = make_cleanup_free_agent_expr (aexpr);
ax_reqs (aexpr.get ());
ax_reqs (aexpr);
report_agent_reqs_errors (aexpr);
discard_cleanups (old_chain1);
collect->add_aexpr (aexpr);
report_agent_reqs_errors (aexpr.get ());
/* Take care of the registers. */
if (aexpr->reg_mask_len > 0)
{
int ndx1;
int ndx2;
for (ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
for (int ndx1 = 0; ndx1 < aexpr->reg_mask_len; ndx1++)
{
QUIT; /* Allow user to bail out with ^C. */
if (aexpr->reg_mask[ndx1] != 0)
{
/* Assume chars have 8 bits. */
for (ndx2 = 0; ndx2 < 8; ndx2++)
for (int ndx2 = 0; ndx2 < 8; ndx2++)
if (aexpr->reg_mask[ndx1] & (1 << ndx2))
{
/* It's used -- record it. */
@@ -1533,6 +1508,7 @@ encode_actions_1 (struct command_line *action,
}
}
collect->add_aexpr (gdb::move (aexpr));
collect->append_exp (exp.get ());
break;
} /* switch */
@@ -1554,16 +1530,15 @@ encode_actions_1 (struct command_line *action,
block_for_pc (tloc->address),
1);
aexpr = gen_eval_for_expr (tloc->address, exp.get ());
old_chain1 = make_cleanup_free_agent_expr (aexpr);
agent_expr_up aexpr = gen_eval_for_expr (tloc->address,
exp.get ());
ax_reqs (aexpr);
report_agent_reqs_errors (aexpr);
ax_reqs (aexpr.get ());
report_agent_reqs_errors (aexpr.get ());
discard_cleanups (old_chain1);
/* Even though we're not officially collecting, add
to the collect list anyway. */
collect->add_aexpr (aexpr);
collect->add_aexpr (gdb::move (aexpr));
} /* do */
}
while (action_exp && *action_exp++ == ',');
@@ -1625,9 +1600,9 @@ encode_actions_rsp (struct bp_location *tloc, char ***tdp_actions,
}
void
collection_list::add_aexpr (struct agent_expr *aexpr)
collection_list::add_aexpr (agent_expr_up aexpr)
{
m_aexprs.push_back (aexpr);
m_aexprs.push_back (aexpr.release ());
}
static void