mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-21 01:12:32 +08:00
4d01a485d2
This patch makes parse_expression and friends return a unique_ptr
instead of raw pointer [1]:
typedef gdb::unique_malloc_ptr<expression> expression_up;
and then adjusts the codebase throughout to stop using cleanups to
manage lifetime of expression pointers.
Whenever I found a structure owning an expression pointer, I made it
store a unique_ptr instead of a raw pointer, which then requires using
new/delete of the holding structure, instead of XNEW/xfree.
[1] - I'd like to set the rule that types named with an "_up" suffix
are unique_ptr typedefs.
Note I used gdb::unique_xmalloc_ptr instead of gdb::unique_ptr, simply
because we still use xmalloc instead of new to allocate expression
objects. Once that's changed, all we need to do is change the
expression_up typedef and the smart pointer will then call delete
instead of xfree.
gdb/ChangeLog:
2016-11-08 Pedro Alves <palves@redhat.com>
* ada-lang.c (ada_read_renaming_var_value): Use expression_up.
(struct ada_catchpoint_location) <excep_cond_expr>: Now an
expression_up.
(ada_catchpoint_location_dtor): Reset excep_cond_expr instead of
using xfree.
(create_excep_cond_exprs): Use expression_up and gdb::move.
(allocate_location_exception): Use new instead of XNEW.
(should_stop_exception): Likewise. Adjust to use expression_up.
(create_ada_exception_catchpoint): Use new instead of XNEW.
* ax-gdb.c (agent_eval_command_one): Use expression_up instead of
cleanups.
(maint_agent_printf_command): Use expression_up.
* break-catch-sig.c (create_signal_catchpoint): Use new instead of
XNEW.
* break-catch-syscall.c (create_syscall_event_catchpoint):
Likewise.
* break-catch-throw.c (handle_gnu_v3_exceptions): Use new instead
of XCNEW. Use gdb::unique_ptr instead of cleanups.
* breakpoint.c (set_breakpoint_condition, update_watchpoint)
(parse_cmd_to_aexpr, watchpoint_check)
(bpstat_check_breakpoint_conditions, watchpoint_locations_match):
Adjust to use expression_up.
(init_bp_location): Adjust.
(free_bp_location): Use delete instead of xfree.
(set_raw_breakpoint_without_location, set_raw_breakpoint)
(add_solib_catchpoint, create_fork_vfork_event_catchpoint)
(new_single_step_breakpoint, create_breakpoint_sal): Use new
instead of XNEW.
(find_condition_and_thread): Adjust to use expression_up.
(create_breakpoint): Use new instead of XNEW.
(dtor_watchpoint): Don't xfree expression pointers, they're
unique_ptr's now.
(insert_watchpoint, remove_watchpoint): Adjust.
(watch_command_1): Use expression_up. Use new instead of XCNEW.
(catch_exec_command_1): Use new instead of XNEW.
(bp_location_dtor): Don't xfree expression pointers, they're
unique_ptr's now.
(base_breakpoint_allocate_location)
(strace_marker_create_breakpoints_sal): Use new instead of XNEW.
(delete_breakpoint): Use delete instead of xfree.
* breakpoint.h (struct bp_location) <cond>: Now an
unique_ptr<expression> instead of a raw pointer.
(struct watchpoint) <exp, cond_exp>: Likewise.
* cli/cli-script.c (execute_control_command): Use expression_up
instead of cleanups.
* dtrace-probe.c (dtrace_process_dof_probe): Use expression_up.
* eval.c (parse_and_eval_address, parse_and_eval_long)
(parse_and_eval, parse_to_comma_and_eval, parse_and_eval_type):
Use expression_up instead of cleanups.
* expression.h (expression_up): New typedef.
(parse_expression, parse_expression_with_language, parse_exp_1):
Change return type to expression_up.
* mi/mi-main.c (mi_cmd_data_evaluate_expression)
(print_variable_or_computed): Use expression_up.
* objc-lang.c (print_object_command): Use expression_up instead of
cleanups.
* parse.c (parse_exp_1, parse_exp_in_context)
(parse_exp_in_context_1, parse_expression)
(parse_expression_with_language): Return an expression_up instead
of a raw pointer.
(parse_expression_for_completion): Use expression_up.
* printcmd.c (struct display) <exp>: Now an expression_up instead
of a raw pointer.
(print_command_1, output_command_const, set_command, x_command):
Use expression_up instead of cleanups.
(display_command): Likewise. Use new instead of XNEW.
(free_display): Use delete instead of xfree.
(do_one_display): Adjust to use expression_up.
* remote.c (remote_download_tracepoint): Likewise.
* stack.c (return_command): Likewise.
* tracepoint.c (validate_actionline, encode_actions_1): Use
expression_up instead of cleanups.
* typeprint.c (whatis_exp, maintenance_print_type): Likewise.
* value.c (init_if_undefined_command): Likewise.
* varobj.c (struct varobj_root) <exp>: Now an expression_up
instead of a raw pointer.
(varobj_create): Adjust.
(varobj_set_value): Use an expression_up instead of cleanups.
(new_root_variable): Use new instead of XNEW.
(free_variable): Use delete instead of xfree.
(value_of_root_1): Use std::swap.
171 lines
5.3 KiB
C
171 lines
5.3 KiB
C
/* Definitions for expressions stored in reversed prefix form, for GDB.
|
|
|
|
Copyright (C) 1986-2016 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 (EXPRESSION_H)
|
|
#define EXPRESSION_H 1
|
|
|
|
|
|
#include "symtab.h" /* Needed for "struct block" type. */
|
|
#include "doublest.h" /* Needed for DOUBLEST. */
|
|
|
|
|
|
/* Definitions for saved C expressions. */
|
|
|
|
/* An expression is represented as a vector of union exp_element's.
|
|
Each exp_element is an opcode, except that some opcodes cause
|
|
the following exp_element to be treated as a long or double constant
|
|
or as a variable. The opcodes are obeyed, using a stack for temporaries.
|
|
The value is left on the temporary stack at the end. */
|
|
|
|
/* When it is necessary to include a string,
|
|
it can occupy as many exp_elements as it needs.
|
|
We find the length of the string using strlen,
|
|
divide to find out how many exp_elements are used up,
|
|
and skip that many. Strings, like numbers, are indicated
|
|
by the preceding opcode. */
|
|
|
|
enum exp_opcode
|
|
{
|
|
#define OP(name) name ,
|
|
|
|
#include "std-operator.def"
|
|
|
|
/* First extension operator. Individual language modules define extra
|
|
operators in *.def include files below with numbers higher than
|
|
OP_EXTENDED0. */
|
|
OP (OP_EXTENDED0)
|
|
|
|
/* Language specific operators. */
|
|
#include "ada-operator.def"
|
|
|
|
#undef OP
|
|
|
|
/* Existing only to swallow the last comma (',') from last .inc file. */
|
|
OP_UNUSED_LAST
|
|
};
|
|
|
|
union exp_element
|
|
{
|
|
enum exp_opcode opcode;
|
|
struct symbol *symbol;
|
|
LONGEST longconst;
|
|
DOUBLEST doubleconst;
|
|
gdb_byte decfloatconst[16];
|
|
/* Really sizeof (union exp_element) characters (or less for the last
|
|
element of a string). */
|
|
char string;
|
|
struct type *type;
|
|
struct internalvar *internalvar;
|
|
const struct block *block;
|
|
struct objfile *objfile;
|
|
};
|
|
|
|
struct expression
|
|
{
|
|
const struct language_defn *language_defn; /* language it was
|
|
entered in. */
|
|
struct gdbarch *gdbarch; /* architecture it was parsed in. */
|
|
int nelts;
|
|
union exp_element elts[1];
|
|
};
|
|
|
|
typedef gdb::unique_xmalloc_ptr<expression> expression_up;
|
|
|
|
/* Macros for converting between number of expression elements and bytes
|
|
to store that many expression elements. */
|
|
|
|
#define EXP_ELEM_TO_BYTES(elements) \
|
|
((elements) * sizeof (union exp_element))
|
|
#define BYTES_TO_EXP_ELEM(bytes) \
|
|
(((bytes) + sizeof (union exp_element) - 1) / sizeof (union exp_element))
|
|
|
|
/* From parse.c */
|
|
|
|
extern expression_up parse_expression (const char *);
|
|
|
|
extern expression_up parse_expression_with_language (const char *string,
|
|
enum language lang);
|
|
|
|
extern struct type *parse_expression_for_completion (const char *, char **,
|
|
enum type_code *);
|
|
|
|
extern expression_up parse_exp_1 (const char **, CORE_ADDR pc,
|
|
const struct block *, int);
|
|
|
|
/* For use by parsers; set if we want to parse an expression and
|
|
attempt completion. */
|
|
extern int parse_completion;
|
|
|
|
/* The innermost context required by the stack and register variables
|
|
we've encountered so far. To use this, set it to NULL, then call
|
|
parse_<whatever>, then look at it. */
|
|
extern const struct block *innermost_block;
|
|
|
|
/* From eval.c */
|
|
|
|
/* Values of NOSIDE argument to eval_subexp. */
|
|
|
|
enum noside
|
|
{
|
|
EVAL_NORMAL,
|
|
EVAL_SKIP, /* Only effect is to increment pos. */
|
|
EVAL_AVOID_SIDE_EFFECTS /* Don't modify any variables or
|
|
call any functions. The value
|
|
returned will have the correct
|
|
type, and will have an
|
|
approximately correct lvalue
|
|
type (inaccuracy: anything that is
|
|
listed as being in a register in
|
|
the function in which it was
|
|
declared will be lval_register).
|
|
Ideally this would not even read
|
|
target memory, but currently it
|
|
does in many situations. */
|
|
};
|
|
|
|
extern struct value *evaluate_subexp_standard
|
|
(struct type *, struct expression *, int *, enum noside);
|
|
|
|
/* From expprint.c */
|
|
|
|
extern void print_expression (struct expression *, struct ui_file *);
|
|
|
|
extern char *op_name (struct expression *exp, enum exp_opcode opcode);
|
|
|
|
extern char *op_string (enum exp_opcode);
|
|
|
|
extern void dump_raw_expression (struct expression *,
|
|
struct ui_file *, char *);
|
|
extern void dump_prefix_expression (struct expression *, struct ui_file *);
|
|
|
|
/* In an OP_RANGE expression, either bound could be empty, indicating
|
|
that its value is by default that of the corresponding bound of the
|
|
array or string. So we have four sorts of subrange. This
|
|
enumeration type is to identify this. */
|
|
|
|
enum range_type
|
|
{
|
|
BOTH_BOUND_DEFAULT, /* "(:)" */
|
|
LOW_BOUND_DEFAULT, /* "(:high)" */
|
|
HIGH_BOUND_DEFAULT, /* "(low:)" */
|
|
NONE_BOUND_DEFAULT /* "(low:high)" */
|
|
};
|
|
|
|
#endif /* !defined (EXPRESSION_H) */
|