diff options
author | Nick Alcock <nick.alcock@oracle.com> | 2020-11-20 13:34:04 +0000 |
---|---|---|
committer | Nick Alcock <nick.alcock@oracle.com> | 2020-11-20 13:34:04 +0000 |
commit | 139633c307eb6f5746ea04f94a0b6382e51bccb9 (patch) | |
tree | 6c070eeecd42d5c5bc93041be7fcc1279495a266 /gdb | |
parent | cbbcd7a716d7f1f65c57aa6ba6e034ecb9a78378 (diff) | |
download | binutils-139633c307eb6f5746ea04f94a0b6382e51bccb9.zip binutils-139633c307eb6f5746ea04f94a0b6382e51bccb9.tar.gz binutils-139633c307eb6f5746ea04f94a0b6382e51bccb9.tar.bz2 |
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.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 5 | ||||
-rw-r--r-- | gdb/ctfread.c | 38 |
2 files changed, 24 insertions, 19 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1208b4a..3eaaddd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +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. + 2020-11-20 Pedro Alves <pedro@palves.net> * language.c (language_arch_info::lookup_primitive_type): Use diff --git a/gdb/ctfread.c b/gdb/ctfread.c index 52eef80..dd401ef 100644 --- a/gdb/ctfread.c +++ b/gdb/ctfread.c @@ -91,29 +91,29 @@ static const struct objfile_key<htab, htab_deleter> ctf_tid_key; struct ctf_fp_info { - explicit ctf_fp_info (ctf_file_t *cfp) : fp (cfp) {} + explicit ctf_fp_info (ctf_dict_t *cfp) : fp (cfp) {} ~ctf_fp_info (); - ctf_file_t *fp; + ctf_dict_t *fp; }; -/* Cleanup function for the ctf_file_key data. */ +/* Cleanup function for the ctf_dict_key data. */ ctf_fp_info::~ctf_fp_info () { if (!fp) return; ctf_archive_t *arc = ctf_get_arc (fp); - ctf_file_close (fp); + ctf_dict_close (fp); ctf_close (arc); } -static const objfile_key<ctf_fp_info> ctf_file_key; +static const objfile_key<ctf_fp_info> ctf_dict_key; /* A CTF context consists of a file pointer and an objfile pointer. */ struct ctf_context { - ctf_file_t *fp; + ctf_dict_t *fp; struct objfile *of; partial_symtab *pst; struct buildsym_compunit *builder; @@ -272,7 +272,7 @@ get_tid_type (struct objfile *of, ctf_id_t tid) /* Return the size of storage in bits for INTEGER, FLOAT, or ENUM. */ static int -get_bitsize (ctf_file_t *fp, ctf_id_t tid, uint32_t kind) +get_bitsize (ctf_dict_t *fp, ctf_id_t tid, uint32_t kind) { ctf_encoding_t cet; @@ -434,7 +434,7 @@ static struct symbol * new_symbol (struct ctf_context *ccp, struct type *type, ctf_id_t tid) { struct objfile *objfile = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct symbol *sym = NULL; gdb::unique_xmalloc_ptr<char> name (ctf_type_aname_raw (fp, tid)); @@ -497,7 +497,7 @@ static struct type * read_base_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *of = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; ctf_encoding_t cet; struct type *type = NULL; char *name; @@ -592,7 +592,7 @@ static struct type * read_structure_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *of = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *type; uint32_t kind; @@ -650,7 +650,7 @@ static struct type * read_func_kind_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *of = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *type, *rettype; ctf_funcinfo_t cfi; @@ -676,7 +676,7 @@ static struct type * read_enum_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *of = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *type, *target_type; ctf_funcinfo_t fi; @@ -751,7 +751,7 @@ static struct type * read_array_type (struct ctf_context *ccp, ctf_id_t tid) { struct objfile *objfile = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *element_type, *range_type, *idx_type; struct type *type; ctf_arinfo_t ar; @@ -816,7 +816,7 @@ static struct type * read_volatile_type (struct ctf_context *ccp, ctf_id_t tid, ctf_id_t btid) { struct objfile *objfile = ccp->of; - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; struct type *base_type, *cv_type; base_type = get_tid_type (objfile, btid); @@ -913,7 +913,7 @@ read_pointer_type (struct ctf_context *ccp, ctf_id_t tid, ctf_id_t btid) static struct type * read_type_record (struct ctf_context *ccp, ctf_id_t tid) { - ctf_file_t *fp = ccp->fp; + ctf_dict_t *fp = ccp->fp; uint32_t kind; struct type *type = NULL; ctf_id_t btid; @@ -1310,7 +1310,7 @@ ctf_psymtab::read_symtab (struct objfile *objfile) static ctf_psymtab * create_partial_symtab (const char *name, - ctf_file_t *cfp, + ctf_dict_t *cfp, struct objfile *objfile) { ctf_psymtab *pst; @@ -1406,7 +1406,7 @@ ctf_psymtab_var_cb (const char *name, ctf_id_t id, void *arg) debugging information is available. */ static void -scan_partial_symbols (ctf_file_t *cfp, struct objfile *of) +scan_partial_symbols (ctf_dict_t *cfp, struct objfile *of) { bfd *abfd = of->obfd; const char *name = bfd_get_filename (abfd); @@ -1482,11 +1482,11 @@ elfctf_build_psymtabs (struct objfile *of) error (_("ctf_bfdopen failed on %s - %s"), bfd_get_filename (abfd), ctf_errmsg (err)); - ctf_file_t *fp = ctf_arc_open_by_name (arc, NULL, &err); + ctf_dict_t *fp = ctf_arc_open_by_name (arc, NULL, &err); if (fp == NULL) error (_("ctf_arc_open_by_name failed on %s - %s"), bfd_get_filename (abfd), ctf_errmsg (err)); - ctf_file_key.emplace (of, fp); + ctf_dict_key.emplace (of, fp); scan_partial_symbols (fp, of); } |