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.

6 files changed, 25 insertions, 12 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c0b47f4..a00cfe9 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
 2020-11-20  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
 
 	* testsuite/ld-elf/retain3.s: Move symbolic reference into writeable
diff --git a/ld/ldelfgen.c b/ld/ldelfgen.c
index 3a56194..e9496f9 100644
--- a/ld/ldelfgen.c
+++ b/ld/ldelfgen.c
@@ -175,7 +175,7 @@ ldelf_ctf_symbols_iter_cb (struct ctf_link_sym *dest,
 
 void
 ldelf_examine_strtab_for_ctf
-  (struct ctf_file *ctf_output, struct elf_sym_strtab *syms,
+  (struct ctf_dict *ctf_output, struct elf_sym_strtab *syms,
    bfd_size_type symcount, struct elf_strtab_hash *symstrtab)
 {
   struct ctf_strsym_iter_cb_arg args = { syms, symcount, symstrtab,
@@ -205,7 +205,7 @@ extern int ldelf_emit_ctf_early (void)
 }
 
 extern void ldelf_examine_strtab_for_ctf
-  (struct ctf_file *ctf_output ATTRIBUTE_UNUSED,
+  (struct ctf_dict *ctf_output ATTRIBUTE_UNUSED,
    struct elf_sym_strtab *syms ATTRIBUTE_UNUSED,
    bfd_size_type symcount ATTRIBUTE_UNUSED,
    struct elf_strtab_hash *symstrtab ATTRIBUTE_UNUSED)
diff --git a/ld/ldelfgen.h b/ld/ldelfgen.h
index 7079990..93bdf29 100644
--- a/ld/ldelfgen.h
+++ b/ld/ldelfgen.h
@@ -20,10 +20,10 @@
 
 struct elf_sym_strtab;
 struct elf_strtab_hash;
-struct ctf_file;
+struct ctf_dict;
 
 extern void ldelf_map_segments (bfd_boolean);
 extern int ldelf_emit_ctf_early (void);
 extern void ldelf_examine_strtab_for_ctf
-  (struct ctf_file *ctf_output, struct elf_sym_strtab *syms,
+  (struct ctf_dict *ctf_output, struct elf_sym_strtab *syms,
    bfd_size_type symcount, struct elf_strtab_hash *symstrtab);
diff --git a/ld/ldemul.c b/ld/ldemul.c
index 00a6a5a..6dc5112 100644
--- a/ld/ldemul.c
+++ b/ld/ldemul.c
@@ -418,7 +418,7 @@ ldemul_emit_ctf_early (void)
 }
 
 void
-ldemul_examine_strtab_for_ctf (struct ctf_file *ctf_output,
+ldemul_examine_strtab_for_ctf (struct ctf_dict *ctf_output,
 			       struct elf_sym_strtab *syms,
 			       bfd_size_type symcount,
 			       struct elf_strtab_hash *symstrtab)
diff --git a/ld/ldemul.h b/ld/ldemul.h
index ca165ac..5efe4aa 100644
--- a/ld/ldemul.h
+++ b/ld/ldemul.h
@@ -110,7 +110,7 @@ extern int ldemul_emit_ctf_early
   (void);
 /* Called from per-target code to examine the strtab and symtab.  */
 extern void ldemul_examine_strtab_for_ctf
-  (struct ctf_file *, struct elf_sym_strtab *, bfd_size_type,
+  (struct ctf_dict *, struct elf_sym_strtab *, bfd_size_type,
    struct elf_strtab_hash *);
 extern bfd_boolean ldemul_print_symbol
   (struct bfd_link_hash_entry *hash_entry, void *ptr);
@@ -236,7 +236,7 @@ typedef struct ld_emulation_xfer_struct {
      waits until 'late'. (Late mode needs explicit support at per-target link
      time to get called at all).  If set, called by ld when the examine_strtab
      bfd_link_callback is invoked by per-target code.  */
-  void (*examine_strtab_for_ctf) (struct ctf_file *, struct elf_sym_strtab *,
+  void (*examine_strtab_for_ctf) (struct ctf_dict *, struct elf_sym_strtab *,
 				  bfd_size_type, struct elf_strtab_hash *);
 
   /* Called when printing a symbol to the map file.   AIX uses this
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 2073ac0..eaf90a6 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -131,7 +131,7 @@ struct lang_phdr *lang_phdr_list;
 struct lang_nocrossrefs *nocrossref_list;
 struct asneeded_minfo **asneeded_list_tail;
 #ifdef ENABLE_LIBCTF
-static ctf_file_t *ctf_output;
+static ctf_dict_t *ctf_output;
 #endif
 
 /* Functions that traverse the linker script and might evaluate
@@ -3674,7 +3674,7 @@ open_input_bfds (lang_statement_union_type *s, enum open_bfd_mode mode)
 /* Emit CTF errors and warnings.  fp can be NULL to report errors/warnings
    that happened specifically at CTF open time.  */
 static void
-lang_ctf_errs_warnings (ctf_file_t *fp)
+lang_ctf_errs_warnings (ctf_dict_t *fp)
 {
   ctf_next_t *i = NULL;
   char *text;
@@ -3713,7 +3713,7 @@ ldlang_open_ctf (void)
     {
       asection *sect;
 
-      /* Incoming files from the compiler have a single ctf_file_t in them
+      /* Incoming files from the compiler have a single ctf_dict_t in them
 	 (which is presented to us by the libctf API in a ctf_archive_t
 	 wrapper): files derived from a previous relocatable link have a CTF
 	 archive containing possibly many CTF files.  */
@@ -3776,7 +3776,7 @@ lang_merge_ctf (void)
   /* If the section was discarded, don't waste time merging.  */
   if (output_sect == NULL)
     {
-      ctf_file_close (ctf_output);
+      ctf_dict_close (ctf_output);
       ctf_output = NULL;
 
       LANG_FOR_EACH_INPUT_STATEMENT (file)
@@ -3882,7 +3882,7 @@ lang_write_ctf (int late)
     }
 
   /* This also closes every CTF input file used in the link.  */
-  ctf_file_close (ctf_output);
+  ctf_dict_close (ctf_output);
   ctf_output = NULL;
 
   LANG_FOR_EACH_INPUT_STATEMENT (file)