X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fparse.c;h=c76e0d52c9048c92a0da5a72452bffbf7edca1b8;hb=258876ee34a4b656c754355cf175a825e0db80f3;hp=07c17651bbbc7255894bd47d5905c0c8c9a1ada0;hpb=d7561cbbf27a8ff771f85baf6696aa7645250484;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/parse.c b/gdb/parse.c index 07c17651bb..c76e0d52c9 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -1,6 +1,6 @@ /* Parse expressions for GDB. - Copyright (C) 1986-2013 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, 1991. @@ -32,7 +32,6 @@ #include "defs.h" #include #include "arch-utils.h" -#include "gdb_string.h" #include "symtab.h" #include "gdbtypes.h" #include "frame.h" @@ -45,13 +44,13 @@ #include "gdbcmd.h" #include "symfile.h" /* for overlay functions */ #include "inferior.h" -#include "doublest.h" -#include "gdb_assert.h" +#include "target-float.h" #include "block.h" #include "source.h" #include "objfiles.h" -#include "exceptions.h" #include "user-regs.h" +#include +#include "common/gdb_optional.h" /* Standard set of definitions for printing, dumping, prefixifying, * and evaluating expressions. */ @@ -67,12 +66,9 @@ const struct exp_descriptor exp_descriptor_standard = }; /* Global variables declared in parser-defs.h (and commented there). */ -struct expression *expout; -int expout_size; -int expout_ptr; const struct block *expression_context_block; CORE_ADDR expression_context_pc; -const struct block *innermost_block; +innermost_block_tracker innermost_block; int arglist_len; static struct type_stack type_stack; const char *lexptr; @@ -92,7 +88,7 @@ static int expout_last_struct = -1; static enum type_code expout_tag_completion_type = TYPE_CODE_UNDEF; /* The token for tagged type name completion. */ -static char *expout_completion_name; +static gdb::unique_xmalloc_ptr expout_completion_name; static unsigned int expressiondebug = 0; @@ -115,30 +111,30 @@ show_parserdebug (struct ui_file *file, int from_tty, } -static void free_funcalls (void *ignore); - static int prefixify_subexp (struct expression *, struct expression *, int, int); -static struct expression *parse_exp_in_context (const char **, CORE_ADDR, - const struct block *, int, - int, int *); -static struct expression *parse_exp_in_context_1 (const char **, CORE_ADDR, - const struct block *, int, - int, int *); +static expression_up parse_exp_in_context (const char **, CORE_ADDR, + const struct block *, int, + int, int *, + innermost_block_tracker_types); -void _initialize_parse (void); +/* Documented at it's declaration. */ + +void +innermost_block_tracker::update (const struct block *b, + innermost_block_tracker_types t) +{ + if ((m_types & t) != 0 + && (m_innermost_block == NULL + || contained_in (b, m_innermost_block))) + m_innermost_block = b; +} /* Data structure for saving values of arglist_len for function calls whose arguments contain other function calls. */ -struct funcall - { - struct funcall *next; - int arglist_len; - }; - -static struct funcall *funcall_chain; +static std::vector *funcall_chain; /* Begin counting arguments for a function call, saving the data about any containing call. */ @@ -146,13 +142,8 @@ static struct funcall *funcall_chain; void start_arglist (void) { - struct funcall *new; - - new = (struct funcall *) xmalloc (sizeof (struct funcall)); - new->next = funcall_chain; - new->arglist_len = arglist_len; + funcall_chain->push_back (arglist_len); arglist_len = 0; - funcall_chain = new; } /* Return the number of arguments in a function call just terminated, @@ -162,169 +153,154 @@ int end_arglist (void) { int val = arglist_len; - struct funcall *call = funcall_chain; - - funcall_chain = call->next; - arglist_len = call->arglist_len; - xfree (call); + arglist_len = funcall_chain->back (); + funcall_chain->pop_back (); return val; } -/* Free everything in the funcall chain. - Used when there is an error inside parsing. */ - -static void -free_funcalls (void *ignore) -{ - struct funcall *call, *next; - - for (call = funcall_chain; call; call = next) - { - next = call->next; - xfree (call); - } -} -/* This page contains the functions for adding data to the struct expression - being constructed. */ /* See definition in parser-defs.h. */ -void -initialize_expout (int initial_size, const struct language_defn *lang, - struct gdbarch *gdbarch) +parser_state::parser_state (size_t initial_size, + const struct language_defn *lang, + struct gdbarch *gdbarch) + : expout_size (initial_size), + expout (XNEWVAR (expression, + (sizeof (expression) + + EXP_ELEM_TO_BYTES (expout_size)))), + expout_ptr (0) { - expout_size = initial_size; - expout_ptr = 0; - expout = xmalloc (sizeof (struct expression) - + EXP_ELEM_TO_BYTES (expout_size)); expout->language_defn = lang; expout->gdbarch = gdbarch; } -/* See definition in parser-defs.h. */ - -void -reallocate_expout (void) +expression_up +parser_state::release () { /* Record the actual number of expression elements, and then reallocate the expression memory so that we free up any excess elements. */ expout->nelts = expout_ptr; - expout = xrealloc ((char *) expout, - sizeof (struct expression) - + EXP_ELEM_TO_BYTES (expout_ptr)); + expout.reset (XRESIZEVAR (expression, expout.release (), + (sizeof (expression) + + EXP_ELEM_TO_BYTES (expout_ptr)))); + + return std::move (expout); } +/* This page contains the functions for adding data to the struct expression + being constructed. */ + /* Add one element to the end of the expression. */ /* To avoid a bug in the Sun 4 compiler, we pass things that can fit into a register through here. */ static void -write_exp_elt (const union exp_element *expelt) +write_exp_elt (struct parser_state *ps, const union exp_element *expelt) { - if (expout_ptr >= expout_size) + if (ps->expout_ptr >= ps->expout_size) { - expout_size *= 2; - expout = (struct expression *) - xrealloc ((char *) expout, sizeof (struct expression) - + EXP_ELEM_TO_BYTES (expout_size)); + ps->expout_size *= 2; + ps->expout.reset (XRESIZEVAR (expression, ps->expout.release (), + (sizeof (expression) + + EXP_ELEM_TO_BYTES (ps->expout_size)))); } - expout->elts[expout_ptr++] = *expelt; + ps->expout->elts[ps->expout_ptr++] = *expelt; } void -write_exp_elt_opcode (enum exp_opcode expelt) +write_exp_elt_opcode (struct parser_state *ps, enum exp_opcode expelt) { union exp_element tmp; memset (&tmp, 0, sizeof (union exp_element)); tmp.opcode = expelt; - write_exp_elt (&tmp); + write_exp_elt (ps, &tmp); } void -write_exp_elt_sym (struct symbol *expelt) +write_exp_elt_sym (struct parser_state *ps, struct symbol *expelt) { union exp_element tmp; memset (&tmp, 0, sizeof (union exp_element)); tmp.symbol = expelt; - write_exp_elt (&tmp); + write_exp_elt (ps, &tmp); } void -write_exp_elt_block (const struct block *b) +write_exp_elt_msym (struct parser_state *ps, minimal_symbol *expelt) { union exp_element tmp; memset (&tmp, 0, sizeof (union exp_element)); - tmp.block = b; - write_exp_elt (&tmp); + tmp.msymbol = expelt; + write_exp_elt (ps, &tmp); } void -write_exp_elt_objfile (struct objfile *objfile) +write_exp_elt_block (struct parser_state *ps, const struct block *b) { union exp_element tmp; memset (&tmp, 0, sizeof (union exp_element)); - tmp.objfile = objfile; - write_exp_elt (&tmp); + tmp.block = b; + write_exp_elt (ps, &tmp); } void -write_exp_elt_longcst (LONGEST expelt) +write_exp_elt_objfile (struct parser_state *ps, struct objfile *objfile) { union exp_element tmp; memset (&tmp, 0, sizeof (union exp_element)); - tmp.longconst = expelt; - write_exp_elt (&tmp); + tmp.objfile = objfile; + write_exp_elt (ps, &tmp); } void -write_exp_elt_dblcst (DOUBLEST expelt) +write_exp_elt_longcst (struct parser_state *ps, LONGEST expelt) { union exp_element tmp; memset (&tmp, 0, sizeof (union exp_element)); - tmp.doubleconst = expelt; - write_exp_elt (&tmp); + tmp.longconst = expelt; + write_exp_elt (ps, &tmp); } void -write_exp_elt_decfloatcst (gdb_byte expelt[16]) +write_exp_elt_floatcst (struct parser_state *ps, const gdb_byte expelt[16]) { union exp_element tmp; int index; for (index = 0; index < 16; index++) - tmp.decfloatconst[index] = expelt[index]; + tmp.floatconst[index] = expelt[index]; - write_exp_elt (&tmp); + write_exp_elt (ps, &tmp); } void -write_exp_elt_type (struct type *expelt) +write_exp_elt_type (struct parser_state *ps, struct type *expelt) { union exp_element tmp; memset (&tmp, 0, sizeof (union exp_element)); tmp.type = expelt; - write_exp_elt (&tmp); + write_exp_elt (ps, &tmp); } void -write_exp_elt_intern (struct internalvar *expelt) +write_exp_elt_intern (struct parser_state *ps, struct internalvar *expelt) { union exp_element tmp; memset (&tmp, 0, sizeof (union exp_element)); tmp.internalvar = expelt; - write_exp_elt (&tmp); + write_exp_elt (ps, &tmp); } /* Add a string constant to the end of the expression. @@ -349,10 +325,10 @@ write_exp_elt_intern (struct internalvar *expelt) void -write_exp_string (struct stoken str) +write_exp_string (struct parser_state *ps, struct stoken str) { int len = str.length; - int lenelt; + size_t lenelt; char *strdata; /* Compute the number of expression elements required to hold the string @@ -362,28 +338,19 @@ write_exp_string (struct stoken str) lenelt = 2 + BYTES_TO_EXP_ELEM (len + 1); - /* Ensure that we have enough available expression elements to store - everything. */ - - if ((expout_ptr + lenelt) >= expout_size) - { - expout_size = max (expout_size * 2, expout_ptr + lenelt + 10); - expout = (struct expression *) - xrealloc ((char *) expout, (sizeof (struct expression) - + EXP_ELEM_TO_BYTES (expout_size))); - } + increase_expout_size (ps, lenelt); /* Write the leading length expression element (which advances the current expression element index), then write the string constant followed by a terminating null byte, and then write the trailing length expression element. */ - write_exp_elt_longcst ((LONGEST) len); - strdata = (char *) &expout->elts[expout_ptr]; + write_exp_elt_longcst (ps, (LONGEST) len); + strdata = (char *) &ps->expout->elts[ps->expout_ptr]; memcpy (strdata, str.ptr, len); *(strdata + len) = '\0'; - expout_ptr += lenelt - 2; - write_exp_elt_longcst ((LONGEST) len); + ps->expout_ptr += lenelt - 2; + write_exp_elt_longcst (ps, (LONGEST) len); } /* Add a vector of string constants to the end of the expression. @@ -400,9 +367,11 @@ write_exp_string (struct stoken str) long constant, followed by the contents of the string. */ void -write_exp_string_vector (int type, struct stoken_vector *vec) +write_exp_string_vector (struct parser_state *ps, int type, + struct stoken_vector *vec) { - int i, n_slots, len; + int i, len; + size_t n_slots; /* Compute the size. We compute the size in number of slots to avoid issues with string padding. */ @@ -421,28 +390,22 @@ write_exp_string_vector (int type, struct stoken_vector *vec) len = EXP_ELEM_TO_BYTES (n_slots) - 1; n_slots += 4; - if ((expout_ptr + n_slots) >= expout_size) - { - expout_size = max (expout_size * 2, expout_ptr + n_slots + 10); - expout = (struct expression *) - xrealloc ((char *) expout, (sizeof (struct expression) - + EXP_ELEM_TO_BYTES (expout_size))); - } + increase_expout_size (ps, n_slots); - write_exp_elt_opcode (OP_STRING); - write_exp_elt_longcst (len); - write_exp_elt_longcst (type); + write_exp_elt_opcode (ps, OP_STRING); + write_exp_elt_longcst (ps, len); + write_exp_elt_longcst (ps, type); for (i = 0; i < vec->len; ++i) { - write_exp_elt_longcst (vec->tokens[i].length); - memcpy (&expout->elts[expout_ptr], vec->tokens[i].ptr, + write_exp_elt_longcst (ps, vec->tokens[i].length); + memcpy (&ps->expout->elts[ps->expout_ptr], vec->tokens[i].ptr, vec->tokens[i].length); - expout_ptr += BYTES_TO_EXP_ELEM (vec->tokens[i].length); + ps->expout_ptr += BYTES_TO_EXP_ELEM (vec->tokens[i].length); } - write_exp_elt_longcst (len); - write_exp_elt_opcode (OP_STRING); + write_exp_elt_longcst (ps, len); + write_exp_elt_opcode (ps, OP_STRING); } /* Add a bitstring constant to the end of the expression. @@ -457,11 +420,11 @@ write_exp_string_vector (int type, struct stoken_vector *vec) either end of the bitstring. */ void -write_exp_bitstring (struct stoken str) +write_exp_bitstring (struct parser_state *ps, struct stoken str) { int bits = str.length; /* length in bits */ int len = (bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT; - int lenelt; + size_t lenelt; char *strdata; /* Compute the number of expression elements required to hold the bitstring, @@ -470,128 +433,121 @@ write_exp_bitstring (struct stoken str) lenelt = 2 + BYTES_TO_EXP_ELEM (len); - /* Ensure that we have enough available expression elements to store - everything. */ - - if ((expout_ptr + lenelt) >= expout_size) - { - expout_size = max (expout_size * 2, expout_ptr + lenelt + 10); - expout = (struct expression *) - xrealloc ((char *) expout, (sizeof (struct expression) - + EXP_ELEM_TO_BYTES (expout_size))); - } + increase_expout_size (ps, lenelt); /* Write the leading length expression element (which advances the current expression element index), then write the bitstring constant, and then write the trailing length expression element. */ - write_exp_elt_longcst ((LONGEST) bits); - strdata = (char *) &expout->elts[expout_ptr]; + write_exp_elt_longcst (ps, (LONGEST) bits); + strdata = (char *) &ps->expout->elts[ps->expout_ptr]; memcpy (strdata, str.ptr, len); - expout_ptr += lenelt - 2; - write_exp_elt_longcst ((LONGEST) bits); + ps->expout_ptr += lenelt - 2; + write_exp_elt_longcst (ps, (LONGEST) bits); } -/* Add the appropriate elements for a minimal symbol to the end of - the expression. */ +/* Return the type of MSYMBOL, a minimal symbol of OBJFILE. If + ADDRESS_P is not NULL, set it to the MSYMBOL's resolved + address. */ -void -write_exp_msymbol (struct bound_minimal_symbol bound_msym) +type * +find_minsym_type_and_address (minimal_symbol *msymbol, + struct objfile *objfile, + CORE_ADDR *address_p) { - struct minimal_symbol *msymbol = bound_msym.minsym; - struct objfile *objfile = bound_msym.objfile; - struct gdbarch *gdbarch = get_objfile_arch (objfile); - - CORE_ADDR addr = SYMBOL_VALUE_ADDRESS (msymbol); - struct obj_section *section = SYMBOL_OBJ_SECTION (objfile, msymbol); + bound_minimal_symbol bound_msym = {msymbol, objfile}; + struct obj_section *section = MSYMBOL_OBJ_SECTION (objfile, msymbol); enum minimal_symbol_type type = MSYMBOL_TYPE (msymbol); - CORE_ADDR pc; + + bool is_tls = (section != NULL + && section->the_bfd_section->flags & SEC_THREAD_LOCAL); /* The minimal symbol might point to a function descriptor; resolve it to the actual code address instead. */ - pc = gdbarch_convert_from_func_ptr_addr (gdbarch, addr, ¤t_target); - if (pc != addr) + CORE_ADDR addr; + if (is_tls) { - struct bound_minimal_symbol ifunc_msym = lookup_minimal_symbol_by_pc (pc); - - /* In this case, assume we have a code symbol instead of - a data symbol. */ - - if (ifunc_msym.minsym != NULL - && MSYMBOL_TYPE (ifunc_msym.minsym) == mst_text_gnu_ifunc - && SYMBOL_VALUE_ADDRESS (ifunc_msym.minsym) == pc) + /* Addresses of TLS symbols are really offsets into a + per-objfile/per-thread storage block. */ + addr = MSYMBOL_VALUE_RAW_ADDRESS (bound_msym.minsym); + } + else if (msymbol_is_function (objfile, msymbol, &addr)) + { + if (addr != BMSYMBOL_VALUE_ADDRESS (bound_msym)) { - /* A function descriptor has been resolved but PC is still in the - STT_GNU_IFUNC resolver body (such as because inferior does not - run to be able to call it). */ - - type = mst_text_gnu_ifunc; + /* This means we resolved a function descriptor, and we now + have an address for a code/text symbol instead of a data + symbol. */ + if (MSYMBOL_TYPE (msymbol) == mst_data_gnu_ifunc) + type = mst_text_gnu_ifunc; + else + type = mst_text; + section = NULL; } - else - type = mst_text; - section = NULL; - addr = pc; } + else + addr = BMSYMBOL_VALUE_ADDRESS (bound_msym); if (overlay_debugging) addr = symbol_overlayed_address (addr, section); - write_exp_elt_opcode (OP_LONG); - /* Let's make the type big enough to hold a 64-bit address. */ - write_exp_elt_type (objfile_type (objfile)->builtin_core_addr); - write_exp_elt_longcst ((LONGEST) addr); - write_exp_elt_opcode (OP_LONG); - - if (section && section->the_bfd_section->flags & SEC_THREAD_LOCAL) + if (is_tls) { - write_exp_elt_opcode (UNOP_MEMVAL_TLS); - write_exp_elt_objfile (objfile); - write_exp_elt_type (objfile_type (objfile)->nodebug_tls_symbol); - write_exp_elt_opcode (UNOP_MEMVAL_TLS); - return; + /* Skip translation if caller does not need the address. */ + if (address_p != NULL) + *address_p = target_translate_tls_address (objfile, addr); + return objfile_type (objfile)->nodebug_tls_symbol; } - write_exp_elt_opcode (UNOP_MEMVAL); + if (address_p != NULL) + *address_p = addr; + switch (type) { case mst_text: case mst_file_text: case mst_solib_trampoline: - write_exp_elt_type (objfile_type (objfile)->nodebug_text_symbol); - break; + return objfile_type (objfile)->nodebug_text_symbol; case mst_text_gnu_ifunc: - write_exp_elt_type (objfile_type (objfile) - ->nodebug_text_gnu_ifunc_symbol); - break; + return objfile_type (objfile)->nodebug_text_gnu_ifunc_symbol; case mst_data: case mst_file_data: case mst_bss: case mst_file_bss: - write_exp_elt_type (objfile_type (objfile)->nodebug_data_symbol); - break; + return objfile_type (objfile)->nodebug_data_symbol; case mst_slot_got_plt: - write_exp_elt_type (objfile_type (objfile)->nodebug_got_plt_symbol); - break; + return objfile_type (objfile)->nodebug_got_plt_symbol; default: - write_exp_elt_type (objfile_type (objfile)->nodebug_unknown_symbol); - break; + return objfile_type (objfile)->nodebug_unknown_symbol; } - write_exp_elt_opcode (UNOP_MEMVAL); +} + +/* Add the appropriate elements for a minimal symbol to the end of + the expression. */ + +void +write_exp_msymbol (struct parser_state *ps, + struct bound_minimal_symbol bound_msym) +{ + write_exp_elt_opcode (ps, OP_VAR_MSYM_VALUE); + write_exp_elt_objfile (ps, bound_msym.objfile); + write_exp_elt_msym (ps, bound_msym.minsym); + write_exp_elt_opcode (ps, OP_VAR_MSYM_VALUE); } /* Mark the current index as the starting location of a structure expression. This is used when completing on field names. */ void -mark_struct_expression (void) +mark_struct_expression (struct parser_state *ps) { gdb_assert (parse_completion && expout_tag_completion_type == TYPE_CODE_UNDEF); - expout_last_struct = expout_ptr; + expout_last_struct = ps->expout_ptr; } /* Indicate that the current parser invocation is completing a tag. @@ -607,12 +563,9 @@ mark_completion_tag (enum type_code tag, const char *ptr, int length) && expout_last_struct == -1); gdb_assert (tag == TYPE_CODE_UNION || tag == TYPE_CODE_STRUCT - || tag == TYPE_CODE_CLASS || tag == TYPE_CODE_ENUM); expout_tag_completion_type = tag; - expout_completion_name = xmalloc (length + 1); - memcpy (expout_completion_name, ptr, length); - expout_completion_name[length] = '\0'; + expout_completion_name.reset (xstrndup (ptr, length)); } @@ -638,9 +591,9 @@ mark_completion_tag (enum type_code tag, const char *ptr, int length) value in the value history, I.e. $$1 */ void -write_dollar_variable (struct stoken str) +write_dollar_variable (struct parser_state *ps, struct stoken str) { - struct symbol *sym = NULL; + struct block_symbol sym; struct bound_minimal_symbol msym; struct internalvar *isym = NULL; @@ -676,7 +629,7 @@ write_dollar_variable (struct stoken str) /* Handle tokens that refer to machine registers: $ followed by a register name. */ - i = user_reg_map_name_to_regnum (parse_gdbarch, + i = user_reg_map_name_to_regnum (parse_gdbarch (ps), str.ptr + 1, str.length - 1); if (i >= 0) goto handle_register; @@ -686,9 +639,9 @@ write_dollar_variable (struct stoken str) isym = lookup_only_internalvar (copy_name (str) + 1); if (isym) { - write_exp_elt_opcode (OP_INTERNALVAR); - write_exp_elt_intern (isym); - write_exp_elt_opcode (OP_INTERNALVAR); + write_exp_elt_opcode (ps, OP_INTERNALVAR); + write_exp_elt_intern (ps, isym); + write_exp_elt_opcode (ps, OP_INTERNALVAR); return; } @@ -697,38 +650,40 @@ write_dollar_variable (struct stoken str) sym = lookup_symbol (copy_name (str), (struct block *) NULL, VAR_DOMAIN, NULL); - if (sym) + if (sym.symbol) { - write_exp_elt_opcode (OP_VAR_VALUE); - write_exp_elt_block (block_found); /* set by lookup_symbol */ - write_exp_elt_sym (sym); - write_exp_elt_opcode (OP_VAR_VALUE); + write_exp_elt_opcode (ps, OP_VAR_VALUE); + write_exp_elt_block (ps, sym.block); + write_exp_elt_sym (ps, sym.symbol); + write_exp_elt_opcode (ps, OP_VAR_VALUE); return; } msym = lookup_bound_minimal_symbol (copy_name (str)); if (msym.minsym) { - write_exp_msymbol (msym); + write_exp_msymbol (ps, msym); return; } /* Any other names are assumed to be debugger internal variables. */ - write_exp_elt_opcode (OP_INTERNALVAR); - write_exp_elt_intern (create_internalvar (copy_name (str) + 1)); - write_exp_elt_opcode (OP_INTERNALVAR); + write_exp_elt_opcode (ps, OP_INTERNALVAR); + write_exp_elt_intern (ps, create_internalvar (copy_name (str) + 1)); + write_exp_elt_opcode (ps, OP_INTERNALVAR); return; handle_last: - write_exp_elt_opcode (OP_LAST); - write_exp_elt_longcst ((LONGEST) i); - write_exp_elt_opcode (OP_LAST); + write_exp_elt_opcode (ps, OP_LAST); + write_exp_elt_longcst (ps, (LONGEST) i); + write_exp_elt_opcode (ps, OP_LAST); return; handle_register: - write_exp_elt_opcode (OP_REGISTER); + write_exp_elt_opcode (ps, OP_REGISTER); str.length--; str.ptr++; - write_exp_string (str); - write_exp_elt_opcode (OP_REGISTER); + write_exp_string (ps, str); + write_exp_elt_opcode (ps, OP_REGISTER); + innermost_block.update (expression_context_block, + INNERMOST_BLOCK_FOR_REGISTERS); return; } @@ -820,7 +775,7 @@ copy_name (struct stoken token) if (namecopy_size < token.length + 1) { namecopy_size = token.length + 1; - namecopy = xrealloc (namecopy, token.length + 1); + namecopy = (char *) xrealloc (namecopy, token.length + 1); } memcpy (namecopy, token.ptr, token.length); @@ -835,6 +790,7 @@ copy_name (struct stoken token) int prefixify_expression (struct expression *expr) { + gdb_assert (expr->nelts > 0); int len = sizeof (struct expression) + EXP_ELEM_TO_BYTES (expr->nelts); struct expression *temp; int inpos = expr->nelts, outpos = 0; @@ -850,7 +806,7 @@ prefixify_expression (struct expression *expr) /* Return the number of exp_elements in the postfix subexpression of EXPR whose operator is at index ENDPOS - 1 in EXPR. */ -int +static int length_of_subexp (struct expression *expr, int endpos) { int oplen, args; @@ -886,7 +842,7 @@ operator_length_standard (const struct expression *expr, int endpos, { int oplen = 1; int args = 0; - enum f90_range_type range_type; + enum range_type range_type; int i; if (endpos < 1) @@ -903,12 +859,18 @@ operator_length_standard (const struct expression *expr, int endpos, break; case OP_LONG: - case OP_DOUBLE: - case OP_DECFLOAT: + case OP_FLOAT: case OP_VAR_VALUE: + case OP_VAR_MSYM_VALUE: oplen = 4; break; + case OP_FUNC_STATIC_VAR: + oplen = longest_to_int (expr->elts[endpos - 2].longconst); + oplen = 4 + BYTES_TO_EXP_ELEM (oplen + 1); + args = 1; + break; + case OP_TYPE: case OP_BOOL: case OP_LAST: @@ -929,7 +891,7 @@ operator_length_standard (const struct expression *expr, int endpos, break; case TYPE_INSTANCE: - oplen = 4 + longest_to_int (expr->elts[endpos - 2].longconst); + oplen = 5 + longest_to_int (expr->elts[endpos - 2].longconst); args = 1; break; @@ -958,16 +920,12 @@ operator_length_standard (const struct expression *expr, int endpos, args = 1; break; - case UNOP_MEMVAL_TLS: - oplen = 4; - args = 1; - break; - case UNOP_ABS: case UNOP_CAP: case UNOP_CHR: case UNOP_FLOAT: case UNOP_HIGH: + case UNOP_KIND: case UNOP_ODD: case UNOP_ORD: case UNOP_TRUNC: @@ -1028,13 +986,15 @@ operator_length_standard (const struct expression *expr, int endpos, oplen = 2; break; - case OP_F90_RANGE: + case OP_RANGE: oplen = 3; + range_type = (enum range_type) + longest_to_int (expr->elts[endpos - 2].longconst); - range_type = longest_to_int (expr->elts[endpos - 2].longconst); switch (range_type) { case LOW_BOUND_DEFAULT: + case LOW_BOUND_DEFAULT_EXCLUSIVE: case HIGH_BOUND_DEFAULT: args = 1; break; @@ -1042,6 +1002,7 @@ operator_length_standard (const struct expression *expr, int endpos, args = 0; break; case NONE_BOUND_DEFAULT: + case NONE_BOUND_DEFAULT_EXCLUSIVE: args = 2; break; } @@ -1130,20 +1091,12 @@ prefixify_subexp (struct expression *inexpr, If COMMA is nonzero, stop if a comma is reached. */ -struct expression * +expression_up parse_exp_1 (const char **stringptr, CORE_ADDR pc, const struct block *block, - int comma) -{ - return parse_exp_in_context (stringptr, pc, block, comma, 0, NULL); -} - -static struct expression * -parse_exp_in_context (const char **stringptr, CORE_ADDR pc, - const struct block *block, - int comma, int void_context_p, int *out_subexp) + int comma, innermost_block_tracker_types tracker_types) { - return parse_exp_in_context_1 (stringptr, pc, block, comma, - void_context_p, out_subexp); + return parse_exp_in_context (stringptr, pc, block, comma, 0, NULL, + tracker_types); } /* As for parse_exp_1, except that if VOID_CONTEXT_P, then @@ -1153,13 +1106,12 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc, left-hand-side of the struct op. If not doing such completion, it is left untouched. */ -static struct expression * -parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc, - const struct block *block, - int comma, int void_context_p, int *out_subexp) +static expression_up +parse_exp_in_context (const char **stringptr, CORE_ADDR pc, + const struct block *block, + int comma, int void_context_p, int *out_subexp, + innermost_block_tracker_types tracker_types) { - volatile struct gdb_exception except; - struct cleanup *old_chain, *inner_chain; const struct language_defn *lang = NULL; int subexp; @@ -1167,19 +1119,20 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc, prev_lexptr = NULL; paren_depth = 0; - type_stack.depth = 0; + type_stack.elements.clear (); expout_last_struct = -1; expout_tag_completion_type = TYPE_CODE_UNDEF; - xfree (expout_completion_name); - expout_completion_name = NULL; + expout_completion_name.reset (); + innermost_block.reset (tracker_types); comma_terminates = comma; if (lexptr == 0 || *lexptr == 0) error_no_arg (_("expression to compute")); - old_chain = make_cleanup (free_funcalls, 0 /*ignore*/); - funcall_chain = 0; + std::vector funcalls; + scoped_restore save_funcall_chain = make_scoped_restore (&funcall_chain, + &funcalls); expression_context_block = block; @@ -1187,7 +1140,7 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc, if (!expression_context_block) expression_context_block = get_selected_block (&expression_context_pc); else if (pc == 0) - expression_context_pc = BLOCK_START (expression_context_block); + expression_context_pc = BLOCK_ENTRY_PC (expression_context_block); else expression_context_pc = pc; @@ -1198,9 +1151,10 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc, struct symtab_and_line cursal = get_current_source_symtab_and_line (); if (cursal.symtab) expression_context_block - = BLOCKVECTOR_BLOCK (BLOCKVECTOR (cursal.symtab), STATIC_BLOCK); + = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (cursal.symtab), + STATIC_BLOCK); if (expression_context_block) - expression_context_pc = BLOCK_START (expression_context_block); + expression_context_pc = BLOCK_ENTRY_PC (expression_context_block); } if (language_mode == language_mode_auto && block != NULL) @@ -1233,116 +1187,131 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc, While we need CURRENT_LANGUAGE to be set to LANG (for lookup_symbol and others called from *.y) ensure CURRENT_LANGUAGE gets restored to the value matching SELECTED_FRAME as set by get_current_arch. */ - initialize_expout (10, lang, get_current_arch ()); - inner_chain = make_cleanup_restore_current_language (); + + parser_state ps (10, lang, get_current_arch ()); + + scoped_restore_current_language lang_saver; set_language (lang->la_language); - TRY_CATCH (except, RETURN_MASK_ALL) + TRY { - if (lang->la_parser ()) - lang->la_error (NULL); + lang->la_parser (&ps); } - if (except.reason < 0) + CATCH (except, RETURN_MASK_ALL) { - if (! parse_completion) - { - xfree (expout); - throw_exception (except); - } + /* If parsing for completion, allow this to succeed; but if no + expression elements have been written, then there's nothing + to do, so fail. */ + if (! parse_completion || ps.expout_ptr == 0) + throw_exception (except); } + END_CATCH - reallocate_expout (); + /* We have to operate on an "expression *", due to la_post_parser, + which explains this funny-looking double release. */ + expression_up result = ps.release (); /* Convert expression from postfix form as generated by yacc parser, to a prefix form. */ if (expressiondebug) - dump_raw_expression (expout, gdb_stdlog, + dump_raw_expression (result.get (), gdb_stdlog, "before conversion to prefix form"); - subexp = prefixify_expression (expout); + subexp = prefixify_expression (result.get ()); if (out_subexp) *out_subexp = subexp; - lang->la_post_parser (&expout, void_context_p); + lang->la_post_parser (&result, void_context_p); if (expressiondebug) - dump_prefix_expression (expout, gdb_stdlog); - - do_cleanups (inner_chain); - discard_cleanups (old_chain); + dump_prefix_expression (result.get (), gdb_stdlog); *stringptr = lexptr; - return expout; + return result; } /* Parse STRING as an expression, and complain if this fails to use up all of the contents of STRING. */ -struct expression * +expression_up parse_expression (const char *string) { - struct expression *exp; - - exp = parse_exp_1 (&string, 0, 0, 0); + expression_up exp = parse_exp_1 (&string, 0, 0, 0); if (*string) error (_("Junk after end of expression.")); return exp; } +/* Same as parse_expression, but using the given language (LANG) + to parse the expression. */ + +expression_up +parse_expression_with_language (const char *string, enum language lang) +{ + gdb::optional lang_saver; + if (current_language->la_language != lang) + { + lang_saver.emplace (); + set_language (lang); + } + + return parse_expression (string); +} + /* Parse STRING as an expression. If parsing ends in the middle of a field reference, return the type of the left-hand-side of the reference; furthermore, if the parsing ends in the field name, return the field name in *NAME. If the parsing ends in the middle of a field reference, but the reference is somehow invalid, throw - an exception. In all other cases, return NULL. Returned non-NULL - *NAME must be freed by the caller. */ + an exception. In all other cases, return NULL. */ struct type * -parse_expression_for_completion (const char *string, char **name, +parse_expression_for_completion (const char *string, + gdb::unique_xmalloc_ptr *name, enum type_code *code) { - struct expression *exp = NULL; + expression_up exp; struct value *val; int subexp; - volatile struct gdb_exception except; - TRY_CATCH (except, RETURN_MASK_ERROR) + TRY { parse_completion = 1; - exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp); + exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp, + INNERMOST_BLOCK_FOR_SYMBOLS); + } + CATCH (except, RETURN_MASK_ERROR) + { + /* Nothing, EXP remains NULL. */ } + END_CATCH + parse_completion = 0; - if (except.reason < 0 || ! exp) + if (exp == NULL) return NULL; if (expout_tag_completion_type != TYPE_CODE_UNDEF) { *code = expout_tag_completion_type; - *name = expout_completion_name; - expout_completion_name = NULL; + *name = std::move (expout_completion_name); return NULL; } if (expout_last_struct == -1) - { - xfree (exp); - return NULL; - } + return NULL; - *name = extract_field_op (exp, &subexp); - if (!*name) + const char *fieldname = extract_field_op (exp.get (), &subexp); + if (fieldname == NULL) { - xfree (exp); + name->reset (); return NULL; } + name->reset (xstrdup (fieldname)); /* This might throw an exception. If so, we want to let it propagate. */ - val = evaluate_subexpression_type (exp, subexp); - /* (*NAME) is a part of the EXP memory block freed below. */ - *name = xstrdup (*name); - xfree (exp); + val = evaluate_subexpression_type (exp.get (), subexp); return value_type (val); } @@ -1350,102 +1319,27 @@ parse_expression_for_completion (const char *string, char **name, /* A post-parser that does nothing. */ void -null_post_parser (struct expression **exp, int void_context_p) +null_post_parser (expression_up *exp, int void_context_p) { } /* Parse floating point value P of length LEN. - Return 0 (false) if invalid, 1 (true) if valid. - The successfully parsed number is stored in D. - *SUFFIX points to the suffix of the number in P. + Return false if invalid, true if valid. + The successfully parsed number is stored in DATA in + target format for floating-point type TYPE. NOTE: This accepts the floating point syntax that sscanf accepts. */ -int -parse_float (const char *p, int len, DOUBLEST *d, const char **suffix) +bool +parse_float (const char *p, int len, + const struct type *type, gdb_byte *data) { - char *copy; - int n, num; - - copy = xmalloc (len + 1); - memcpy (copy, p, len); - copy[len] = 0; - - num = sscanf (copy, "%" DOUBLEST_SCAN_FORMAT "%n", d, &n); - xfree (copy); - - /* The sscanf man page suggests not making any assumptions on the effect - of %n on the result, so we don't. - That is why we simply test num == 0. */ - if (num == 0) - return 0; - - *suffix = p + n; - return 1; -} - -/* Parse floating point value P of length LEN, using the C syntax for floats. - Return 0 (false) if invalid, 1 (true) if valid. - The successfully parsed number is stored in *D. - Its type is taken from builtin_type (gdbarch) and is stored in *T. */ - -int -parse_c_float (struct gdbarch *gdbarch, const char *p, int len, - DOUBLEST *d, struct type **t) -{ - const char *suffix; - int suffix_len; - const struct builtin_type *builtin_types = builtin_type (gdbarch); - - if (! parse_float (p, len, d, &suffix)) - return 0; - - suffix_len = p + len - suffix; - - if (suffix_len == 0) - *t = builtin_types->builtin_double; - else if (suffix_len == 1) - { - /* Handle suffixes: 'f' for float, 'l' for long double. */ - if (tolower (*suffix) == 'f') - *t = builtin_types->builtin_float; - else if (tolower (*suffix) == 'l') - *t = builtin_types->builtin_long_double; - else - return 0; - } - else - return 0; - - return 1; + return target_float_from_string (data, type, std::string (p, len)); } /* Stuff for maintaining a stack of types. Currently just used by C, but probably useful for any language which declares its types "backwards". */ -/* Ensure that there are HOWMUCH open slots on the type stack STACK. */ - -static void -type_stack_reserve (struct type_stack *stack, int howmuch) -{ - if (stack->depth + howmuch >= stack->size) - { - stack->size *= 2; - if (stack->size < howmuch) - stack->size = howmuch; - stack->elements = xrealloc (stack->elements, - stack->size * sizeof (union type_stack_elt)); - } -} - -/* Ensure that there is a single open slot in the global type stack. */ - -static void -check_type_stack_depth (void) -{ - type_stack_reserve (&type_stack, 1); -} - /* A helper function for insert_type and insert_type_address_space. This does work of expanding the type stack and inserting the new element, ELEMENT, into the stack at location SLOT. */ @@ -1453,20 +1347,15 @@ check_type_stack_depth (void) static void insert_into_type_stack (int slot, union type_stack_elt element) { - check_type_stack_depth (); - - if (slot < type_stack.depth) - memmove (&type_stack.elements[slot + 1], &type_stack.elements[slot], - (type_stack.depth - slot) * sizeof (union type_stack_elt)); - type_stack.elements[slot] = element; - ++type_stack.depth; + gdb_assert (slot <= type_stack.elements.size ()); + type_stack.elements.insert (type_stack.elements.begin () + slot, element); } /* Insert a new type, TP, at the bottom of the type stack. If TP is - tp_pointer or tp_reference, it is inserted at the bottom. If TP is - a qualifier, it is inserted at slot 1 (just above a previous - tp_pointer) if there is anything on the stack, or simply pushed if - the stack is empty. Other values for TP are invalid. */ + tp_pointer, tp_reference or tp_rvalue_reference, it is inserted at the + bottom. If TP is a qualifier, it is inserted at slot 1 (just above a + previous tp_pointer) if there is anything on the stack, or simply pushed + if the stack is empty. Other values for TP are invalid. */ void insert_type (enum type_pieces tp) @@ -1475,12 +1364,13 @@ insert_type (enum type_pieces tp) int slot; gdb_assert (tp == tp_pointer || tp == tp_reference - || tp == tp_const || tp == tp_volatile); + || tp == tp_rvalue_reference || tp == tp_const + || tp == tp_volatile); /* If there is anything on the stack (we know it will be a tp_pointer), insert the qualifier above it. Otherwise, simply push this on the top of the stack. */ - if (type_stack.depth && (tp == tp_const || tp == tp_volatile)) + if (!type_stack.elements.empty () && (tp == tp_const || tp == tp_volatile)) slot = 1; else slot = 0; @@ -1492,15 +1382,17 @@ insert_type (enum type_pieces tp) void push_type (enum type_pieces tp) { - check_type_stack_depth (); - type_stack.elements[type_stack.depth++].piece = tp; + type_stack_elt elt; + elt.piece = tp; + type_stack.elements.push_back (elt); } void push_type_int (int n) { - check_type_stack_depth (); - type_stack.elements[type_stack.depth++].int_val = n; + type_stack_elt elt; + elt.int_val = n; + type_stack.elements.push_back (elt); } /* Insert a tp_space_identifier and the corresponding address space @@ -1512,7 +1404,7 @@ push_type_int (int n) item. */ void -insert_type_address_space (char *string) +insert_type_address_space (struct parser_state *pstate, char *string) { union type_stack_elt element; int slot; @@ -1520,41 +1412,52 @@ insert_type_address_space (char *string) /* If there is anything on the stack (we know it will be a tp_pointer), insert the address space qualifier above it. Otherwise, simply push this on the top of the stack. */ - if (type_stack.depth) + if (!type_stack.elements.empty ()) slot = 1; else slot = 0; element.piece = tp_space_identifier; insert_into_type_stack (slot, element); - element.int_val = address_space_name_to_int (parse_gdbarch, string); + element.int_val = address_space_name_to_int (parse_gdbarch (pstate), + string); insert_into_type_stack (slot, element); } enum type_pieces pop_type (void) { - if (type_stack.depth) - return type_stack.elements[--type_stack.depth].piece; + if (!type_stack.elements.empty ()) + { + type_stack_elt elt = type_stack.elements.back (); + type_stack.elements.pop_back (); + return elt.piece; + } return tp_end; } int pop_type_int (void) { - if (type_stack.depth) - return type_stack.elements[--type_stack.depth].int_val; + if (!type_stack.elements.empty ()) + { + type_stack_elt elt = type_stack.elements.back (); + type_stack.elements.pop_back (); + return elt.int_val; + } /* "Can't happen". */ return 0; } /* Pop a type list element from the global type stack. */ -static VEC (type_ptr) * +static std::vector * pop_typelist (void) { - gdb_assert (type_stack.depth); - return type_stack.elements[--type_stack.depth].typelist_val; + gdb_assert (!type_stack.elements.empty ()); + type_stack_elt elt = type_stack.elements.back (); + type_stack.elements.pop_back (); + return elt.typelist_val; } /* Pop a type_stack element from the global type stack. */ @@ -1562,8 +1465,10 @@ pop_typelist (void) static struct type_stack * pop_type_stack (void) { - gdb_assert (type_stack.depth); - return type_stack.elements[--type_stack.depth].stack_val; + gdb_assert (!type_stack.elements.empty ()); + type_stack_elt elt = type_stack.elements.back (); + type_stack.elements.pop_back (); + return elt.stack_val; } /* Append the elements of the type stack FROM to the type stack TO. @@ -1572,12 +1477,8 @@ pop_type_stack (void) struct type_stack * append_type_stack (struct type_stack *to, struct type_stack *from) { - type_stack_reserve (to, from->depth); - - memcpy (&to->elements[to->depth], &from->elements[0], - from->depth * sizeof (union type_stack_elt)); - to->depth += from->depth; - + to->elements.insert (to->elements.end (), from->elements.begin (), + from->elements.end ()); return to; } @@ -1586,51 +1487,64 @@ append_type_stack (struct type_stack *to, struct type_stack *from) void push_type_stack (struct type_stack *stack) { - check_type_stack_depth (); - type_stack.elements[type_stack.depth++].stack_val = stack; + type_stack_elt elt; + elt.stack_val = stack; + type_stack.elements.push_back (elt); push_type (tp_type_stack); } /* Copy the global type stack into a newly allocated type stack and return it. The global stack is cleared. The returned type stack - must be freed with type_stack_cleanup. */ + must be freed with delete. */ struct type_stack * get_type_stack (void) { - struct type_stack *result = XNEW (struct type_stack); - - *result = type_stack; - type_stack.depth = 0; - type_stack.size = 0; - type_stack.elements = NULL; - + struct type_stack *result = new struct type_stack (std::move (type_stack)); + type_stack.elements.clear (); return result; } -/* A cleanup function that destroys a single type stack. */ - -void -type_stack_cleanup (void *arg) -{ - struct type_stack *stack = arg; - - xfree (stack->elements); - xfree (stack); -} - /* Push a function type with arguments onto the global type stack. LIST holds the argument types. If the final item in LIST is NULL, then the function will be varargs. */ void -push_typelist (VEC (type_ptr) *list) +push_typelist (std::vector *list) { - check_type_stack_depth (); - type_stack.elements[type_stack.depth++].typelist_val = list; + type_stack_elt elt; + elt.typelist_val = list; + type_stack.elements.push_back (elt); push_type (tp_function_with_arguments); } +/* Pop the type stack and return a type_instance_flags that + corresponds the const/volatile qualifiers on the stack. This is + called by the C++ parser when parsing methods types, and as such no + other kind of type in the type stack is expected. */ + +type_instance_flags +follow_type_instance_flags () +{ + type_instance_flags flags = 0; + + for (;;) + switch (pop_type ()) + { + case tp_end: + return flags; + case tp_const: + flags |= TYPE_INSTANCE_FLAG_CONST; + break; + case tp_volatile: + flags |= TYPE_INSTANCE_FLAG_VOLATILE; + break; + default: + gdb_assert_not_reached ("unrecognized tp_ value in follow_types"); + } +} + + /* Pop the type stack and return the type which corresponds to FOLLOW_TYPE as modified by all the stuff on the stack. */ struct type * @@ -1687,18 +1601,22 @@ follow_types (struct type *follow_type) make_addr_space = 0; break; case tp_reference: - follow_type = lookup_reference_type (follow_type); - if (make_const) - follow_type = make_cv_type (make_const, - TYPE_VOLATILE (follow_type), - follow_type, 0); - if (make_volatile) - follow_type = make_cv_type (TYPE_CONST (follow_type), - make_volatile, - follow_type, 0); - if (make_addr_space) - follow_type = make_type_with_address_space (follow_type, - make_addr_space); + follow_type = lookup_lvalue_reference_type (follow_type); + goto process_reference; + case tp_rvalue_reference: + follow_type = lookup_rvalue_reference_type (follow_type); + process_reference: + if (make_const) + follow_type = make_cv_type (make_const, + TYPE_VOLATILE (follow_type), + follow_type, 0); + if (make_volatile) + follow_type = make_cv_type (TYPE_CONST (follow_type), + make_volatile, + follow_type, 0); + if (make_addr_space) + follow_type = make_type_with_address_space (follow_type, + make_addr_space); make_const = make_volatile = 0; make_addr_space = 0; break; @@ -1710,7 +1628,8 @@ follow_types (struct type *follow_type) lookup_array_range_type (follow_type, 0, array_size >= 0 ? array_size - 1 : 0); if (array_size < 0) - TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED (follow_type) = 1; + TYPE_HIGH_BOUND_KIND (TYPE_INDEX_TYPE (follow_type)) + = PROP_UNDEFINED; break; case tp_function: /* FIXME-type-allocation: need a way to free this type when we are @@ -1720,14 +1639,12 @@ follow_types (struct type *follow_type) case tp_function_with_arguments: { - VEC (type_ptr) *args = pop_typelist (); + std::vector *args = pop_typelist (); follow_type = lookup_function_type_with_arguments (follow_type, - VEC_length (type_ptr, args), - VEC_address (type_ptr, - args)); - VEC_free (type_ptr, args); + args->size (), + args->data ()); } break; @@ -1740,7 +1657,7 @@ follow_types (struct type *follow_type) type_stack = *stack; follow_type = follow_types (follow_type); - gdb_assert (type_stack.depth == 0); + gdb_assert (type_stack.elements.empty ()); type_stack = save; } @@ -1791,8 +1708,7 @@ operator_check_standard (struct expression *exp, int pos, { case BINOP_VAL: case OP_COMPLEX: - case OP_DECFLOAT: - case OP_DOUBLE: + case OP_FLOAT: case OP_LONG: case OP_SCOPE: case OP_TYPE: @@ -1805,24 +1721,19 @@ operator_check_standard (struct expression *exp, int pos, case TYPE_INSTANCE: { - LONGEST arg, nargs = elts[pos + 1].longconst; + LONGEST arg, nargs = elts[pos + 2].longconst; for (arg = 0; arg < nargs; arg++) { - struct type *type = elts[pos + 2 + arg].type; - struct objfile *objfile = TYPE_OBJFILE (type); + struct type *inst_type = elts[pos + 3 + arg].type; + struct objfile *inst_objfile = TYPE_OBJFILE (inst_type); - if (objfile && (*objfile_func) (objfile, data)) + if (inst_objfile && (*objfile_func) (inst_objfile, data)) return 1; } } break; - case UNOP_MEMVAL_TLS: - objfile = elts[pos + 1].objfile; - type = elts[pos + 2].type; - break; - case OP_VAR_VALUE: { const struct block *const block = elts[pos + 1].block; @@ -1830,7 +1741,7 @@ operator_check_standard (struct expression *exp, int pos, /* Check objfile where the variable itself is placed. SYMBOL_OBJ_SECTION (symbol) may be NULL. */ - if ((*objfile_func) (SYMBOL_SYMTAB (symbol)->objfile, data)) + if ((*objfile_func) (symbol_objfile (symbol), data)) return 1; /* Check objfile where is placed the code touching the variable. */ @@ -1839,6 +1750,9 @@ operator_check_standard (struct expression *exp, int pos, type = SYMBOL_TYPE (symbol); } break; + case OP_VAR_MSYM_VALUE: + objfile = elts[pos + 1].objfile; + break; } /* Invoke callbacks for TYPE and OBJFILE if they were set as non-NULL. */ @@ -1852,12 +1766,12 @@ operator_check_standard (struct expression *exp, int pos, return 0; } -/* Call OBJFILE_FUNC for any TYPE and OBJFILE found being referenced by EXP. - The functions are never called with NULL OBJFILE. Functions get passed an - arbitrary caller supplied DATA pointer. If any of the functions returns - non-zero value then (any other) non-zero value is immediately returned to - the caller. Otherwise zero is returned after iterating through whole EXP. - */ +/* Call OBJFILE_FUNC for any objfile found being referenced by EXP. + OBJFILE_FUNC is never called with NULL OBJFILE. OBJFILE_FUNC get + passed an arbitrary caller supplied DATA pointer. If OBJFILE_FUNC + returns non-zero value then (any other) non-zero value is immediately + returned to the caller. Otherwise zero is returned after iterating + through whole EXP. */ static int exp_iterate (struct expression *exp, @@ -1889,7 +1803,7 @@ exp_iterate (struct expression *exp, static int exp_uses_objfile_iter (struct objfile *exp_objfile, void *objfile_voidp) { - struct objfile *objfile = objfile_voidp; + struct objfile *objfile = (struct objfile *) objfile_voidp; if (exp_objfile->separate_debug_objfile_backlink) exp_objfile = exp_objfile->separate_debug_objfile_backlink; @@ -1909,13 +1823,25 @@ exp_uses_objfile (struct expression *exp, struct objfile *objfile) return exp_iterate (exp, exp_uses_objfile_iter, objfile); } +/* See definition in parser-defs.h. */ + void -_initialize_parse (void) +increase_expout_size (struct parser_state *ps, size_t lenelt) { - type_stack.size = 0; - type_stack.depth = 0; - type_stack.elements = NULL; + if ((ps->expout_ptr + lenelt) >= ps->expout_size) + { + ps->expout_size = std::max (ps->expout_size * 2, + ps->expout_ptr + lenelt + 10); + ps->expout.reset (XRESIZEVAR (expression, + ps->expout.release (), + (sizeof (struct expression) + + EXP_ELEM_TO_BYTES (ps->expout_size)))); + } +} +void +_initialize_parse (void) +{ add_setshow_zuinteger_cmd ("expression", class_maintenance, &expressiondebug, _("Set expression debugging."),