X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fparser-defs.h;h=f2bb18fd9c74ab8a2bf9a87c2232d633721a72da;hb=8621b685bfdcb8773b8177fb2b89e45499902868;hp=97c53b95bd500557a6dd151395fb68a8cad55b61;hpb=410a0ff2df3fa8d260c1c6d76172c65285968cea;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h index 97c53b95bd..f2bb18fd9c 100644 --- a/gdb/parser-defs.h +++ b/gdb/parser-defs.h @@ -1,6 +1,6 @@ /* Parser definitions for GDB. - Copyright (C) 1986-2014 Free Software Foundation, Inc. + Copyright (C) 1986-2019 Free Software Foundation, Inc. Modified from expread.y by the Department of Computer Science at the State University of New York at Buffalo. @@ -23,8 +23,7 @@ #if !defined (PARSER_DEFS_H) #define PARSER_DEFS_H 1 -#include "doublest.h" -#include "vec.h" +#include "common/vec.h" #include "expression.h" struct block; @@ -33,44 +32,147 @@ struct internalvar; extern int parser_debug; -#define parse_gdbarch(ps) ((ps)->expout->gdbarch) -#define parse_language(ps) ((ps)->expout->language_defn) +/* A class that can be used to build a "struct expression". */ -struct parser_state +struct expr_builder { - /* The expression related to this parser state. */ + /* Constructor. LANG is the language used to parse the expression. + And GDBARCH is the gdbarch to use during parsing. */ + + expr_builder (const struct language_defn *lang, + struct gdbarch *gdbarch); + + DISABLE_COPY_AND_ASSIGN (expr_builder); + + /* Resize the allocated expression to the correct size, and return + it as an expression_up -- passing ownership to the caller. */ + ATTRIBUTE_UNUSED_RESULT expression_up release (); + + /* Return the gdbarch that was passed to the constructor. */ + + struct gdbarch *gdbarch () + { + return expout->gdbarch; + } + + /* Return the language that was passed to the constructor. */ - struct expression *expout; + const struct language_defn *language () + { + return expout->language_defn; + } /* The size of the expression above. */ size_t expout_size; + /* The expression related to this parser state. */ + + expression_up expout; + /* The number of elements already in the expression. This is used to know where to put new elements. */ size_t expout_ptr; }; -/* If this is nonzero, this block is used as the lexical context - for symbol names. */ +/* An instance of this type is instantiated during expression parsing, + and passed to the appropriate parser. It holds both inputs to the + parser, and result. */ -extern const struct block *expression_context_block; +struct parser_state : public expr_builder +{ + /* Constructor. LANG is the language used to parse the expression. + And GDBARCH is the gdbarch to use during parsing. */ + + parser_state (const struct language_defn *lang, + struct gdbarch *gdbarch, + const struct block *context_block, + CORE_ADDR context_pc, + int comma) + : expr_builder (lang, gdbarch), + expression_context_block (context_block), + expression_context_pc (context_pc), + comma_terminates (comma) + { + } -/* If expression_context_block is non-zero, then this is the PC within - the block that we want to evaluate expressions at. When debugging - C or C++ code, we use this to find the exact line we're at, and - then look up the macro definitions active at that point. */ -extern CORE_ADDR expression_context_pc; + DISABLE_COPY_AND_ASSIGN (parser_state); -/* The innermost context required by the stack and register variables - we've encountered so far. */ -extern const struct block *innermost_block; + /* If this is nonzero, this block is used as the lexical context for + symbol names. */ -/* The block in which the most recently discovered symbol was found. - FIXME: Should be declared along with lookup_symbol in symtab.h; is not - related specifically to parsing. */ -extern const struct block *block_found; + const struct block * const expression_context_block; + + /* If expression_context_block is non-zero, then this is the PC + within the block that we want to evaluate expressions at. When + debugging C or C++ code, we use this to find the exact line we're + at, and then look up the macro definitions active at that + point. */ + const CORE_ADDR expression_context_pc; + + /* Nonzero means stop parsing on first comma (if not within parentheses). */ + + int comma_terminates; +}; + +/* When parsing expressions we track the innermost block that was + referenced. */ + +class innermost_block_tracker +{ +public: + innermost_block_tracker () + : m_types (INNERMOST_BLOCK_FOR_SYMBOLS), + m_innermost_block (NULL) + { /* Nothing. */ } + + /* Reset the currently stored innermost block. Usually called before + parsing a new expression. As the most common case is that we only + want to gather the innermost block for symbols in an expression, this + becomes the default block tracker type. */ + void reset (innermost_block_tracker_types t = INNERMOST_BLOCK_FOR_SYMBOLS) + { + m_types = t; + m_innermost_block = NULL; + } + + /* Update the stored innermost block if the new block B is more inner + than the currently stored block, or if no block is stored yet. The + type T tells us whether the block B was for a symbol or for a + register. The stored innermost block is only updated if the type T is + a type we are interested in, the types we are interested in are held + in M_TYPES and set during RESET. */ + void update (const struct block *b, innermost_block_tracker_types t); + + /* Overload of main UPDATE method which extracts the block from BS. */ + void update (const struct block_symbol &bs) + { + update (bs.block, INNERMOST_BLOCK_FOR_SYMBOLS); + } + + /* Return the stored innermost block. Can be nullptr if no symbols or + registers were found during an expression parse, and so no innermost + block was defined. */ + const struct block *block () const + { + return m_innermost_block; + } + +private: + /* The type of innermost block being looked for. */ + innermost_block_tracker_types m_types; + + /* The currently stored innermost block found while parsing an + expression. */ + const struct block *m_innermost_block; +}; + +/* The innermost context required by the stack and register variables + we've encountered so far. This is cleared by the expression + parsing functions before parsing an expression, and can queried + once the parse is complete. */ +extern innermost_block_tracker innermost_block; /* Number of arguments seen so far in innermost function call. */ extern int arglist_len; @@ -111,7 +213,7 @@ struct ttype struct symtoken { struct stoken stoken; - struct symbol *sym; + struct block_symbol sym; int is_a_field_of_this; }; @@ -119,12 +221,9 @@ struct objc_class_str { struct stoken stoken; struct type *type; - int class; + int theclass; }; -typedef struct type *type_ptr; -DEF_VEC_P (type_ptr); - /* For parsing of complicated types. An array should be preceded in the list by the size of the array. */ enum type_pieces @@ -132,13 +231,15 @@ enum type_pieces tp_end = -1, tp_pointer, tp_reference, + tp_rvalue_reference, tp_array, tp_function, tp_function_with_arguments, tp_const, tp_volatile, tp_space_identifier, - tp_type_stack + tp_type_stack, + tp_kind }; /* The stack can contain either an enum type_pieces or an int. */ union type_stack_elt @@ -146,7 +247,7 @@ union type_stack_elt enum type_pieces piece; int int_val; struct type_stack *stack_val; - VEC (type_ptr) *typelist_val; + std::vector *typelist_val; }; /* The type stack is an instance of this structure. */ @@ -154,30 +255,9 @@ union type_stack_elt struct type_stack { /* Elements on the stack. */ - union type_stack_elt *elements; - /* Current stack depth. */ - int depth; - /* Allocated size of stack. */ - int size; + std::vector elements; }; -/* Helper function to initialize the expout, expout_size, expout_ptr - trio inside PS before it is used to store expression elements created - during the parsing of an expression. INITIAL_SIZE is the initial size of - the expout array. LANG is the language used to parse the expression. - And GDBARCH is the gdbarch to use during parsing. */ - -extern void initialize_expout (struct parser_state *ps, - size_t initial_size, - const struct language_defn *lang, - struct gdbarch *gdbarch); - -/* Helper function that reallocates the EXPOUT inside PS in order to - eliminate any unused space. It is generally used when the expression - has just been parsed and created. */ - -extern void reallocate_expout (struct parser_state *ps); - /* Reverse an expression from suffix form (in which it is constructed) to prefix form (in which we can conveniently print or execute it). Ordinarily this always returns -1. However, if EXPOUT_LAST_STRUCT @@ -187,38 +267,36 @@ extern void reallocate_expout (struct parser_state *ps); extern int prefixify_expression (struct expression *expr); -extern void write_exp_elt_opcode (struct parser_state *, enum exp_opcode); - -extern void write_exp_elt_sym (struct parser_state *, struct symbol *); +extern void write_exp_elt_opcode (struct expr_builder *, enum exp_opcode); -extern void write_exp_elt_longcst (struct parser_state *, LONGEST); +extern void write_exp_elt_sym (struct expr_builder *, struct symbol *); -extern void write_exp_elt_dblcst (struct parser_state *, DOUBLEST); +extern void write_exp_elt_longcst (struct expr_builder *, LONGEST); -extern void write_exp_elt_decfloatcst (struct parser_state *, gdb_byte *); +extern void write_exp_elt_floatcst (struct expr_builder *, const gdb_byte *); -extern void write_exp_elt_type (struct parser_state *, struct type *); +extern void write_exp_elt_type (struct expr_builder *, struct type *); -extern void write_exp_elt_intern (struct parser_state *, struct internalvar *); +extern void write_exp_elt_intern (struct expr_builder *, struct internalvar *); -extern void write_exp_string (struct parser_state *, struct stoken); +extern void write_exp_string (struct expr_builder *, struct stoken); -void write_exp_string_vector (struct parser_state *, int type, +void write_exp_string_vector (struct expr_builder *, int type, struct stoken_vector *vec); -extern void write_exp_bitstring (struct parser_state *, struct stoken); +extern void write_exp_bitstring (struct expr_builder *, struct stoken); -extern void write_exp_elt_block (struct parser_state *, const struct block *); +extern void write_exp_elt_block (struct expr_builder *, const struct block *); -extern void write_exp_elt_objfile (struct parser_state *, +extern void write_exp_elt_objfile (struct expr_builder *, struct objfile *objfile); -extern void write_exp_msymbol (struct parser_state *, +extern void write_exp_msymbol (struct expr_builder *, struct bound_minimal_symbol); extern void write_dollar_variable (struct parser_state *, struct stoken str); -extern void mark_struct_expression (struct parser_state *); +extern void mark_struct_expression (struct expr_builder *); extern const char *find_template_name_end (const char *); @@ -234,7 +312,7 @@ extern void push_type (enum type_pieces); extern void push_type_int (int); -extern void insert_type_address_space (struct parser_state *, char *); +extern void insert_type_address_space (struct expr_builder *, char *); extern enum type_pieces pop_type (void); @@ -247,11 +325,7 @@ extern struct type_stack *append_type_stack (struct type_stack *to, extern void push_type_stack (struct type_stack *stack); -extern void type_stack_cleanup (void *arg); - -extern void push_typelist (VEC (type_ptr) *typelist); - -extern int length_of_subexp (struct expression *, int); +extern void push_typelist (std::vector *typelist); extern int dump_subexp (struct expression *, struct ui_file *, int); @@ -268,17 +342,16 @@ extern int operator_check_standard (struct expression *exp, int pos, (struct objfile *objfile, void *data), void *data); -extern char *op_name_standard (enum exp_opcode); +extern const char *op_name_standard (enum exp_opcode); extern struct type *follow_types (struct type *); -extern void null_post_parser (struct expression **, int); +extern type_instance_flags follow_type_instance_flags (); -extern int parse_float (const char *p, int len, DOUBLEST *d, - const char **suffix); +extern void null_post_parser (expression_up *, int); -extern int parse_c_float (struct gdbarch *gdbarch, const char *p, int len, - DOUBLEST *d, struct type **t); +extern bool parse_float (const char *p, int len, + const struct type *type, gdb_byte *data); /* During parsing of a C expression, the pointer to the next character is in this variable. */ @@ -288,14 +361,6 @@ extern const char *lexptr; /* After a token has been recognized, this variable points to it. Currently used only for error reporting. */ extern const char *prev_lexptr; - -/* Current depth in parentheses within the expression. */ - -extern int paren_depth; - -/* Nonzero means stop parsing on first comma (if not within parentheses). */ - -extern int comma_terminates; /* These codes indicate operator precedences for expression printing, least tightly binding first. */ @@ -318,7 +383,7 @@ enum precedence struct op_print { - char *string; + const char *string; enum exp_opcode opcode; /* Precedence of operator. These values are used only by comparisons. */ enum precedence precedence; @@ -341,14 +406,14 @@ struct exp_descriptor the number of subexpressions it takes. */ void (*operator_length) (const struct expression*, int, int*, int *); - /* Call TYPE_FUNC and OBJFILE_FUNC for any TYPE and OBJFILE found being - referenced by the single operator of EXP at position POS. Operator - parameters are located at positive (POS + number) offsets in EXP. - The functions should never be called with NULL TYPE or NULL OBJFILE. - Functions should get passed an arbitrary caller supplied DATA pointer. - If any of the functions returns non-zero value then (any other) non-zero - value should be immediately returned to the caller. Otherwise zero - should be returned. */ + /* Call OBJFILE_FUNC for any objfile found being referenced by the + single operator of EXP at position POS. Operator parameters are + located at positive (POS + number) offsets in EXP. OBJFILE_FUNC + should never be called with NULL OBJFILE. OBJFILE_FUNC should + get passed an arbitrary caller supplied DATA pointer. If it + returns non-zero value then (any other) non-zero value should be + immediately returned to the caller. Otherwise zero should be + returned. */ int (*operator_check) (struct expression *exp, int pos, int (*objfile_func) (struct objfile *objfile, void *data), @@ -358,7 +423,7 @@ struct exp_descriptor The returned value should never be NULL, even if EXP_OPCODE is an unknown opcode (a string containing an image of the numeric value of the opcode can be returned, for instance). */ - char *(*op_name) (enum exp_opcode); + const char *(*op_name) (enum exp_opcode); /* Dump the rest of this (prefix) expression after the operator itself has been printed. See dump_subexp_body_standard in @@ -394,11 +459,5 @@ extern int exp_uses_objfile (struct expression *exp, struct objfile *objfile); extern void mark_completion_tag (enum type_code, const char *ptr, int length); -/* Reallocate the `expout' pointer inside PS so that it can accommodate - at least LENELT expression elements. This function does nothing if - there is enough room for the elements. */ - -extern void increase_expout_size (struct parser_state *ps, size_t lenelt); - #endif /* PARSER_DEFS_H */