2022-01-01 22:56:03 +08:00
|
|
|
/* Copyright (C) 2006-2022 Free Software Foundation, Inc.
|
2017-09-05 16:54:53 +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/>. */
|
|
|
|
|
2019-01-28 03:51:36 +08:00
|
|
|
#ifndef COMMON_TDESC_H
|
|
|
|
#define COMMON_TDESC_H
|
2017-09-05 16:54:53 +08:00
|
|
|
|
|
|
|
struct tdesc_feature;
|
|
|
|
struct tdesc_type;
|
Split tdesc_type into multiple classes
This patch makes tdesc_type an abstract base class and creates three
subclasses:
- tdesc_type_builtin, for builtin types
- tdesc_type_vector, for vector types
- tdesc_type_with_fields, for struct, union, flag and enum types
This allows getting rid of the union in tdesc_type and to not allow the
std::vector separately. I tried to go further and create separate
classes for struct, union, flag and enum, but it proved too difficult.
One problem is that from the point of the of the target description
code, the types tdesc_type_* are opaque (only forward-declared).
Therefore, it doesn't know about inheritance relationship between those
classes. This makes it impossible to make functions that accept a
pointer to a base class and pass a pointer to a derived class, for
example. I think this patch here is a good compromise, and if somebody
wants to improve things further, the door is open.
A make_gdb_type virtual pure method is added to tdesc_type, which
replaces the current tdesc_gdb_type function. Calling this method on a
tdesc_type returns the corresponding built gdb type.
gdb/ChangeLog:
* target-descriptions.c (struct tdesc_type): Use default
destructor.
<u>: Remove.
<accept>: Remove.
(struct tdesc_type_builtin): New.
(struct tdesc_type_vector): New.
(struct tdesc_type_with_fields): New.
(tdesc_predefined_types): Change type to tdesc_type_builtin[].
(tdesc_gdb_type): Remove.
(tdesc_register_type): Adjust.
(tdesc_create_vector): Create tdesc_type_vector.
(tdesc_create_struct): Create tdesc_type_with_fields.
(tdesc_set_struct_size): Change parameter type.
(tdesc_create_union): Create tdesc_type_with_fields.
(tdesc_create_flags): Likewise.
(tdesc_create_enum): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_add_typed_bitfield): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
(tdesc_add_enum_value): Likewise.
(print_c_tdesc) <visit>: Remove overload with tdesc_type
parameter, add overloads for tdesc_type_builtin,
tdesc_type_with_fields and tdesc_type_vector.
<m_printed_type>: Remove.
<m_printed_element_type, m_printed_type_with_fields>: Add.
* target-descriptions.h (tdesc_create_enum): Change return type.
(tdesc_add_typed_bitfield): Change parameter type.
(tdesc_add_enum_value): Change parameter type.
* xml-tdesc.c (struct tdesc_parsing_data) <current_type>: Change
type to tdesc_type_with_fields.
(tdesc_start_struct): Adjust.
(tdesc_start_flags): Adjust.
(tdesc_start_enum): Adjust.
(tdesc_start_field): Adjust.
* arch/tdesc.h (struct tdesc_type_builtin): Forward-declare.
(struct tdesc_type_vector): Forward-declare.
(struct tdesc_type_with_fields): Forward-declare.
(tdesc_create_struct): Change return type.
(tdesc_create_union): Likewise.
(tdesc_create_flags): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_set_struct_size): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
* features: Re-generate C files.
gdb/gdbserver/ChangeLog:
* tdesc.c (struct tdesc_type): Change return type.
(tdesc_add_flag): Change parameter type.
(tdesc_add_bitfield): Likewise.
(tdesc_add_field): Likewise.
(tdesc_set_struct_size): Likewise.
2017-12-06 05:30:28 +08:00
|
|
|
struct tdesc_type_builtin;
|
|
|
|
struct tdesc_type_vector;
|
|
|
|
struct tdesc_type_with_fields;
|
2017-09-05 16:54:53 +08:00
|
|
|
struct tdesc_reg;
|
|
|
|
struct target_desc;
|
|
|
|
|
2018-04-18 18:28:51 +08:00
|
|
|
/* The interface to visit different elements of target description. */
|
|
|
|
|
|
|
|
class tdesc_element_visitor
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
virtual void visit_pre (const target_desc *e)
|
|
|
|
{}
|
|
|
|
|
|
|
|
virtual void visit_post (const target_desc *e)
|
|
|
|
{}
|
|
|
|
|
|
|
|
virtual void visit_pre (const tdesc_feature *e)
|
|
|
|
{}
|
|
|
|
|
|
|
|
virtual void visit_post (const tdesc_feature *e)
|
|
|
|
{}
|
|
|
|
|
|
|
|
virtual void visit (const tdesc_type_builtin *e)
|
|
|
|
{}
|
|
|
|
|
|
|
|
virtual void visit (const tdesc_type_vector *e)
|
|
|
|
{}
|
|
|
|
|
|
|
|
virtual void visit (const tdesc_type_with_fields *e)
|
|
|
|
{}
|
|
|
|
|
|
|
|
virtual void visit (const tdesc_reg *e)
|
|
|
|
{}
|
|
|
|
};
|
|
|
|
|
|
|
|
class tdesc_element
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
virtual void accept (tdesc_element_visitor &v) const = 0;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* An individual register from a target description. */
|
|
|
|
|
|
|
|
struct tdesc_reg : tdesc_element
|
|
|
|
{
|
|
|
|
tdesc_reg (struct tdesc_feature *feature, const std::string &name_,
|
|
|
|
int regnum, int save_restore_, const char *group_,
|
|
|
|
int bitsize_, const char *type_);
|
|
|
|
|
|
|
|
virtual ~tdesc_reg () = default;
|
|
|
|
|
|
|
|
DISABLE_COPY_AND_ASSIGN (tdesc_reg);
|
|
|
|
|
|
|
|
/* The name of this register. In standard features, it may be
|
|
|
|
recognized by the architecture support code, or it may be purely
|
|
|
|
for the user. */
|
|
|
|
std::string name;
|
|
|
|
|
|
|
|
/* The register number used by this target to refer to this
|
|
|
|
register. This is used for remote p/P packets and to determine
|
|
|
|
the ordering of registers in the remote g/G packets. */
|
|
|
|
long target_regnum;
|
|
|
|
|
|
|
|
/* If this flag is set, GDB should save and restore this register
|
|
|
|
around calls to an inferior function. */
|
|
|
|
int save_restore;
|
|
|
|
|
|
|
|
/* The name of the register group containing this register, or empty
|
|
|
|
if the group should be automatically determined from the
|
|
|
|
register's type. If this is "general", "float", or "vector", the
|
|
|
|
corresponding "info" command should display this register's
|
|
|
|
value. It can be an arbitrary string, but should be limited to
|
|
|
|
alphanumeric characters and internal hyphens. Currently other
|
|
|
|
strings are ignored (treated as empty). */
|
|
|
|
std::string group;
|
|
|
|
|
|
|
|
/* The size of the register, in bits. */
|
|
|
|
int bitsize;
|
|
|
|
|
|
|
|
/* The type of the register. This string corresponds to either
|
|
|
|
a named type from the target description or a predefined
|
|
|
|
type from GDB. */
|
|
|
|
std::string type;
|
|
|
|
|
|
|
|
/* The target-described type corresponding to TYPE, if found. */
|
|
|
|
struct tdesc_type *tdesc_type;
|
|
|
|
|
|
|
|
void accept (tdesc_element_visitor &v) const override
|
|
|
|
{
|
|
|
|
v.visit (this);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool operator== (const tdesc_reg &other) const
|
|
|
|
{
|
|
|
|
return (name == other.name
|
|
|
|
&& target_regnum == other.target_regnum
|
|
|
|
&& save_restore == other.save_restore
|
|
|
|
&& bitsize == other.bitsize
|
|
|
|
&& group == other.group
|
|
|
|
&& type == other.type);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool operator!= (const tdesc_reg &other) const
|
|
|
|
{
|
|
|
|
return !(*this == other);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef std::unique_ptr<tdesc_reg> tdesc_reg_up;
|
|
|
|
|
gdb: Print compatible information within print_xml_feature
The gdbsupport directory contains a helper class print_xml_feature
that is shared between gdb and gdbserver. This class is used for
printing an XML representation of a target_desc object.
Currently this class doesn't have the ability to print the
<compatible> entities that can appear within a target description, I
guess no targets have needed that functionality yet.
The print_xml_feature classes API is based around operating on the
target_desc class, however, the sharing between gdb and gdbserver is
purely textural, we rely on their being a class called target_desc in
both gdb and gdbserver, but there is no shared implementation. We
then have a set of functions declared that operate on an object of
type target_desc, and again these functions have completely separate
implementations.
Currently then the gdb version of target_desc contains a vector of
bfd_arch_info pointers which represents the compatible entries from a
target description. The gdbserver version of target_desc has no such
information. Further, the gdbserver code doesn't seem to include the
bfd headers, and so doesn't know about the bfd types.
I was reluctant to include the bfd headers into gdbserver just so I
can reference the compatible information, which isn't (currently) even
needed in gdbserver.
So, the approach I take in this patch is to wrap the compatible
information into a new helper class. This class is declared in the
gdbsupport library, but implemented separately in both gdb and
gdbserver.
In gdbserver the class is empty. The compatible information within
the gdbserver is an empty list, of empty classes.
In gdb the class contains a pointer to the bfd_arch_info object.
With this in place we can now add support to print_xml_feature for
printing the compatible information if it is present. In the
gdbserver code this will never happen, as the gdbserver never has any
compatible information. But in gdb, this code will trigger when
appropriate.
gdb/ChangeLog:
* target-descriptions.c (class tdesc_compatible_info): New class.
(struct target_desc): Change type of compatible vector.
(tdesc_compatible_p): Update for change in type of
target_desc::compatible.
(tdesc_compatible_info_list): New function.
(tdesc_compatible_info_arch_name): New function.
(tdesc_add_compatible): Update for change in type of
target_desc::compatible.
(print_c_tdesc::visit_pre): Likewise.
gdbserver/ChangeLog:
* tdesc.cc (struct tdesc_compatible_info): New struct.
(tdesc_compatible_info_list): New function.
(tdesc_compatible_info_arch_name): New function.
gdbsupport/ChangeLog:
* tdesc.cc (print_xml_feature::visit_pre): Print compatible
information.
* tdesc.h (struct tdesc_compatible_info): Declare new struct.
(tdesc_compatible_info_up): New typedef.
(tdesc_compatible_info_list): Declare new function.
(tdesc_compatible_info_arch_name): Declare new function.
2020-06-12 05:36:29 +08:00
|
|
|
/* Declaration of a structure that holds information about one
|
|
|
|
"compatibility" entry within a target description. */
|
|
|
|
|
|
|
|
struct tdesc_compatible_info;
|
|
|
|
|
|
|
|
/* A pointer to a single piece of compatibility information. */
|
|
|
|
|
|
|
|
typedef std::unique_ptr<tdesc_compatible_info> tdesc_compatible_info_up;
|
|
|
|
|
|
|
|
/* Return a vector of compatibility information pointers from the target
|
|
|
|
description TARGET_DESC. */
|
|
|
|
|
|
|
|
const std::vector<tdesc_compatible_info_up> &tdesc_compatible_info_list
|
|
|
|
(const target_desc *target_desc);
|
|
|
|
|
|
|
|
/* Return the architecture name from a compatibility information
|
|
|
|
COMPATIBLE. */
|
|
|
|
|
|
|
|
const char *tdesc_compatible_info_arch_name
|
|
|
|
(const tdesc_compatible_info_up &compatible);
|
|
|
|
|
2018-04-18 18:39:53 +08:00
|
|
|
enum tdesc_type_kind
|
|
|
|
{
|
|
|
|
/* Predefined types. */
|
|
|
|
TDESC_TYPE_BOOL,
|
|
|
|
TDESC_TYPE_INT8,
|
|
|
|
TDESC_TYPE_INT16,
|
|
|
|
TDESC_TYPE_INT32,
|
|
|
|
TDESC_TYPE_INT64,
|
|
|
|
TDESC_TYPE_INT128,
|
|
|
|
TDESC_TYPE_UINT8,
|
|
|
|
TDESC_TYPE_UINT16,
|
|
|
|
TDESC_TYPE_UINT32,
|
|
|
|
TDESC_TYPE_UINT64,
|
|
|
|
TDESC_TYPE_UINT128,
|
|
|
|
TDESC_TYPE_CODE_PTR,
|
|
|
|
TDESC_TYPE_DATA_PTR,
|
2019-05-14 17:09:05 +08:00
|
|
|
TDESC_TYPE_IEEE_HALF,
|
2018-04-18 18:39:53 +08:00
|
|
|
TDESC_TYPE_IEEE_SINGLE,
|
|
|
|
TDESC_TYPE_IEEE_DOUBLE,
|
|
|
|
TDESC_TYPE_ARM_FPA_EXT,
|
|
|
|
TDESC_TYPE_I387_EXT,
|
2020-09-10 20:29:53 +08:00
|
|
|
TDESC_TYPE_BFLOAT16,
|
2018-04-18 18:39:53 +08:00
|
|
|
|
|
|
|
/* Types defined by a target feature. */
|
|
|
|
TDESC_TYPE_VECTOR,
|
|
|
|
TDESC_TYPE_STRUCT,
|
|
|
|
TDESC_TYPE_UNION,
|
|
|
|
TDESC_TYPE_FLAGS,
|
|
|
|
TDESC_TYPE_ENUM
|
|
|
|
};
|
|
|
|
|
|
|
|
struct tdesc_type : tdesc_element
|
|
|
|
{
|
|
|
|
tdesc_type (const std::string &name_, enum tdesc_type_kind kind_)
|
|
|
|
: name (name_), kind (kind_)
|
|
|
|
{}
|
|
|
|
|
|
|
|
virtual ~tdesc_type () = default;
|
|
|
|
|
|
|
|
DISABLE_COPY_AND_ASSIGN (tdesc_type);
|
|
|
|
|
|
|
|
/* The name of this type. */
|
|
|
|
std::string name;
|
|
|
|
|
|
|
|
/* Identify the kind of this type. */
|
|
|
|
enum tdesc_type_kind kind;
|
|
|
|
|
|
|
|
bool operator== (const tdesc_type &other) const
|
|
|
|
{
|
|
|
|
return name == other.name && kind == other.kind;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool operator!= (const tdesc_type &other) const
|
|
|
|
{
|
|
|
|
return !(*this == other);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef std::unique_ptr<tdesc_type> tdesc_type_up;
|
|
|
|
|
2018-04-18 18:47:55 +08:00
|
|
|
struct tdesc_type_builtin : tdesc_type
|
|
|
|
{
|
|
|
|
tdesc_type_builtin (const std::string &name, enum tdesc_type_kind kind)
|
|
|
|
: tdesc_type (name, kind)
|
|
|
|
{}
|
|
|
|
|
|
|
|
void accept (tdesc_element_visitor &v) const override
|
|
|
|
{
|
|
|
|
v.visit (this);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/* tdesc_type for vector types. */
|
|
|
|
|
|
|
|
struct tdesc_type_vector : tdesc_type
|
|
|
|
{
|
|
|
|
tdesc_type_vector (const std::string &name, tdesc_type *element_type_,
|
|
|
|
int count_)
|
|
|
|
: tdesc_type (name, TDESC_TYPE_VECTOR),
|
|
|
|
element_type (element_type_), count (count_)
|
|
|
|
{}
|
|
|
|
|
|
|
|
void accept (tdesc_element_visitor &v) const override
|
|
|
|
{
|
|
|
|
v.visit (this);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct tdesc_type *element_type;
|
|
|
|
int count;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* A named type from a target description. */
|
|
|
|
|
|
|
|
struct tdesc_type_field
|
|
|
|
{
|
|
|
|
tdesc_type_field (const std::string &name_, tdesc_type *type_,
|
|
|
|
int start_, int end_)
|
|
|
|
: name (name_), type (type_), start (start_), end (end_)
|
|
|
|
{}
|
|
|
|
|
|
|
|
std::string name;
|
|
|
|
struct tdesc_type *type;
|
|
|
|
/* For non-enum-values, either both are -1 (non-bitfield), or both are
|
|
|
|
not -1 (bitfield). For enum values, start is the value (which could be
|
|
|
|
-1), end is -1. */
|
|
|
|
int start, end;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* tdesc_type for struct, union, flags, and enum types. */
|
|
|
|
|
|
|
|
struct tdesc_type_with_fields : tdesc_type
|
|
|
|
{
|
|
|
|
tdesc_type_with_fields (const std::string &name, tdesc_type_kind kind,
|
|
|
|
int size_ = 0)
|
|
|
|
: tdesc_type (name, kind), size (size_)
|
|
|
|
{}
|
|
|
|
|
|
|
|
void accept (tdesc_element_visitor &v) const override
|
|
|
|
{
|
|
|
|
v.visit (this);
|
|
|
|
}
|
|
|
|
|
|
|
|
std::vector<tdesc_type_field> fields;
|
|
|
|
int size;
|
|
|
|
};
|
|
|
|
|
2018-04-18 18:39:53 +08:00
|
|
|
/* A feature from a target description. Each feature is a collection
|
|
|
|
of other elements, e.g. registers and types. */
|
|
|
|
|
|
|
|
struct tdesc_feature : tdesc_element
|
|
|
|
{
|
|
|
|
tdesc_feature (const std::string &name_)
|
|
|
|
: name (name_)
|
|
|
|
{}
|
|
|
|
|
|
|
|
virtual ~tdesc_feature () = default;
|
|
|
|
|
|
|
|
DISABLE_COPY_AND_ASSIGN (tdesc_feature);
|
|
|
|
|
|
|
|
/* The name of this feature. It may be recognized by the architecture
|
|
|
|
support code. */
|
|
|
|
std::string name;
|
|
|
|
|
|
|
|
/* The registers associated with this feature. */
|
|
|
|
std::vector<tdesc_reg_up> registers;
|
|
|
|
|
|
|
|
/* The types associated with this feature. */
|
|
|
|
std::vector<tdesc_type_up> types;
|
|
|
|
|
|
|
|
void accept (tdesc_element_visitor &v) const override;
|
|
|
|
|
|
|
|
bool operator== (const tdesc_feature &other) const;
|
|
|
|
|
|
|
|
bool operator!= (const tdesc_feature &other) const
|
|
|
|
{
|
|
|
|
return !(*this == other);
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef std::unique_ptr<tdesc_feature> tdesc_feature_up;
|
|
|
|
|
gdb/riscv: delete target descriptions when gdb exits
It was pointed out on IRC that the RISC-V target allocates target
descriptions and stores them in a global map, and doesn't delete these
target descriptions when GDB shuts down.
This isn't a particular problem, the total number of target
descriptions we can create is very limited so creating these on demand
and holding them for the entire run on GDB seems reasonable.
However, not deleting these objects on GDB exit means extra warnings
are printed from tools like valgrind, and the address sanitiser,
making it harder to spot real issues. As it's reasonably easy to have
GDB correctly delete these objects on exit, lets just do that.
I started by noticing that we already have a target_desc_up type, a
wrapper around unique_ptr that calls a function that will correctly
delete target descriptions, so I want to use that, but....
...that type is declared in gdb/target-descriptions.h. If I try to
include that file in gdb/arch/riscv.c I run into a problem, that file
is compiled into both GDB and GDBServer.
OK, I could guard the include with #ifdef, but surely we can do
better.
So then I decided to move the target_desc_up type into
gdbsupport/tdesc.h, this is the interface file for generic code shared
between GDB and GDBserver (relating to target descriptions). The
actual implementation for the delete function still lives in
gdb/target-description.c, but now gdb/arch/riscv.c can see the
declaration. Problem solved....
... but, though RISC-V doesn't use it I've now exposed the
target_desc_up type to gdbserver, so in future someone _might_ start
using it, which is fine, except right now there's no definition of the
delete function - remember the delete I used is only defined in GDB
code.
No problem, I add an implementation of the delete operator into
gdbserver/tdesc.cc, and all is good..... except....
I start getting this error from GCC:
tdesc.cc:109:10: error: deleting object of polymorphic class type ‘target_desc’ which has non-virtual destructor might cause undefined behavior [-Werror=delete-non-virtual-dtor]
Which is caused because gdbserver's target_desc type inherits from
tdesc_element which has a virtual method, and so GCC worries that
target_desc might be used as a base class.
The solution is to declare gdbserver's target_desc class as final.
This is fine so long as we never intent to inherit from
target_desc (in gdbserver). But if we did then we'd want to make
target_desc's destructor virtual anyway, so the error above would be
resolved, and there wouldn't be an issue.
gdb/ChangeLog:
* arch/riscv.c (riscv_tdesc_cache): Change map type.
(riscv_lookup_target_description): Return pointer out of
unique_ptr.
* target-descriptions.c (allocate_target_description): Add
comment.
(target_desc_deleter::operator()): Likewise.
* target-descriptions.h (struct target_desc_deleter): Moved to
gdbsupport/tdesc.h.
(target_desc_up): Likewise.
gdbserver/ChangeLog:
* tdesc.cc (allocate_target_description): Add header comment.
(target_desc_deleter::operator()): New function.
* tdesc.h (struct target_desc): Declare as final.
gdbsupport/ChangeLog:
* tdesc.h (struct target_desc_deleter): Moved here
from gdb/target-descriptions.h, extend comment.
(target_desc_up): Likewise.
2020-07-17 00:48:12 +08:00
|
|
|
/* A deleter adapter for a target_desc. There are different
|
|
|
|
implementations of this deleter class in gdb and gdbserver because even
|
|
|
|
though the target_desc name is shared between the two projects, the
|
|
|
|
actual implementations of target_desc are completely different. */
|
|
|
|
|
|
|
|
struct target_desc_deleter
|
|
|
|
{
|
|
|
|
void operator() (struct target_desc *desc) const;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* A unique pointer specialization that holds a target_desc. */
|
|
|
|
|
|
|
|
typedef std::unique_ptr<target_desc, target_desc_deleter> target_desc_up;
|
|
|
|
|
2017-09-05 16:54:53 +08:00
|
|
|
/* Allocate a new target_desc. */
|
2020-07-20 21:18:04 +08:00
|
|
|
target_desc_up allocate_target_description (void);
|
2017-09-05 16:54:53 +08:00
|
|
|
|
|
|
|
/* Set TARGET_DESC's architecture by NAME. */
|
|
|
|
void set_tdesc_architecture (target_desc *target_desc,
|
|
|
|
const char *name);
|
|
|
|
|
2018-04-18 18:51:21 +08:00
|
|
|
/* Return the architecture associated with this target description as a string,
|
|
|
|
or NULL if no architecture was specified. */
|
|
|
|
const char *tdesc_architecture_name (const struct target_desc *target_desc);
|
|
|
|
|
2017-09-05 16:54:53 +08:00
|
|
|
/* Set TARGET_DESC's osabi by NAME. */
|
|
|
|
void set_tdesc_osabi (target_desc *target_desc, const char *name);
|
|
|
|
|
2018-04-18 18:51:21 +08:00
|
|
|
/* Return the osabi associated with this target description as a string,
|
|
|
|
or NULL if no osabi was specified. */
|
|
|
|
const char *tdesc_osabi_name (const struct target_desc *target_desc);
|
|
|
|
|
2017-09-05 16:54:53 +08:00
|
|
|
/* Return the type associated with ID in the context of FEATURE, or
|
|
|
|
NULL if none. */
|
|
|
|
struct tdesc_type *tdesc_named_type (const struct tdesc_feature *feature,
|
|
|
|
const char *id);
|
|
|
|
|
|
|
|
/* Return the created feature named NAME in target description TDESC. */
|
|
|
|
struct tdesc_feature *tdesc_create_feature (struct target_desc *tdesc,
|
2018-04-19 03:49:37 +08:00
|
|
|
const char *name);
|
2017-09-05 16:54:53 +08:00
|
|
|
|
|
|
|
/* Return the created vector tdesc_type named NAME in FEATURE. */
|
|
|
|
struct tdesc_type *tdesc_create_vector (struct tdesc_feature *feature,
|
|
|
|
const char *name,
|
|
|
|
struct tdesc_type *field_type,
|
|
|
|
int count);
|
|
|
|
|
|
|
|
/* Return the created struct tdesc_type named NAME in FEATURE. */
|
Split tdesc_type into multiple classes
This patch makes tdesc_type an abstract base class and creates three
subclasses:
- tdesc_type_builtin, for builtin types
- tdesc_type_vector, for vector types
- tdesc_type_with_fields, for struct, union, flag and enum types
This allows getting rid of the union in tdesc_type and to not allow the
std::vector separately. I tried to go further and create separate
classes for struct, union, flag and enum, but it proved too difficult.
One problem is that from the point of the of the target description
code, the types tdesc_type_* are opaque (only forward-declared).
Therefore, it doesn't know about inheritance relationship between those
classes. This makes it impossible to make functions that accept a
pointer to a base class and pass a pointer to a derived class, for
example. I think this patch here is a good compromise, and if somebody
wants to improve things further, the door is open.
A make_gdb_type virtual pure method is added to tdesc_type, which
replaces the current tdesc_gdb_type function. Calling this method on a
tdesc_type returns the corresponding built gdb type.
gdb/ChangeLog:
* target-descriptions.c (struct tdesc_type): Use default
destructor.
<u>: Remove.
<accept>: Remove.
(struct tdesc_type_builtin): New.
(struct tdesc_type_vector): New.
(struct tdesc_type_with_fields): New.
(tdesc_predefined_types): Change type to tdesc_type_builtin[].
(tdesc_gdb_type): Remove.
(tdesc_register_type): Adjust.
(tdesc_create_vector): Create tdesc_type_vector.
(tdesc_create_struct): Create tdesc_type_with_fields.
(tdesc_set_struct_size): Change parameter type.
(tdesc_create_union): Create tdesc_type_with_fields.
(tdesc_create_flags): Likewise.
(tdesc_create_enum): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_add_typed_bitfield): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
(tdesc_add_enum_value): Likewise.
(print_c_tdesc) <visit>: Remove overload with tdesc_type
parameter, add overloads for tdesc_type_builtin,
tdesc_type_with_fields and tdesc_type_vector.
<m_printed_type>: Remove.
<m_printed_element_type, m_printed_type_with_fields>: Add.
* target-descriptions.h (tdesc_create_enum): Change return type.
(tdesc_add_typed_bitfield): Change parameter type.
(tdesc_add_enum_value): Change parameter type.
* xml-tdesc.c (struct tdesc_parsing_data) <current_type>: Change
type to tdesc_type_with_fields.
(tdesc_start_struct): Adjust.
(tdesc_start_flags): Adjust.
(tdesc_start_enum): Adjust.
(tdesc_start_field): Adjust.
* arch/tdesc.h (struct tdesc_type_builtin): Forward-declare.
(struct tdesc_type_vector): Forward-declare.
(struct tdesc_type_with_fields): Forward-declare.
(tdesc_create_struct): Change return type.
(tdesc_create_union): Likewise.
(tdesc_create_flags): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_set_struct_size): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
* features: Re-generate C files.
gdb/gdbserver/ChangeLog:
* tdesc.c (struct tdesc_type): Change return type.
(tdesc_add_flag): Change parameter type.
(tdesc_add_bitfield): Likewise.
(tdesc_add_field): Likewise.
(tdesc_set_struct_size): Likewise.
2017-12-06 05:30:28 +08:00
|
|
|
tdesc_type_with_fields *tdesc_create_struct (struct tdesc_feature *feature,
|
|
|
|
const char *name);
|
2017-09-05 16:54:53 +08:00
|
|
|
|
|
|
|
/* Return the created union tdesc_type named NAME in FEATURE. */
|
Split tdesc_type into multiple classes
This patch makes tdesc_type an abstract base class and creates three
subclasses:
- tdesc_type_builtin, for builtin types
- tdesc_type_vector, for vector types
- tdesc_type_with_fields, for struct, union, flag and enum types
This allows getting rid of the union in tdesc_type and to not allow the
std::vector separately. I tried to go further and create separate
classes for struct, union, flag and enum, but it proved too difficult.
One problem is that from the point of the of the target description
code, the types tdesc_type_* are opaque (only forward-declared).
Therefore, it doesn't know about inheritance relationship between those
classes. This makes it impossible to make functions that accept a
pointer to a base class and pass a pointer to a derived class, for
example. I think this patch here is a good compromise, and if somebody
wants to improve things further, the door is open.
A make_gdb_type virtual pure method is added to tdesc_type, which
replaces the current tdesc_gdb_type function. Calling this method on a
tdesc_type returns the corresponding built gdb type.
gdb/ChangeLog:
* target-descriptions.c (struct tdesc_type): Use default
destructor.
<u>: Remove.
<accept>: Remove.
(struct tdesc_type_builtin): New.
(struct tdesc_type_vector): New.
(struct tdesc_type_with_fields): New.
(tdesc_predefined_types): Change type to tdesc_type_builtin[].
(tdesc_gdb_type): Remove.
(tdesc_register_type): Adjust.
(tdesc_create_vector): Create tdesc_type_vector.
(tdesc_create_struct): Create tdesc_type_with_fields.
(tdesc_set_struct_size): Change parameter type.
(tdesc_create_union): Create tdesc_type_with_fields.
(tdesc_create_flags): Likewise.
(tdesc_create_enum): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_add_typed_bitfield): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
(tdesc_add_enum_value): Likewise.
(print_c_tdesc) <visit>: Remove overload with tdesc_type
parameter, add overloads for tdesc_type_builtin,
tdesc_type_with_fields and tdesc_type_vector.
<m_printed_type>: Remove.
<m_printed_element_type, m_printed_type_with_fields>: Add.
* target-descriptions.h (tdesc_create_enum): Change return type.
(tdesc_add_typed_bitfield): Change parameter type.
(tdesc_add_enum_value): Change parameter type.
* xml-tdesc.c (struct tdesc_parsing_data) <current_type>: Change
type to tdesc_type_with_fields.
(tdesc_start_struct): Adjust.
(tdesc_start_flags): Adjust.
(tdesc_start_enum): Adjust.
(tdesc_start_field): Adjust.
* arch/tdesc.h (struct tdesc_type_builtin): Forward-declare.
(struct tdesc_type_vector): Forward-declare.
(struct tdesc_type_with_fields): Forward-declare.
(tdesc_create_struct): Change return type.
(tdesc_create_union): Likewise.
(tdesc_create_flags): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_set_struct_size): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
* features: Re-generate C files.
gdb/gdbserver/ChangeLog:
* tdesc.c (struct tdesc_type): Change return type.
(tdesc_add_flag): Change parameter type.
(tdesc_add_bitfield): Likewise.
(tdesc_add_field): Likewise.
(tdesc_set_struct_size): Likewise.
2017-12-06 05:30:28 +08:00
|
|
|
tdesc_type_with_fields *tdesc_create_union (struct tdesc_feature *feature,
|
|
|
|
const char *name);
|
2017-09-05 16:54:53 +08:00
|
|
|
|
|
|
|
/* Return the created flags tdesc_type named NAME in FEATURE. */
|
Split tdesc_type into multiple classes
This patch makes tdesc_type an abstract base class and creates three
subclasses:
- tdesc_type_builtin, for builtin types
- tdesc_type_vector, for vector types
- tdesc_type_with_fields, for struct, union, flag and enum types
This allows getting rid of the union in tdesc_type and to not allow the
std::vector separately. I tried to go further and create separate
classes for struct, union, flag and enum, but it proved too difficult.
One problem is that from the point of the of the target description
code, the types tdesc_type_* are opaque (only forward-declared).
Therefore, it doesn't know about inheritance relationship between those
classes. This makes it impossible to make functions that accept a
pointer to a base class and pass a pointer to a derived class, for
example. I think this patch here is a good compromise, and if somebody
wants to improve things further, the door is open.
A make_gdb_type virtual pure method is added to tdesc_type, which
replaces the current tdesc_gdb_type function. Calling this method on a
tdesc_type returns the corresponding built gdb type.
gdb/ChangeLog:
* target-descriptions.c (struct tdesc_type): Use default
destructor.
<u>: Remove.
<accept>: Remove.
(struct tdesc_type_builtin): New.
(struct tdesc_type_vector): New.
(struct tdesc_type_with_fields): New.
(tdesc_predefined_types): Change type to tdesc_type_builtin[].
(tdesc_gdb_type): Remove.
(tdesc_register_type): Adjust.
(tdesc_create_vector): Create tdesc_type_vector.
(tdesc_create_struct): Create tdesc_type_with_fields.
(tdesc_set_struct_size): Change parameter type.
(tdesc_create_union): Create tdesc_type_with_fields.
(tdesc_create_flags): Likewise.
(tdesc_create_enum): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_add_typed_bitfield): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
(tdesc_add_enum_value): Likewise.
(print_c_tdesc) <visit>: Remove overload with tdesc_type
parameter, add overloads for tdesc_type_builtin,
tdesc_type_with_fields and tdesc_type_vector.
<m_printed_type>: Remove.
<m_printed_element_type, m_printed_type_with_fields>: Add.
* target-descriptions.h (tdesc_create_enum): Change return type.
(tdesc_add_typed_bitfield): Change parameter type.
(tdesc_add_enum_value): Change parameter type.
* xml-tdesc.c (struct tdesc_parsing_data) <current_type>: Change
type to tdesc_type_with_fields.
(tdesc_start_struct): Adjust.
(tdesc_start_flags): Adjust.
(tdesc_start_enum): Adjust.
(tdesc_start_field): Adjust.
* arch/tdesc.h (struct tdesc_type_builtin): Forward-declare.
(struct tdesc_type_vector): Forward-declare.
(struct tdesc_type_with_fields): Forward-declare.
(tdesc_create_struct): Change return type.
(tdesc_create_union): Likewise.
(tdesc_create_flags): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_set_struct_size): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
* features: Re-generate C files.
gdb/gdbserver/ChangeLog:
* tdesc.c (struct tdesc_type): Change return type.
(tdesc_add_flag): Change parameter type.
(tdesc_add_bitfield): Likewise.
(tdesc_add_field): Likewise.
(tdesc_set_struct_size): Likewise.
2017-12-06 05:30:28 +08:00
|
|
|
tdesc_type_with_fields *tdesc_create_flags (struct tdesc_feature *feature,
|
|
|
|
const char *name,
|
|
|
|
int size);
|
2017-09-05 16:54:53 +08:00
|
|
|
|
2018-04-18 18:47:55 +08:00
|
|
|
/* Return the created enum tdesc_type named NAME in FEATURE. */
|
|
|
|
tdesc_type_with_fields *tdesc_create_enum (struct tdesc_feature *feature,
|
|
|
|
const char *name,
|
|
|
|
int size);
|
|
|
|
|
2017-09-05 16:54:53 +08:00
|
|
|
/* Add a new field to TYPE. FIELD_NAME is its name, and FIELD_TYPE is
|
|
|
|
its type. */
|
Split tdesc_type into multiple classes
This patch makes tdesc_type an abstract base class and creates three
subclasses:
- tdesc_type_builtin, for builtin types
- tdesc_type_vector, for vector types
- tdesc_type_with_fields, for struct, union, flag and enum types
This allows getting rid of the union in tdesc_type and to not allow the
std::vector separately. I tried to go further and create separate
classes for struct, union, flag and enum, but it proved too difficult.
One problem is that from the point of the of the target description
code, the types tdesc_type_* are opaque (only forward-declared).
Therefore, it doesn't know about inheritance relationship between those
classes. This makes it impossible to make functions that accept a
pointer to a base class and pass a pointer to a derived class, for
example. I think this patch here is a good compromise, and if somebody
wants to improve things further, the door is open.
A make_gdb_type virtual pure method is added to tdesc_type, which
replaces the current tdesc_gdb_type function. Calling this method on a
tdesc_type returns the corresponding built gdb type.
gdb/ChangeLog:
* target-descriptions.c (struct tdesc_type): Use default
destructor.
<u>: Remove.
<accept>: Remove.
(struct tdesc_type_builtin): New.
(struct tdesc_type_vector): New.
(struct tdesc_type_with_fields): New.
(tdesc_predefined_types): Change type to tdesc_type_builtin[].
(tdesc_gdb_type): Remove.
(tdesc_register_type): Adjust.
(tdesc_create_vector): Create tdesc_type_vector.
(tdesc_create_struct): Create tdesc_type_with_fields.
(tdesc_set_struct_size): Change parameter type.
(tdesc_create_union): Create tdesc_type_with_fields.
(tdesc_create_flags): Likewise.
(tdesc_create_enum): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_add_typed_bitfield): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
(tdesc_add_enum_value): Likewise.
(print_c_tdesc) <visit>: Remove overload with tdesc_type
parameter, add overloads for tdesc_type_builtin,
tdesc_type_with_fields and tdesc_type_vector.
<m_printed_type>: Remove.
<m_printed_element_type, m_printed_type_with_fields>: Add.
* target-descriptions.h (tdesc_create_enum): Change return type.
(tdesc_add_typed_bitfield): Change parameter type.
(tdesc_add_enum_value): Change parameter type.
* xml-tdesc.c (struct tdesc_parsing_data) <current_type>: Change
type to tdesc_type_with_fields.
(tdesc_start_struct): Adjust.
(tdesc_start_flags): Adjust.
(tdesc_start_enum): Adjust.
(tdesc_start_field): Adjust.
* arch/tdesc.h (struct tdesc_type_builtin): Forward-declare.
(struct tdesc_type_vector): Forward-declare.
(struct tdesc_type_with_fields): Forward-declare.
(tdesc_create_struct): Change return type.
(tdesc_create_union): Likewise.
(tdesc_create_flags): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_set_struct_size): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
* features: Re-generate C files.
gdb/gdbserver/ChangeLog:
* tdesc.c (struct tdesc_type): Change return type.
(tdesc_add_flag): Change parameter type.
(tdesc_add_bitfield): Likewise.
(tdesc_add_field): Likewise.
(tdesc_set_struct_size): Likewise.
2017-12-06 05:30:28 +08:00
|
|
|
void tdesc_add_field (tdesc_type_with_fields *type, const char *field_name,
|
2017-09-05 16:54:53 +08:00
|
|
|
struct tdesc_type *field_type);
|
|
|
|
|
2018-04-18 18:47:55 +08:00
|
|
|
/* Add a new bitfield to TYPE, with range START to END. FIELD_NAME is its name,
|
|
|
|
and FIELD_TYPE is its type. */
|
|
|
|
void tdesc_add_typed_bitfield (tdesc_type_with_fields *type,
|
|
|
|
const char *field_name,
|
|
|
|
int start, int end,
|
|
|
|
struct tdesc_type *field_type);
|
|
|
|
|
2017-09-05 16:54:53 +08:00
|
|
|
/* Set the total length of TYPE. Structs which contain bitfields may
|
|
|
|
omit the reserved bits, so the end of the last field may not
|
|
|
|
suffice. */
|
Split tdesc_type into multiple classes
This patch makes tdesc_type an abstract base class and creates three
subclasses:
- tdesc_type_builtin, for builtin types
- tdesc_type_vector, for vector types
- tdesc_type_with_fields, for struct, union, flag and enum types
This allows getting rid of the union in tdesc_type and to not allow the
std::vector separately. I tried to go further and create separate
classes for struct, union, flag and enum, but it proved too difficult.
One problem is that from the point of the of the target description
code, the types tdesc_type_* are opaque (only forward-declared).
Therefore, it doesn't know about inheritance relationship between those
classes. This makes it impossible to make functions that accept a
pointer to a base class and pass a pointer to a derived class, for
example. I think this patch here is a good compromise, and if somebody
wants to improve things further, the door is open.
A make_gdb_type virtual pure method is added to tdesc_type, which
replaces the current tdesc_gdb_type function. Calling this method on a
tdesc_type returns the corresponding built gdb type.
gdb/ChangeLog:
* target-descriptions.c (struct tdesc_type): Use default
destructor.
<u>: Remove.
<accept>: Remove.
(struct tdesc_type_builtin): New.
(struct tdesc_type_vector): New.
(struct tdesc_type_with_fields): New.
(tdesc_predefined_types): Change type to tdesc_type_builtin[].
(tdesc_gdb_type): Remove.
(tdesc_register_type): Adjust.
(tdesc_create_vector): Create tdesc_type_vector.
(tdesc_create_struct): Create tdesc_type_with_fields.
(tdesc_set_struct_size): Change parameter type.
(tdesc_create_union): Create tdesc_type_with_fields.
(tdesc_create_flags): Likewise.
(tdesc_create_enum): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_add_typed_bitfield): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
(tdesc_add_enum_value): Likewise.
(print_c_tdesc) <visit>: Remove overload with tdesc_type
parameter, add overloads for tdesc_type_builtin,
tdesc_type_with_fields and tdesc_type_vector.
<m_printed_type>: Remove.
<m_printed_element_type, m_printed_type_with_fields>: Add.
* target-descriptions.h (tdesc_create_enum): Change return type.
(tdesc_add_typed_bitfield): Change parameter type.
(tdesc_add_enum_value): Change parameter type.
* xml-tdesc.c (struct tdesc_parsing_data) <current_type>: Change
type to tdesc_type_with_fields.
(tdesc_start_struct): Adjust.
(tdesc_start_flags): Adjust.
(tdesc_start_enum): Adjust.
(tdesc_start_field): Adjust.
* arch/tdesc.h (struct tdesc_type_builtin): Forward-declare.
(struct tdesc_type_vector): Forward-declare.
(struct tdesc_type_with_fields): Forward-declare.
(tdesc_create_struct): Change return type.
(tdesc_create_union): Likewise.
(tdesc_create_flags): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_set_struct_size): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
* features: Re-generate C files.
gdb/gdbserver/ChangeLog:
* tdesc.c (struct tdesc_type): Change return type.
(tdesc_add_flag): Change parameter type.
(tdesc_add_bitfield): Likewise.
(tdesc_add_field): Likewise.
(tdesc_set_struct_size): Likewise.
2017-12-06 05:30:28 +08:00
|
|
|
void tdesc_set_struct_size (tdesc_type_with_fields *type, int size);
|
2017-09-05 16:54:53 +08:00
|
|
|
|
|
|
|
/* Add a new untyped bitfield to TYPE.
|
|
|
|
Untyped bitfields become either uint32 or uint64 depending on the size
|
|
|
|
of the underlying type. */
|
Split tdesc_type into multiple classes
This patch makes tdesc_type an abstract base class and creates three
subclasses:
- tdesc_type_builtin, for builtin types
- tdesc_type_vector, for vector types
- tdesc_type_with_fields, for struct, union, flag and enum types
This allows getting rid of the union in tdesc_type and to not allow the
std::vector separately. I tried to go further and create separate
classes for struct, union, flag and enum, but it proved too difficult.
One problem is that from the point of the of the target description
code, the types tdesc_type_* are opaque (only forward-declared).
Therefore, it doesn't know about inheritance relationship between those
classes. This makes it impossible to make functions that accept a
pointer to a base class and pass a pointer to a derived class, for
example. I think this patch here is a good compromise, and if somebody
wants to improve things further, the door is open.
A make_gdb_type virtual pure method is added to tdesc_type, which
replaces the current tdesc_gdb_type function. Calling this method on a
tdesc_type returns the corresponding built gdb type.
gdb/ChangeLog:
* target-descriptions.c (struct tdesc_type): Use default
destructor.
<u>: Remove.
<accept>: Remove.
(struct tdesc_type_builtin): New.
(struct tdesc_type_vector): New.
(struct tdesc_type_with_fields): New.
(tdesc_predefined_types): Change type to tdesc_type_builtin[].
(tdesc_gdb_type): Remove.
(tdesc_register_type): Adjust.
(tdesc_create_vector): Create tdesc_type_vector.
(tdesc_create_struct): Create tdesc_type_with_fields.
(tdesc_set_struct_size): Change parameter type.
(tdesc_create_union): Create tdesc_type_with_fields.
(tdesc_create_flags): Likewise.
(tdesc_create_enum): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_add_typed_bitfield): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
(tdesc_add_enum_value): Likewise.
(print_c_tdesc) <visit>: Remove overload with tdesc_type
parameter, add overloads for tdesc_type_builtin,
tdesc_type_with_fields and tdesc_type_vector.
<m_printed_type>: Remove.
<m_printed_element_type, m_printed_type_with_fields>: Add.
* target-descriptions.h (tdesc_create_enum): Change return type.
(tdesc_add_typed_bitfield): Change parameter type.
(tdesc_add_enum_value): Change parameter type.
* xml-tdesc.c (struct tdesc_parsing_data) <current_type>: Change
type to tdesc_type_with_fields.
(tdesc_start_struct): Adjust.
(tdesc_start_flags): Adjust.
(tdesc_start_enum): Adjust.
(tdesc_start_field): Adjust.
* arch/tdesc.h (struct tdesc_type_builtin): Forward-declare.
(struct tdesc_type_vector): Forward-declare.
(struct tdesc_type_with_fields): Forward-declare.
(tdesc_create_struct): Change return type.
(tdesc_create_union): Likewise.
(tdesc_create_flags): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_set_struct_size): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
* features: Re-generate C files.
gdb/gdbserver/ChangeLog:
* tdesc.c (struct tdesc_type): Change return type.
(tdesc_add_flag): Change parameter type.
(tdesc_add_bitfield): Likewise.
(tdesc_add_field): Likewise.
(tdesc_set_struct_size): Likewise.
2017-12-06 05:30:28 +08:00
|
|
|
void tdesc_add_bitfield (tdesc_type_with_fields *type, const char *field_name,
|
2017-09-05 16:54:53 +08:00
|
|
|
int start, int end);
|
|
|
|
|
|
|
|
/* A flag is just a typed(bool) single-bit bitfield.
|
|
|
|
This function is kept to minimize changes in generated files. */
|
Split tdesc_type into multiple classes
This patch makes tdesc_type an abstract base class and creates three
subclasses:
- tdesc_type_builtin, for builtin types
- tdesc_type_vector, for vector types
- tdesc_type_with_fields, for struct, union, flag and enum types
This allows getting rid of the union in tdesc_type and to not allow the
std::vector separately. I tried to go further and create separate
classes for struct, union, flag and enum, but it proved too difficult.
One problem is that from the point of the of the target description
code, the types tdesc_type_* are opaque (only forward-declared).
Therefore, it doesn't know about inheritance relationship between those
classes. This makes it impossible to make functions that accept a
pointer to a base class and pass a pointer to a derived class, for
example. I think this patch here is a good compromise, and if somebody
wants to improve things further, the door is open.
A make_gdb_type virtual pure method is added to tdesc_type, which
replaces the current tdesc_gdb_type function. Calling this method on a
tdesc_type returns the corresponding built gdb type.
gdb/ChangeLog:
* target-descriptions.c (struct tdesc_type): Use default
destructor.
<u>: Remove.
<accept>: Remove.
(struct tdesc_type_builtin): New.
(struct tdesc_type_vector): New.
(struct tdesc_type_with_fields): New.
(tdesc_predefined_types): Change type to tdesc_type_builtin[].
(tdesc_gdb_type): Remove.
(tdesc_register_type): Adjust.
(tdesc_create_vector): Create tdesc_type_vector.
(tdesc_create_struct): Create tdesc_type_with_fields.
(tdesc_set_struct_size): Change parameter type.
(tdesc_create_union): Create tdesc_type_with_fields.
(tdesc_create_flags): Likewise.
(tdesc_create_enum): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_add_typed_bitfield): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
(tdesc_add_enum_value): Likewise.
(print_c_tdesc) <visit>: Remove overload with tdesc_type
parameter, add overloads for tdesc_type_builtin,
tdesc_type_with_fields and tdesc_type_vector.
<m_printed_type>: Remove.
<m_printed_element_type, m_printed_type_with_fields>: Add.
* target-descriptions.h (tdesc_create_enum): Change return type.
(tdesc_add_typed_bitfield): Change parameter type.
(tdesc_add_enum_value): Change parameter type.
* xml-tdesc.c (struct tdesc_parsing_data) <current_type>: Change
type to tdesc_type_with_fields.
(tdesc_start_struct): Adjust.
(tdesc_start_flags): Adjust.
(tdesc_start_enum): Adjust.
(tdesc_start_field): Adjust.
* arch/tdesc.h (struct tdesc_type_builtin): Forward-declare.
(struct tdesc_type_vector): Forward-declare.
(struct tdesc_type_with_fields): Forward-declare.
(tdesc_create_struct): Change return type.
(tdesc_create_union): Likewise.
(tdesc_create_flags): Likewise.
(tdesc_add_field): Change parameter type.
(tdesc_set_struct_size): Likewise.
(tdesc_add_bitfield): Likewise.
(tdesc_add_flag): Likewise.
* features: Re-generate C files.
gdb/gdbserver/ChangeLog:
* tdesc.c (struct tdesc_type): Change return type.
(tdesc_add_flag): Change parameter type.
(tdesc_add_bitfield): Likewise.
(tdesc_add_field): Likewise.
(tdesc_set_struct_size): Likewise.
2017-12-06 05:30:28 +08:00
|
|
|
void tdesc_add_flag (tdesc_type_with_fields *type, int start,
|
2017-09-05 16:54:53 +08:00
|
|
|
const char *flag_name);
|
|
|
|
|
2018-04-18 18:47:55 +08:00
|
|
|
/* Add field with VALUE and NAME to the enum TYPE. */
|
|
|
|
void tdesc_add_enum_value (tdesc_type_with_fields *type, int value,
|
|
|
|
const char *name);
|
|
|
|
|
2017-09-05 16:54:53 +08:00
|
|
|
/* Create a register in feature FEATURE. */
|
|
|
|
void tdesc_create_reg (struct tdesc_feature *feature, const char *name,
|
|
|
|
int regnum, int save_restore, const char *group,
|
|
|
|
int bitsize, const char *type);
|
|
|
|
|
2018-04-19 03:09:12 +08:00
|
|
|
/* Return the tdesc in string XML format. */
|
|
|
|
|
|
|
|
const char *tdesc_get_features_xml (const target_desc *tdesc);
|
|
|
|
|
|
|
|
/* Print target description as xml. */
|
|
|
|
|
|
|
|
class print_xml_feature : public tdesc_element_visitor
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
print_xml_feature (std::string *buffer_)
|
gdb: New maintenance command to print XML target description
This commit adds a new maintenance command that dumps the current
target description as an XML document. This is a maintenance command
as I currently only see this being useful for GDB developers, or for
people debugging a new remote target.
By default the command will print whatever the current target
description is, whether this was delivered by the remote, loaded by
the user from a file, or if it is a built in target within GDB.
The command can also take an optional filename argument. In this case
GDB loads a target description from the file, and then reprints it.
This could be useful for testing GDB's parsing of target descriptions,
or to check that GDB can successfully parse a particular XML
description.
It is worth noting that the XML description printed will not be an
exact copy of the document fed into GDB. For example this minimal
input file:
<target>
<feature name="abc">
<reg name="r1" bitsize="32"/>
</feature>
</target>
Will produce this output:
(gdb) maint print xml-tdesc path/to/file.xml
<?xml version="1.0"?>
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<feature name="abc">
<reg name="r1" bitsize="32" type="int" regnum="0"/>
</feature>
</target>
Notice that GDB filled in both the 'type' and 'regnum' fields of the
<reg>. I think this is actually a positive as it means we get to
really understand how GDB processed the document, if GDB made some
assumptions that differ to those the user expected then hopefully this
will bring those issues to the users attention.
To implement this I have tweaked the output produced by the
print_xml_feature which is defined within the gdbsupport/ directory.
The changes I have made to this class are:
1. The <architecture>...</architecture> tags are now not produced if
the architecture name is NULL.
2. The <osabi>...</osabi> tags get a newline at the end.
3. And, the whole XML document is indented using white space in a
nested fashion (as in the example output above).
I think that these changes should be fine, the print_xml_feature class
is used:
1. In gdbserver to generate an XML document to send as the target
description to GDB.
2. In GDB as part of a self-check function, a target_desc is
converted to XML then parsed back into a target_desc. We then check
the before and after target_desc objects are the same.
3. In the new 'maint print xml-tdesc' command.
In all of these use cases adding the extra white space should be fine.
gdbsupport/ChangeLog:
* tdesc.cc (print_xml_feature::visit_pre): Use add_line to add
output content, and call indent as needed in all overloaded
variants.
(print_xml_feature::visit_post): Likewise.
(print_xml_feature::visit): Likewise.
(print_xml_feature::add_line): Two new overloaded functions.
* tdesc.h (print_xml_feature::indent): New member function.
(print_xml_feature::add_line): Two new overloaded member
functions.
(print_xml_feature::m_depth): New member variable.
gdb/ChangeLog:
* target-descriptions.c (tdesc_architecture_name): Protect against
NULL pointer dereference.
(maint_print_xml_tdesc_cmd): New function.
(_initialize_target_descriptions): Register new 'maint print
xml-tdesc' command and give it the filename completer.
* NEWS: Mention new 'maint print xml-tdesc' command.
gdb/testsuite/ChangeLog:
* gdb.xml/tdesc-reload.c: New file.
* gdb.xml/tdesc-reload.exp: New file.
* gdb.xml/maint-xml-dump-01.xml: New file.
* gdb.xml/maint-xml-dump-02.xml: New file.
* gdb.xml/maint-xml-dump.exp: New file.
gdb/doc/ChangeLog:
* gdb.texinfo (Maintenance Commands): Document new 'maint print
xml-desc' command.
2020-06-10 06:08:54 +08:00
|
|
|
: m_buffer (buffer_),
|
|
|
|
m_depth (0)
|
2018-04-19 03:09:12 +08:00
|
|
|
{}
|
|
|
|
|
|
|
|
void visit_pre (const target_desc *e) override;
|
|
|
|
void visit_post (const target_desc *e) override;
|
|
|
|
void visit_pre (const tdesc_feature *e) override;
|
|
|
|
void visit_post (const tdesc_feature *e) override;
|
|
|
|
void visit (const tdesc_type_builtin *type) override;
|
|
|
|
void visit (const tdesc_type_vector *type) override;
|
|
|
|
void visit (const tdesc_type_with_fields *type) override;
|
|
|
|
void visit (const tdesc_reg *reg) override;
|
|
|
|
|
|
|
|
private:
|
gdb: New maintenance command to print XML target description
This commit adds a new maintenance command that dumps the current
target description as an XML document. This is a maintenance command
as I currently only see this being useful for GDB developers, or for
people debugging a new remote target.
By default the command will print whatever the current target
description is, whether this was delivered by the remote, loaded by
the user from a file, or if it is a built in target within GDB.
The command can also take an optional filename argument. In this case
GDB loads a target description from the file, and then reprints it.
This could be useful for testing GDB's parsing of target descriptions,
or to check that GDB can successfully parse a particular XML
description.
It is worth noting that the XML description printed will not be an
exact copy of the document fed into GDB. For example this minimal
input file:
<target>
<feature name="abc">
<reg name="r1" bitsize="32"/>
</feature>
</target>
Will produce this output:
(gdb) maint print xml-tdesc path/to/file.xml
<?xml version="1.0"?>
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<feature name="abc">
<reg name="r1" bitsize="32" type="int" regnum="0"/>
</feature>
</target>
Notice that GDB filled in both the 'type' and 'regnum' fields of the
<reg>. I think this is actually a positive as it means we get to
really understand how GDB processed the document, if GDB made some
assumptions that differ to those the user expected then hopefully this
will bring those issues to the users attention.
To implement this I have tweaked the output produced by the
print_xml_feature which is defined within the gdbsupport/ directory.
The changes I have made to this class are:
1. The <architecture>...</architecture> tags are now not produced if
the architecture name is NULL.
2. The <osabi>...</osabi> tags get a newline at the end.
3. And, the whole XML document is indented using white space in a
nested fashion (as in the example output above).
I think that these changes should be fine, the print_xml_feature class
is used:
1. In gdbserver to generate an XML document to send as the target
description to GDB.
2. In GDB as part of a self-check function, a target_desc is
converted to XML then parsed back into a target_desc. We then check
the before and after target_desc objects are the same.
3. In the new 'maint print xml-tdesc' command.
In all of these use cases adding the extra white space should be fine.
gdbsupport/ChangeLog:
* tdesc.cc (print_xml_feature::visit_pre): Use add_line to add
output content, and call indent as needed in all overloaded
variants.
(print_xml_feature::visit_post): Likewise.
(print_xml_feature::visit): Likewise.
(print_xml_feature::add_line): Two new overloaded functions.
* tdesc.h (print_xml_feature::indent): New member function.
(print_xml_feature::add_line): Two new overloaded member
functions.
(print_xml_feature::m_depth): New member variable.
gdb/ChangeLog:
* target-descriptions.c (tdesc_architecture_name): Protect against
NULL pointer dereference.
(maint_print_xml_tdesc_cmd): New function.
(_initialize_target_descriptions): Register new 'maint print
xml-tdesc' command and give it the filename completer.
* NEWS: Mention new 'maint print xml-tdesc' command.
gdb/testsuite/ChangeLog:
* gdb.xml/tdesc-reload.c: New file.
* gdb.xml/tdesc-reload.exp: New file.
* gdb.xml/maint-xml-dump-01.xml: New file.
* gdb.xml/maint-xml-dump-02.xml: New file.
* gdb.xml/maint-xml-dump.exp: New file.
gdb/doc/ChangeLog:
* gdb.texinfo (Maintenance Commands): Document new 'maint print
xml-desc' command.
2020-06-10 06:08:54 +08:00
|
|
|
|
|
|
|
/* Called with a positive value of ADJUST when we move inside an element,
|
|
|
|
for example inside <target>, and with a negative value when we leave
|
|
|
|
the element. In this class this function does nothing, but a
|
|
|
|
sub-class can override this to track the current level of nesting. */
|
|
|
|
void indent (int adjust)
|
|
|
|
{
|
|
|
|
m_depth += (adjust * 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Functions to add lines to the output buffer M_BUFFER. Each of these
|
|
|
|
functions appends a newline, so don't include one in the strings being
|
|
|
|
passed. */
|
|
|
|
void add_line (const std::string &str);
|
2020-06-28 02:38:43 +08:00
|
|
|
void add_line (const char *fmt, ...) ATTRIBUTE_PRINTF (2, 3);
|
gdb: New maintenance command to print XML target description
This commit adds a new maintenance command that dumps the current
target description as an XML document. This is a maintenance command
as I currently only see this being useful for GDB developers, or for
people debugging a new remote target.
By default the command will print whatever the current target
description is, whether this was delivered by the remote, loaded by
the user from a file, or if it is a built in target within GDB.
The command can also take an optional filename argument. In this case
GDB loads a target description from the file, and then reprints it.
This could be useful for testing GDB's parsing of target descriptions,
or to check that GDB can successfully parse a particular XML
description.
It is worth noting that the XML description printed will not be an
exact copy of the document fed into GDB. For example this minimal
input file:
<target>
<feature name="abc">
<reg name="r1" bitsize="32"/>
</feature>
</target>
Will produce this output:
(gdb) maint print xml-tdesc path/to/file.xml
<?xml version="1.0"?>
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<feature name="abc">
<reg name="r1" bitsize="32" type="int" regnum="0"/>
</feature>
</target>
Notice that GDB filled in both the 'type' and 'regnum' fields of the
<reg>. I think this is actually a positive as it means we get to
really understand how GDB processed the document, if GDB made some
assumptions that differ to those the user expected then hopefully this
will bring those issues to the users attention.
To implement this I have tweaked the output produced by the
print_xml_feature which is defined within the gdbsupport/ directory.
The changes I have made to this class are:
1. The <architecture>...</architecture> tags are now not produced if
the architecture name is NULL.
2. The <osabi>...</osabi> tags get a newline at the end.
3. And, the whole XML document is indented using white space in a
nested fashion (as in the example output above).
I think that these changes should be fine, the print_xml_feature class
is used:
1. In gdbserver to generate an XML document to send as the target
description to GDB.
2. In GDB as part of a self-check function, a target_desc is
converted to XML then parsed back into a target_desc. We then check
the before and after target_desc objects are the same.
3. In the new 'maint print xml-tdesc' command.
In all of these use cases adding the extra white space should be fine.
gdbsupport/ChangeLog:
* tdesc.cc (print_xml_feature::visit_pre): Use add_line to add
output content, and call indent as needed in all overloaded
variants.
(print_xml_feature::visit_post): Likewise.
(print_xml_feature::visit): Likewise.
(print_xml_feature::add_line): Two new overloaded functions.
* tdesc.h (print_xml_feature::indent): New member function.
(print_xml_feature::add_line): Two new overloaded member
functions.
(print_xml_feature::m_depth): New member variable.
gdb/ChangeLog:
* target-descriptions.c (tdesc_architecture_name): Protect against
NULL pointer dereference.
(maint_print_xml_tdesc_cmd): New function.
(_initialize_target_descriptions): Register new 'maint print
xml-tdesc' command and give it the filename completer.
* NEWS: Mention new 'maint print xml-tdesc' command.
gdb/testsuite/ChangeLog:
* gdb.xml/tdesc-reload.c: New file.
* gdb.xml/tdesc-reload.exp: New file.
* gdb.xml/maint-xml-dump-01.xml: New file.
* gdb.xml/maint-xml-dump-02.xml: New file.
* gdb.xml/maint-xml-dump.exp: New file.
gdb/doc/ChangeLog:
* gdb.texinfo (Maintenance Commands): Document new 'maint print
xml-desc' command.
2020-06-10 06:08:54 +08:00
|
|
|
|
|
|
|
/* The buffer we are writing too. */
|
2018-04-19 03:09:12 +08:00
|
|
|
std::string *m_buffer;
|
gdb: New maintenance command to print XML target description
This commit adds a new maintenance command that dumps the current
target description as an XML document. This is a maintenance command
as I currently only see this being useful for GDB developers, or for
people debugging a new remote target.
By default the command will print whatever the current target
description is, whether this was delivered by the remote, loaded by
the user from a file, or if it is a built in target within GDB.
The command can also take an optional filename argument. In this case
GDB loads a target description from the file, and then reprints it.
This could be useful for testing GDB's parsing of target descriptions,
or to check that GDB can successfully parse a particular XML
description.
It is worth noting that the XML description printed will not be an
exact copy of the document fed into GDB. For example this minimal
input file:
<target>
<feature name="abc">
<reg name="r1" bitsize="32"/>
</feature>
</target>
Will produce this output:
(gdb) maint print xml-tdesc path/to/file.xml
<?xml version="1.0"?>
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<feature name="abc">
<reg name="r1" bitsize="32" type="int" regnum="0"/>
</feature>
</target>
Notice that GDB filled in both the 'type' and 'regnum' fields of the
<reg>. I think this is actually a positive as it means we get to
really understand how GDB processed the document, if GDB made some
assumptions that differ to those the user expected then hopefully this
will bring those issues to the users attention.
To implement this I have tweaked the output produced by the
print_xml_feature which is defined within the gdbsupport/ directory.
The changes I have made to this class are:
1. The <architecture>...</architecture> tags are now not produced if
the architecture name is NULL.
2. The <osabi>...</osabi> tags get a newline at the end.
3. And, the whole XML document is indented using white space in a
nested fashion (as in the example output above).
I think that these changes should be fine, the print_xml_feature class
is used:
1. In gdbserver to generate an XML document to send as the target
description to GDB.
2. In GDB as part of a self-check function, a target_desc is
converted to XML then parsed back into a target_desc. We then check
the before and after target_desc objects are the same.
3. In the new 'maint print xml-tdesc' command.
In all of these use cases adding the extra white space should be fine.
gdbsupport/ChangeLog:
* tdesc.cc (print_xml_feature::visit_pre): Use add_line to add
output content, and call indent as needed in all overloaded
variants.
(print_xml_feature::visit_post): Likewise.
(print_xml_feature::visit): Likewise.
(print_xml_feature::add_line): Two new overloaded functions.
* tdesc.h (print_xml_feature::indent): New member function.
(print_xml_feature::add_line): Two new overloaded member
functions.
(print_xml_feature::m_depth): New member variable.
gdb/ChangeLog:
* target-descriptions.c (tdesc_architecture_name): Protect against
NULL pointer dereference.
(maint_print_xml_tdesc_cmd): New function.
(_initialize_target_descriptions): Register new 'maint print
xml-tdesc' command and give it the filename completer.
* NEWS: Mention new 'maint print xml-tdesc' command.
gdb/testsuite/ChangeLog:
* gdb.xml/tdesc-reload.c: New file.
* gdb.xml/tdesc-reload.exp: New file.
* gdb.xml/maint-xml-dump-01.xml: New file.
* gdb.xml/maint-xml-dump-02.xml: New file.
* gdb.xml/maint-xml-dump.exp: New file.
gdb/doc/ChangeLog:
* gdb.texinfo (Maintenance Commands): Document new 'maint print
xml-desc' command.
2020-06-10 06:08:54 +08:00
|
|
|
|
|
|
|
/* The current indentation depth. */
|
|
|
|
int m_depth;
|
2018-04-19 03:09:12 +08:00
|
|
|
};
|
|
|
|
|
2019-01-28 03:51:36 +08:00
|
|
|
#endif /* COMMON_TDESC_H */
|