mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-25 11:04:18 +08:00
410a0ff2df
This commit removes the "expout*" globals from our parser code, turning them into a structure that is passed when an expression needs to be evaluated. This is the initial step to make our parser less "globalized". This is mostly a mechanical patch, which creates a structure containing the "expout*" globals and then modify all the functions that handle them in order to take the structure as argument. It is big, and has been reviewed at least 4 times, so I think everything is covered. Below you can see the message links from the discussions: - First attempt: <https://sourceware.org/ml/gdb-patches/2012-01/msg00522.html> Message-ID: <m3k44s7qej.fsf@gmail.com> - Second attempt: <https://sourceware.org/ml/gdb-patches/2012-06/msg00054.html> Message-Id: <1338665528-5932-1-git-send-email-sergiodj@redhat.com> - Third attempt: <https://sourceware.org/ml/gdb-patches/2014-01/msg00949.html> Message-Id: <1390629467-27139-1-git-send-email-sergiodj@redhat.com> - Fourth (last) attempt: <https://sourceware.org/ml/gdb-patches/2014-03/msg00546.html> Message-Id: <1395463432-29750-1-git-send-email-sergiodj@redhat.com> gdb/ 2014-03-27 Sergio Durigan Junior <sergiodj@redhat.com> Remove some globals from our parser. * language.c (unk_lang_parser): Add "struct parser_state" argument. * language.h (struct language_defn) <la_parser>: Likewise. * parse.c (expout, expout_size, expout_ptr): Remove variables. (initialize_expout): Add "struct parser_state" argument. Rewrite function to use the parser state. (reallocate_expout, write_exp_elt, write_exp_elt_opcode, write_exp_elt_sym, write_exp_elt_block, write_exp_elt_objfile, write_exp_elt_longcst, write_exp_elt_dblcst, write_exp_elt_decfloatcst, write_exp_elt_type, write_exp_elt_intern, write_exp_string, write_exp_string_vector, write_exp_bitstring, write_exp_msymbol, mark_struct_expression, write_dollar_variable): Likewise. (parse_exp_in_context_1): Use parser state. (insert_type_address_space): Add "struct parser_state" argument. Use parser state. (increase_expout_size): New function. * parser-defs.h: Forward declare "struct language_defn" and "struct parser_state". (expout, expout_size, expout_ptr): Remove extern declarations. (parse_gdbarch, parse_language): Rewrite macro declarations to accept the parser state. (struct parser_state): New struct. (initialize_expout, reallocate_expout, write_exp_elt_opcode, write_exp_elt_sym, write_exp_elt_longcst, write_exp_elt_dblcst, write_exp_elt_decfloatcst, write_exp_elt_type, write_exp_elt_intern, write_exp_string, write_exp_string_vector, write_exp_bitstring, write_exp_elt_block, write_exp_elt_objfile, write_exp_msymbol, write_dollar_variable, mark_struct_expression, insert_type_address_space): Add "struct parser_state" argument. (increase_expout_size): New function. * utils.c (do_clear_parser_state): New function. (make_cleanup_clear_parser_state): Likewise. * utils.h (make_cleanup_clear_parser_state): New function prototype. * aarch64-linux-tdep.c (aarch64_stap_parse_special_token): Update calls to write_exp* in order to pass the parser state. * arm-linux-tdep.c (arm_stap_parse_special_token): Likewise. * i386-tdep.c (i386_stap_parse_special_token_triplet): Likewise. (i386_stap_parse_special_token_three_arg_disp): Likewise. * ppc-linux-tdep.c (ppc_stap_parse_special_token): Likewise. * stap-probe.c (stap_parse_register_operand): Likewise. (stap_parse_single_operand): Likewise. (stap_parse_argument_1): Likewise. (stap_parse_argument): Use parser state. * stap-probe.h: Include "parser-defs.h". (struct stap_parse_info) <pstate>: New field. * c-exp.y (parse_type): Rewrite to use parser state. (yyparse): Redefine to c_parse_internal. (pstate): New global variable. (parse_number): Add "struct parser_state" argument. (write_destructor_name): Likewise. (type_exp): Update calls to write_exp* and similars in order to use parser state. (exp1, exp, variable, qualified_name, space_identifier, typename, typebase): Likewise. (write_destructor_name, parse_number, lex_one_token, classify_name, classify_inner_name, c_parse): Add "struct parser_state" argument. Update function to use parser state. * c-lang.h: Forward declare "struct parser_state". (c_parse): Add "struct parser_state" argument. * ada-exp.y (parse_type): Rewrite macro to use parser state. (yyparse): Redefine macro to ada_parse_internal. (pstate): New variable. (write_int, write_object_renaming, write_var_or_type, write_name_assoc, write_exp_op_with_string, write_ambiguous_var, type_int, type_long, type_long_long, type_float, type_double, type_long_double, type_char, type_boolean, type_system_address): Add "struct parser_state" argument. (exp1, primary, simple_exp, relation, and_exp, and_then_exp, or_exp, or_else_exp, xor_exp, type_prefix, opt_type_prefix, var_or_type, aggregate, aggregate_component_list, positional_list, others, component_group, component_associations): Update calls to write_exp* and similar functions in order to use parser state. (ada_parse, write_var_from_sym, write_int, write_exp_op_with_string, write_object_renaming, find_primitive_type, write_selectors, write_ambiguous_var, write_var_or_type, write_name_assoc, type_int, type_long, type_long_long, type_float, type_double, type_long_double, type_char, type_boolean, type_system_address): Add "struct parser_state" argument. Adjust function to use parser state. * ada-lang.c (parse): Likewise. * ada-lang.h: Forward declare "struct parser_state". (ada_parse): Add "struct parser_state" argument. * ada-lex.l (processInt, processReal): Likewise. Adjust all calls to both functions. * f-exp.y (parse_type, parse_f_type): Rewrite macros to use parser state. (yyparse): Redefine macro to f_parse_internal. (pstate): New variable. (parse_number): Add "struct parser_state" argument. (type_exp, exp, subrange, typebase): Update calls to write_exp* and similars in order to use parser state. (parse_number): Adjust code to use parser state. (yylex): Likewise. (f_parse): New function. * f-lang.h: Forward declare "struct parser_state". (f_parse): Add "struct parser_state" argument. * jv-exp.y (parse_type, parse_java_type): Rewrite macros to use parser state. (yyparse): Redefine macro for java_parse_internal. (pstate): New variable. (push_expression_name, push_expression_name, insert_exp): Add "struct parser_state" argument. (type_exp, StringLiteral, Literal, PrimitiveType, IntegralType, FloatingPointType, exp1, PrimaryNoNewArray, FieldAccess, FuncStart, MethodInvocation, ArrayAccess, PostfixExpression, PostIncrementExpression, PostDecrementExpression, UnaryExpression, PreIncrementExpression, PreDecrementExpression, UnaryExpressionNotPlusMinus, CastExpression, MultiplicativeExpression, AdditiveExpression, ShiftExpression, RelationalExpression, EqualityExpression, AndExpression, ExclusiveOrExpression, InclusiveOrExpression, ConditionalAndExpression, ConditionalOrExpression, ConditionalExpression, Assignment, LeftHandSide): Update calls to write_exp* and similars in order to use parser state. (parse_number): Ajust code to use parser state. (yylex): Likewise. (java_parse): New function. (push_variable): Add "struct parser_state" argument. Adjust code to user parser state. (push_fieldnames, push_qualified_expression_name, push_expression_name, insert_exp): Likewise. * jv-lang.h: Forward declare "struct parser_state". (java_parse): Add "struct parser_state" argument. * m2-exp.y (parse_type, parse_m2_type): Rewrite macros to use parser state. (yyparse): Redefine macro to m2_parse_internal. (pstate): New variable. (type_exp, exp, fblock, variable, type): Update calls to write_exp* and similars to use parser state. (yylex): Likewise. (m2_parse): New function. * m2-lang.h: Forward declare "struct parser_state". (m2_parse): Add "struct parser_state" argument. * objc-lang.c (end_msglist): Add "struct parser_state" argument. * objc-lang.h: Forward declare "struct parser_state". (end_msglist): Add "struct parser_state" argument. * p-exp.y (parse_type): Rewrite macro to use parser state. (yyparse): Redefine macro to pascal_parse_internal. (pstate): New variable. (parse_number): Add "struct parser_state" argument. (type_exp, exp1, exp, qualified_name, variable): Update calls to write_exp* and similars in order to use parser state. (parse_number, yylex): Adjust code to use parser state. (pascal_parse): New function. * p-lang.h: Forward declare "struct parser_state". (pascal_parse): Add "struct parser_state" argument. * go-exp.y (parse_type): Rewrite macro to use parser state. (yyparse): Redefine macro to go_parse_internal. (pstate): New variable. (parse_number): Add "struct parser_state" argument. (type_exp, exp1, exp, variable, type): Update calls to write_exp* and similars in order to use parser state. (parse_number, lex_one_token, classify_name, yylex): Adjust code to use parser state. (go_parse): Likewise. * go-lang.h: Forward declare "struct parser_state". (go_parse): Add "struct parser_state" argument.
146 lines
4.1 KiB
C
146 lines
4.1 KiB
C
/* C language support definitions for GDB, the GNU debugger.
|
|
|
|
Copyright (C) 1992-2014 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 (C_LANG_H)
|
|
#define C_LANG_H 1
|
|
|
|
struct ui_file;
|
|
struct language_arch_info;
|
|
struct type_print_options;
|
|
struct parser_state;
|
|
|
|
#include "value.h"
|
|
#include "macroexp.h"
|
|
#include "parser-defs.h"
|
|
|
|
|
|
/* The various kinds of C string and character. Note that these
|
|
values are chosen so that they may be or'd together in certain
|
|
ways. */
|
|
enum c_string_type
|
|
{
|
|
/* An ordinary string: "value". */
|
|
C_STRING = 0,
|
|
/* A wide string: L"value". */
|
|
C_WIDE_STRING = 1,
|
|
/* A 16-bit Unicode string: u"value". */
|
|
C_STRING_16 = 2,
|
|
/* A 32-bit Unicode string: U"value". */
|
|
C_STRING_32 = 3,
|
|
/* An ordinary char: 'v'. This can also be or'd with one of the
|
|
above to form the corresponding CHAR value from a STRING
|
|
value. */
|
|
C_CHAR = 4,
|
|
/* A wide char: L'v'. */
|
|
C_WIDE_CHAR = 5,
|
|
/* A 16-bit Unicode char: u'v'. */
|
|
C_CHAR_16 = 6,
|
|
/* A 32-bit Unicode char: U'v'. */
|
|
C_CHAR_32 = 7
|
|
};
|
|
|
|
/* Defined in c-exp.y. */
|
|
|
|
extern int c_parse (struct parser_state *);
|
|
|
|
extern void c_error (char *);
|
|
|
|
extern int c_parse_escape (const char **, struct obstack *);
|
|
|
|
/* Defined in c-typeprint.c */
|
|
extern void c_print_type (struct type *, const char *,
|
|
struct ui_file *, int, int,
|
|
const struct type_print_options *);
|
|
|
|
extern void c_print_typedef (struct type *,
|
|
struct symbol *,
|
|
struct ui_file *);
|
|
|
|
extern void c_val_print (struct type *, const gdb_byte *,
|
|
int, CORE_ADDR,
|
|
struct ui_file *, int,
|
|
const struct value *,
|
|
const struct value_print_options *);
|
|
|
|
extern void c_value_print (struct value *, struct ui_file *,
|
|
const struct value_print_options *);
|
|
|
|
/* These are in c-lang.c: */
|
|
|
|
extern struct value *evaluate_subexp_c (struct type *expect_type,
|
|
struct expression *exp,
|
|
int *pos,
|
|
enum noside noside);
|
|
|
|
extern void c_printchar (int, struct type *, struct ui_file *);
|
|
|
|
extern void c_printstr (struct ui_file * stream,
|
|
struct type *elttype,
|
|
const gdb_byte *string,
|
|
unsigned int length,
|
|
const char *user_encoding,
|
|
int force_ellipses,
|
|
const struct value_print_options *options);
|
|
|
|
extern void c_language_arch_info (struct gdbarch *gdbarch,
|
|
struct language_arch_info *lai);
|
|
|
|
extern const struct exp_descriptor exp_descriptor_c;
|
|
|
|
extern void c_emit_char (int c, struct type *type,
|
|
struct ui_file *stream, int quoter);
|
|
|
|
extern const struct op_print c_op_print_tab[];
|
|
|
|
/* These are in c-typeprint.c: */
|
|
|
|
extern void c_type_print_base (struct type *, struct ui_file *,
|
|
int, int, const struct type_print_options *);
|
|
|
|
/* These are in cp-valprint.c */
|
|
|
|
extern void cp_print_class_member (const gdb_byte *, struct type *,
|
|
struct ui_file *, char *);
|
|
|
|
extern void cp_print_value_fields (struct type *, struct type *,
|
|
const gdb_byte *, int, CORE_ADDR,
|
|
struct ui_file *, int,
|
|
const struct value *,
|
|
const struct value_print_options *,
|
|
struct type **, int);
|
|
|
|
extern void cp_print_value_fields_rtti (struct type *,
|
|
const gdb_byte *, int, CORE_ADDR,
|
|
struct ui_file *, int,
|
|
const struct value *,
|
|
const struct value_print_options *,
|
|
struct type **, int);
|
|
|
|
extern int cp_is_vtbl_ptr_type (struct type *);
|
|
|
|
extern int cp_is_vtbl_member (struct type *);
|
|
|
|
/* These are in c-valprint.c. */
|
|
|
|
extern int c_textual_element_type (struct type *, char);
|
|
|
|
|
|
#endif /* !defined (C_LANG_H) */
|