mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-13 11:58:51 +08:00
libctf, include, binutils, gdb, ld: rename ctf_file_t to ctf_dict_t
The naming of the ctf_file_t type in libctf is a historical curiosity. Back in the Solaris days, CTF dictionaries were originally generated as a separate file and then (sometimes) merged into objects: hence the datatype was named ctf_file_t, and known as a "CTF file". Nowadays, raw CTF is essentially never written to a file on its own, and the datatype changed name to a "CTF dictionary" years ago. So the term "CTF file" refers to something that is never a file! This is at best confusing. The type has also historically been known as a 'CTF container", which is even more confusing now that we have CTF archives which are *also* a sort of container (they contain CTF dictionaries), but which are never referred to as containers in the source code. So fix this by completing the renaming, renaming ctf_file_t to ctf_dict_t throughout, and renaming those few functions that refer to CTF files by name (keeping compatibility aliases) to refer to dicts instead. Old users who still refer to ctf_file_t will see (harmless) pointer-compatibility warnings at compile time, but the ABI is unchanged (since C doesn't mangle names, and ctf_file_t was always an opaque type) and things will still compile fine as long as -Werror is not specified. All references to CTF containers and CTF files in the source code are fixed to refer to CTF dicts instead. Further (smaller) renamings of annoyingly-named functions to come, as part of the process of souping up queries across whole archives at once (needed for the function info and data object sections). binutils/ChangeLog 2020-11-20 Nick Alcock <nick.alcock@oracle.com> * objdump.c (dump_ctf_errs): Rename ctf_file_t to ctf_dict_t. (dump_ctf_archive_member): Likewise. (dump_ctf): Likewise. Use ctf_dict_close, not ctf_file_close. * readelf.c (dump_ctf_errs): Rename ctf_file_t to ctf_dict_t. (dump_ctf_archive_member): Likewise. (dump_section_as_ctf): Likewise. Use ctf_dict_close, not ctf_file_close. gdb/ChangeLog 2020-11-20 Nick Alcock <nick.alcock@oracle.com> * ctfread.c: Change uses of ctf_file_t to ctf_dict_t. (ctf_fp_info::~ctf_fp_info): Call ctf_dict_close, not ctf_file_close. include/ChangeLog 2020-11-20 Nick Alcock <nick.alcock@oracle.com> * ctf-api.h (ctf_file_t): Rename to... (ctf_dict_t): ... this. Keep ctf_file_t around for compatibility. (struct ctf_file): Likewise rename to... (struct ctf_dict): ... this. (ctf_file_close): Rename to... (ctf_dict_close): ... this, keeping compatibility function. (ctf_parent_file): Rename to... (ctf_parent_dict): ... this, keeping compatibility function. All callers adjusted. * ctf.h: Rename references to ctf_file_t to ctf_dict_t. (struct ctf_archive) <ctfa_nfiles>: Rename to... <ctfa_ndicts>: ... this. ld/ChangeLog 2020-11-20 Nick Alcock <nick.alcock@oracle.com> * ldlang.c (ctf_output): This is a ctf_dict_t now. (lang_ctf_errs_warnings): Rename ctf_file_t to ctf_dict_t. (ldlang_open_ctf): Adjust comment. (lang_merge_ctf): Use ctf_dict_close, not ctf_file_close. * ldelfgen.h (ldelf_examine_strtab_for_ctf): Rename ctf_file_t to ctf_dict_t. Change opaque declaration accordingly. * ldelfgen.c (ldelf_examine_strtab_for_ctf): Adjust. * ldemul.h (examine_strtab_for_ctf): Likewise. (ldemul_examine_strtab_for_ctf): Likewise. * ldeuml.c (ldemul_examine_strtab_for_ctf): Likewise. libctf/ChangeLog 2020-11-20 Nick Alcock <nick.alcock@oracle.com> * ctf-impl.h: Rename ctf_file_t to ctf_dict_t: all declarations adjusted. (ctf_fileops): Rename to... (ctf_dictops): ... this. (ctf_dedup_t) <cd_id_to_file_t>: Rename to... <cd_id_to_dict_t>: ... this. (ctf_file_t): Fix outdated comment. <ctf_fileops>: Rename to... <ctf_dictops>: ... this. (struct ctf_archive_internal) <ctfi_file>: Rename to... <ctfi_dict>: ... this. * ctf-archive.c: Rename ctf_file_t to ctf_dict_t. Rename ctf_archive.ctfa_nfiles to ctfa_ndicts. Rename ctf_file_close to ctf_dict_close. All users adjusted. * ctf-create.c: Likewise. Refer to CTF dicts, not CTF containers. (ctf_bundle_t) <ctb_file>: Rename to... <ctb_dict): ... this. * ctf-decl.c: Rename ctf_file_t to ctf_dict_t. * ctf-dedup.c: Likewise. Rename ctf_file_close to ctf_dict_close. Refer to CTF dicts, not CTF containers. * ctf-dump.c: Likewise. * ctf-error.c: Likewise. * ctf-hash.c: Likewise. * ctf-inlines.h: Likewise. * ctf-labels.c: Likewise. * ctf-link.c: Likewise. * ctf-lookup.c: Likewise. * ctf-open-bfd.c: Likewise. * ctf-string.c: Likewise. * ctf-subr.c: Likewise. * ctf-types.c: Likewise. * ctf-util.c: Likewise. * ctf-open.c: Likewise. (ctf_file_close): Rename to... (ctf_dict_close): ...this. (ctf_file_close): New trivial wrapper around ctf_dict_close, for compatibility. (ctf_parent_file): Rename to... (ctf_parent_dict): ... this. (ctf_parent_file): New trivial wrapper around ctf_parent_dict, for compatibility. * libctf.ver: Add ctf_dict_close and ctf_parent_dict.
This commit is contained in:
Nick Alcock
binutils
gdb
include
ld
libctf
@ -36,7 +36,7 @@ typedef struct ctf_dump_item
|
||||
struct ctf_dump_state
|
||||
{
|
||||
ctf_sect_names_t cds_sect;
|
||||
ctf_file_t *cds_fp;
|
||||
ctf_dict_t *cds_fp;
|
||||
ctf_dump_item_t *cds_current;
|
||||
ctf_list_t cds_items;
|
||||
};
|
||||
@ -46,7 +46,7 @@ struct ctf_dump_state
|
||||
typedef struct ctf_dump_membstate
|
||||
{
|
||||
char **cdm_str;
|
||||
ctf_file_t *cdm_fp;
|
||||
ctf_dict_t *cdm_fp;
|
||||
} ctf_dump_membstate_t;
|
||||
|
||||
static int
|
||||
@ -83,7 +83,7 @@ ctf_dump_free (ctf_dump_state_t *state)
|
||||
type's references. */
|
||||
|
||||
static char *
|
||||
ctf_dump_format_type (ctf_file_t *fp, ctf_id_t id, int flag)
|
||||
ctf_dump_format_type (ctf_dict_t *fp, ctf_id_t id, int flag)
|
||||
{
|
||||
ctf_id_t new_id;
|
||||
char *str = NULL, *bit = NULL, *buf = NULL;
|
||||
@ -183,7 +183,7 @@ ctf_dump_format_type (ctf_file_t *fp, ctf_id_t id, int flag)
|
||||
|
||||
/* Dump one string field from the file header into the cds_items. */
|
||||
static int
|
||||
ctf_dump_header_strfield (ctf_file_t *fp, ctf_dump_state_t *state,
|
||||
ctf_dump_header_strfield (ctf_dict_t *fp, ctf_dump_state_t *state,
|
||||
const char *name, uint32_t value)
|
||||
{
|
||||
char *str;
|
||||
@ -201,7 +201,7 @@ ctf_dump_header_strfield (ctf_file_t *fp, ctf_dump_state_t *state,
|
||||
|
||||
/* Dump one section-offset field from the file header into the cds_items. */
|
||||
static int
|
||||
ctf_dump_header_sectfield (ctf_file_t *fp, ctf_dump_state_t *state,
|
||||
ctf_dump_header_sectfield (ctf_dict_t *fp, ctf_dump_state_t *state,
|
||||
const char *sect, uint32_t off, uint32_t nextoff)
|
||||
{
|
||||
char *str;
|
||||
@ -221,7 +221,7 @@ ctf_dump_header_sectfield (ctf_file_t *fp, ctf_dump_state_t *state,
|
||||
|
||||
/* Dump the file header into the cds_items. */
|
||||
static int
|
||||
ctf_dump_header (ctf_file_t *fp, ctf_dump_state_t *state)
|
||||
ctf_dump_header (ctf_dict_t *fp, ctf_dump_state_t *state)
|
||||
{
|
||||
char *str;
|
||||
const ctf_header_t *hp = fp->ctf_header;
|
||||
@ -252,7 +252,7 @@ ctf_dump_header (ctf_file_t *fp, ctf_dump_state_t *state)
|
||||
|
||||
/* Everything else is only printed if present. */
|
||||
|
||||
/* The flags are unusual in that they represent the ctf_file_t *in memory*:
|
||||
/* The flags are unusual in that they represent the ctf_dict_t *in memory*:
|
||||
flags representing compression, etc, are turned off as the file is
|
||||
decompressed. So we store a copy of the flags before they are changed, for
|
||||
the dumper. */
|
||||
@ -339,7 +339,7 @@ ctf_dump_label (const char *name, const ctf_lblinfo_t *info,
|
||||
them, rather than only one. */
|
||||
|
||||
static int
|
||||
ctf_dump_objts (ctf_file_t *fp, ctf_dump_state_t *state)
|
||||
ctf_dump_objts (ctf_dict_t *fp, ctf_dump_state_t *state)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
@ -396,7 +396,7 @@ ctf_dump_objts (ctf_file_t *fp, ctf_dump_state_t *state)
|
||||
iterator for this section.) */
|
||||
|
||||
static int
|
||||
ctf_dump_funcs (ctf_file_t *fp, ctf_dump_state_t *state)
|
||||
ctf_dump_funcs (ctf_dict_t *fp, ctf_dump_state_t *state)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
@ -627,7 +627,7 @@ ctf_dump_type (ctf_id_t id, int flag, void *arg)
|
||||
/* Dump the string table into the cds_items. */
|
||||
|
||||
static int
|
||||
ctf_dump_str (ctf_file_t *fp, ctf_dump_state_t *state)
|
||||
ctf_dump_str (ctf_dict_t *fp, ctf_dump_state_t *state)
|
||||
{
|
||||
const char *s = fp->ctf_str[CTF_STRTAB_0].cts_strs;
|
||||
|
||||
@ -657,7 +657,7 @@ ctf_dump_str (ctf_file_t *fp, ctf_dump_state_t *state)
|
||||
allocate a new one and return it if it likes). */
|
||||
|
||||
char *
|
||||
ctf_dump (ctf_file_t *fp, ctf_dump_state_t **statep, ctf_sect_names_t sect,
|
||||
ctf_dump (ctf_dict_t *fp, ctf_dump_state_t **statep, ctf_sect_names_t sect,
|
||||
ctf_dump_decorate_f *func, void *arg)
|
||||
{
|
||||
char *str;
|
||||
|
||||
Reference in New Issue
Block a user