Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
/* Type stack for GDB parser.
|
|
|
|
|
2020-01-01 14:20:01 +08:00
|
|
|
Copyright (C) 1986-2020 Free Software Foundation, Inc.
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
|
|
|
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/>. */
|
|
|
|
|
|
|
|
#ifndef TYPE_STACK_H
|
|
|
|
#define TYPE_STACK_H
|
|
|
|
|
Don't include gdbarch.h from defs.h
I touched symtab.h and was surprised to see how many files were
rebuilt. I looked into it a bit, and found that defs.h includes
gdbarch.h, which in turn includes many things.
gdbarch.h is only needed by a minority ofthe files in gdb, so this
patch removes the include from defs.h and updates the fallout.
I did "wc -l" on the files in build/gdb/.deps; this patch reduces the
line count from 139935 to 137030; so there are definitely future
build-time savings here.
Note that while I configured with --enable-targets=all, it's possible
that some *-nat.c file needs an update. I could not test all of
these. The buildbot caught a few problems along these lines.
gdb/ChangeLog
2019-07-10 Tom Tromey <tom@tromey.com>
* defs.h: Don't include gdbarch.h.
* aarch64-ravenscar-thread.c, aarch64-tdep.c, alpha-bsd-tdep.h,
alpha-linux-tdep.c, alpha-mdebug-tdep.c, arch-utils.h, arm-tdep.h,
ax-general.c, btrace.c, buildsym-legacy.c, buildsym.h, c-lang.c,
cli/cli-decode.h, cli/cli-dump.c, cli/cli-script.h,
cli/cli-style.h, coff-pe-read.h, compile/compile-c-support.c,
compile/compile-cplus.h, compile/compile-loc2c.c, corefile.c,
cp-valprint.c, cris-linux-tdep.c, ctf.c, d-lang.c, d-namespace.c,
dcache.c, dicos-tdep.c, dictionary.c, disasm-selftests.c,
dummy-frame.c, dummy-frame.h, dwarf2-frame-tailcall.c,
dwarf2expr.c, expression.h, f-lang.c, frame-base.c,
frame-unwind.c, frv-linux-tdep.c, gdbarch-selftests.c, gdbtypes.h,
go-lang.c, hppa-nbsd-tdep.c, hppa-obsd-tdep.c, i386-dicos-tdep.c,
i386-tdep.h, ia64-vms-tdep.c, interps.h, language.c,
linux-record.c, location.h, m2-lang.c, m32r-linux-tdep.c,
mem-break.c, memattr.c, mn10300-linux-tdep.c, nios2-linux-tdep.c,
objfiles.h, opencl-lang.c, or1k-linux-tdep.c, p-lang.c,
parser-defs.h, ppc-tdep.h, probe.h, python/py-record-btrace.c,
record-btrace.c, record.h, regcache-dump.c, regcache.h,
riscv-fbsd-tdep.c, riscv-linux-tdep.c, rust-exp.y,
sh-linux-tdep.c, sh-nbsd-tdep.c, source-cache.c,
sparc-nbsd-tdep.c, sparc-obsd-tdep.c, sparc-ravenscar-thread.c,
sparc64-fbsd-tdep.c, std-regs.c, target-descriptions.h,
target-float.c, tic6x-linux-tdep.c, tilegx-linux-tdep.c, top.c,
tracefile.c, trad-frame.c, type-stack.h, ui-style.c, utils.c,
utils.h, valarith.c, valprint.c, varobj.c, x86-tdep.c,
xml-support.h, xtensa-linux-tdep.c, cli/cli-cmds.h: Update.
* s390-linux-nat.c, procfs.c, inf-ptrace.c: Likewise.
2019-06-10 05:21:02 +08:00
|
|
|
#include "gdbtypes.h"
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
#include <vector>
|
|
|
|
|
|
|
|
struct type;
|
|
|
|
struct expr_builder;
|
|
|
|
|
|
|
|
/* For parsing of complicated types.
|
|
|
|
An array should be preceded in the list by the size of the array. */
|
|
|
|
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,
|
Add C parser support for "restrict" and "_Atomic"
A user noticed that "watch -location" would fail with a "restrict"
pointer. The issue here is that if the DWARF mentions "restrict", gdb
will put this into the type name -- but then the C parser will not be
able to parse this type.
This patch adds support for "restrict" and "_Atomic" to the C parser.
C++ doesn't have "restrict", but does have some GCC extensions. The
type printer is changed to handle this difference as well, so that
watch expressions will work properly.
gdb/ChangeLog
2020-03-14 Tom Tromey <tom@tromey.com>
* c-typeprint.c (cp_type_print_method_args): Print "__restrict__"
for C++.
(c_type_print_modifier): Likewise. Add "language" parameter.
(c_type_print_varspec_prefix, c_type_print_base_struct_union)
(c_type_print_base_1): Update.
* type-stack.h (enum type_pieces) <tp_atomic, tp_restrict>: New
constants.
* type-stack.c (type_stack::insert): Handle tp_atomic and
tp_restrict.
(type_stack::follow_type_instance_flags): Likewise.
(type_stack::follow_types): Likewise. Merge type-following code.
* c-exp.y (RESTRICT, ATOMIC): New tokens.
(space_identifier, cv_with_space_id)
(const_or_volatile_or_space_identifier_noopt)
(const_or_volatile_or_space_identifier): Remove.
(single_qualifier, qualifier_seq_noopt, qualifier_seq): New
rules.
(ptr_operator, typebase): Update.
(enum token_flag) <FLAG_C>: New constant.
(ident_tokens): Add "restrict", "__restrict__", "__restrict", and
"_Atomic".
(lex_one_token): Handle FLAG_C.
gdb/testsuite/ChangeLog
2020-03-14 Tom Tromey <tom@tromey.com>
* gdb.base/cvexpr.exp: Add test for _Atomic and restrict.
2020-03-15 02:11:42 +08:00
|
|
|
tp_atomic,
|
|
|
|
tp_restrict,
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
tp_type_stack,
|
|
|
|
tp_kind
|
|
|
|
};
|
|
|
|
|
|
|
|
/* The stack can contain either an enum type_pieces or an int. */
|
|
|
|
union type_stack_elt
|
|
|
|
{
|
|
|
|
enum type_pieces piece;
|
|
|
|
int int_val;
|
|
|
|
struct type_stack *stack_val;
|
|
|
|
std::vector<struct type *> *typelist_val;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* The type stack is an instance of this structure. */
|
|
|
|
|
|
|
|
struct type_stack
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
|
|
|
|
type_stack () = default;
|
|
|
|
|
|
|
|
DISABLE_COPY_AND_ASSIGN (type_stack);
|
|
|
|
|
|
|
|
type_stack *create ()
|
|
|
|
{
|
|
|
|
type_stack *result = new type_stack ();
|
|
|
|
result->m_elements = std::move (m_elements);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Insert a new type, TP, at the bottom of the type stack. If TP is
|
|
|
|
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 (enum type_pieces tp);
|
|
|
|
|
|
|
|
void push (enum type_pieces tp)
|
|
|
|
{
|
|
|
|
type_stack_elt elt;
|
|
|
|
elt.piece = tp;
|
|
|
|
m_elements.push_back (elt);
|
|
|
|
}
|
|
|
|
|
|
|
|
void push (int n)
|
|
|
|
{
|
|
|
|
type_stack_elt elt;
|
|
|
|
elt.int_val = n;
|
|
|
|
m_elements.push_back (elt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Push the type stack STACK as an element on this type stack. */
|
|
|
|
|
|
|
|
void push (struct type_stack *stack)
|
|
|
|
{
|
|
|
|
type_stack_elt elt;
|
|
|
|
elt.stack_val = stack;
|
|
|
|
m_elements.push_back (elt);
|
|
|
|
push (tp_type_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 (std::vector<struct type *> *list)
|
|
|
|
{
|
|
|
|
type_stack_elt elt;
|
|
|
|
elt.typelist_val = list;
|
|
|
|
m_elements.push_back (elt);
|
|
|
|
push (tp_function_with_arguments);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum type_pieces pop ()
|
|
|
|
{
|
|
|
|
if (m_elements.empty ())
|
|
|
|
return tp_end;
|
|
|
|
type_stack_elt elt = m_elements.back ();
|
|
|
|
m_elements.pop_back ();
|
|
|
|
return elt.piece;
|
|
|
|
}
|
|
|
|
|
|
|
|
int pop_int ()
|
|
|
|
{
|
|
|
|
if (m_elements.empty ())
|
|
|
|
{
|
|
|
|
/* "Can't happen". */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
type_stack_elt elt = m_elements.back ();
|
|
|
|
m_elements.pop_back ();
|
|
|
|
return elt.int_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
std::vector<struct type *> *pop_typelist ()
|
|
|
|
{
|
|
|
|
gdb_assert (!m_elements.empty ());
|
|
|
|
type_stack_elt elt = m_elements.back ();
|
|
|
|
m_elements.pop_back ();
|
|
|
|
return elt.typelist_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Pop a type_stack element. */
|
|
|
|
|
|
|
|
struct type_stack *pop_type_stack ()
|
|
|
|
{
|
|
|
|
gdb_assert (!m_elements.empty ());
|
|
|
|
type_stack_elt elt = m_elements.back ();
|
|
|
|
m_elements.pop_back ();
|
|
|
|
return elt.stack_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Insert a tp_space_identifier and the corresponding address space
|
|
|
|
value into the stack. STRING is the name of an address space, as
|
2020-09-15 04:16:57 +08:00
|
|
|
recognized by address_space_name_to_type_instance_flags. If the
|
|
|
|
stack is empty, the new elements are simply pushed. If the stack
|
|
|
|
is not empty, this function assumes that the first item on the
|
|
|
|
stack is a tp_pointer, and the new values are inserted above the
|
|
|
|
first item. */
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
2019-04-08 05:29:58 +08:00
|
|
|
void insert (struct expr_builder *pstate, const char *string);
|
Move type stack handling to a new class
This introduces a new "type_stack" class, and moves all the parser
type stack handling to this class. Parsers that wish to use this
facility must now instantiate this class somehow. I chose this
approach because a minority of the existing parsers require this.
gdb/ChangeLog
2019-04-04 Tom Tromey <tom@tromey.com>
* type-stack.h: New file.
* type-stack.c: New file.
* parser-defs.h (enum type_pieces, union type_stack_elt): Move to
type-stack.h.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Don't declare.
* parse.c (type_stack): Remove global.
(parse_exp_in_context): Update.
(insert_into_type_stack, insert_type, push_type, push_type_int)
(insert_type_address_space, pop_type, pop_type_int)
(pop_typelist, pop_type_stack, append_type_stack)
(push_type_stack, get_type_stack, push_typelist)
(follow_type_instance_flags, follow_types): Remove (moved to
type-stack.c).
* f-exp.y (type_stack): New global.
Update rules.
(push_kind_type, f_parse): Update.
* d-exp.y (type_stack): New global.
Update rules.
(d_parse): Update.
* c-exp.y (struct c_parse_state) <type_stack>: New member.
Update rules.
* Makefile.in (COMMON_SFILES): Add type-stack.c.
(HFILES_NO_SRCDIR): Add type-stack.h.
2019-04-01 03:43:54 +08:00
|
|
|
|
|
|
|
/* Append the elements of the type stack FROM to the type stack
|
|
|
|
THIS. Always returns THIS. */
|
|
|
|
|
|
|
|
struct type_stack *append (struct type_stack *from)
|
|
|
|
{
|
|
|
|
m_elements.insert (m_elements.end (), from->m_elements.begin (),
|
|
|
|
from->m_elements.end ());
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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 ();
|
|
|
|
|
|
|
|
/* Pop the type stack and return the type which corresponds to
|
|
|
|
FOLLOW_TYPE as modified by all the stuff on the stack. */
|
|
|
|
struct type *follow_types (struct type *follow_type);
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
|
|
|
void insert_into (int slot, union type_stack_elt element)
|
|
|
|
{
|
|
|
|
gdb_assert (slot <= m_elements.size ());
|
|
|
|
m_elements.insert (m_elements.begin () + slot, element);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Elements on the stack. */
|
|
|
|
std::vector<union type_stack_elt> m_elements;
|
|
|
|
};
|
|
|
|
|
|
|
|
#endif /* TYPE_STACK_H */
|