/* Implementation header.
- Copyright (C) 2019-2020 Free Software Foundation, Inc.
+ Copyright (C) 2019-2021 Free Software Foundation, Inc.
This file is part of libctf.
#include <sys/param.h>
#include "ctf-decls.h"
#include <ctf-api.h>
+#include "ctf-sha1.h"
#include <sys/types.h>
#include <stdlib.h>
#include <stdarg.h>
#include <elf.h>
#include <bfd.h>
#include "hashtab.h"
+#include "ctf-intl.h"
#ifdef __cplusplus
extern "C"
{
#endif
+/* Tuning. */
+
+/* The proportion of symtypetab entries which must be pads before we consider it
+ worthwhile to emit a symtypetab section as an index. Indexes cost time to
+ look up, but save space all told. Do not set to 1, since this will cause
+ indexes to be eschewed completely, even in child dicts, at considerable space
+ cost. */
+#define CTF_INDEX_PAD_THRESHOLD .75
+
/* Compiler attributes. */
#if defined (__GNUC__)
#define _libctf_unlikely_(x) __builtin_expect ((x), 0)
#define _libctf_unused_ __attribute__ ((__unused__))
#define _libctf_malloc_ __attribute__((__malloc__))
+#define _libctf_nonnull_ __attribute__((__nonnull__))
#else
#define _libctf_unlikely_(x) (x)
#define _libctf_unused_
#define _libctf_malloc_
+#define _libctf_nonnull_
#define __extension__
#endif
+#if defined (ENABLE_LIBCTF_HASH_DEBUGGING) && !defined (NDEBUG)
+#include <assert.h>
+#define ctf_assert(fp, expr) (assert (expr), 1)
+#else
#define ctf_assert(fp, expr) \
_libctf_unlikely_ (ctf_assert_internal (fp, __FILE__, __LINE__, \
#expr, !!(expr)))
+#endif
/* libctf in-memory state. */
ctf_names_t *ctl_hash; /* Pointer to hash table for lookup. */
} ctf_lookup_t;
-typedef struct ctf_fileops
+typedef struct ctf_dictops
{
uint32_t (*ctfo_get_kind) (uint32_t);
uint32_t (*ctfo_get_root) (uint32_t);
uint32_t (*ctfo_get_vlen) (uint32_t);
- ssize_t (*ctfo_get_ctt_size) (const ctf_file_t *, const ctf_type_t *,
+ ssize_t (*ctfo_get_ctt_size) (const ctf_dict_t *, const ctf_type_t *,
ssize_t *, ssize_t *);
- ssize_t (*ctfo_get_vbytes) (unsigned short, ssize_t, size_t);
-} ctf_fileops_t;
+ ssize_t (*ctfo_get_vbytes) (ctf_dict_t *, unsigned short, ssize_t, size_t);
+} ctf_dictops_t;
typedef struct ctf_list
{
unsigned long dvd_snapshots; /* Snapshot count when inserted. */
} ctf_dvdef_t;
-typedef struct ctf_bundle
-{
- ctf_file_t *ctb_file; /* CTF container handle. */
- ctf_id_t ctb_type; /* CTF type identifier. */
- ctf_dtdef_t *ctb_dtd; /* CTF dynamic type definition (if any). */
-} ctf_bundle_t;
-
typedef struct ctf_err_warning
{
ctf_list_t cew_list; /* List forward/back pointers. */
uint32_t *caf_ref; /* A single ref to this string. */
} ctf_str_atom_ref_t;
+/* A single linker-provided symbol, during symbol addition, possibly before we
+ have been given external strtab refs. */
+typedef struct ctf_in_flight_dynsym
+{
+ ctf_list_t cid_list; /* List forward/back pointers. */
+ ctf_link_sym_t cid_sym; /* The linker-known symbol. */
+} ctf_in_flight_dynsym_t;
+
/* The structure used as the key in a ctf_link_type_mapping. The value is a
type index, not a type ID. */
typedef struct ctf_link_type_key
{
- ctf_file_t *cltk_fp;
+ ctf_dict_t *cltk_fp;
ctf_id_t cltk_idx;
} ctf_link_type_key_t;
+/* The structure used as the key in a cd_id_to_dict_t on 32-bit platforms. */
+typedef struct ctf_type_id_key
+{
+ int ctii_input_num;
+ ctf_id_t ctii_type;
+} ctf_type_id_key_t;
+
+/* Deduplicator state.
+
+ The dedup state below uses three terms consistently. A "hash" is a
+ ctf_dynhash_t; a "hash value" is the hash value of a type as returned by
+ ctf_dedup_hash_type; a "global type ID" or "global ID" is a packed-together
+ reference to a single ctf_dict_t (by array index in an array of inputs) and
+ ctf_id_t, i.e. a single instance of some hash value in some input.
+
+ The deduplication algorithm takes a bunch of inputs and yields a single
+ shared "output" and possibly many outputs corresponding to individual inputs
+ that still contain types after sharing of unconflicted types. Almost all
+ deduplicator state is stored in the struct ctf_dedup in the output, though a
+ (very) few things are stored in inputs for simplicity's sake, usually if they
+ are linking together things within the scope of a single TU.
-/* The ctf_file is the structure used to represent a CTF container to library
+ Flushed at the end of every ctf_dedup run. */
+
+typedef struct ctf_dedup
+{
+ /* The CTF linker flags in force for this dedup run. */
+ int cd_link_flags;
+
+ /* On 32-bit platforms only, a hash of global type IDs, in the form of
+ a ctf_link_type_id_key_t. */
+ ctf_dynhash_t *cd_id_to_dict_t;
+
+ /* Atoms tables of decorated names: maps undecorated name to decorated name.
+ (The actual allocations are in the CTF dict for the former and the real
+ atoms table for the latter). Uses the same namespaces as ctf_lookups,
+ below, but has no need for null-termination. */
+ ctf_dynhash_t *cd_decorated_names[4];
+
+ /* Map type names to a hash from type hash value -> number of times each value
+ has appeared. */
+ ctf_dynhash_t *cd_name_counts;
+
+ /* Map global type IDs to type hash values. Used to determine if types are
+ already hashed without having to recompute their hash values again, and to
+ link types together at later stages. Forwards that are peeked through to
+ structs and unions are not represented in here, so lookups that might be
+ such a type (in practice, all lookups) must go via cd_replaced_types first
+ to take this into account. Discarded before each rehashing. */
+ ctf_dynhash_t *cd_type_hashes;
+
+ /* Maps from the names of structs/unions/enums to a a single GID which is the
+ only appearance of that type in any input: if it appears in more than one
+ input, a value which is a GID with an input_num of -1 appears. Used in
+ share-duplicated link mode link modes to determine whether structs/unions
+ can be cited from multiple TUs. Only populated in that link mode. */
+ ctf_dynhash_t *cd_struct_origin;
+
+ /* Maps type hash values to a set of hash values of the types that cite them:
+ i.e., pointing backwards up the type graph. Used for recursive conflict
+ marking. Citations from tagged structures, unions, and forwards do not
+ appear in this graph. */
+ ctf_dynhash_t *cd_citers;
+
+ /* Maps type hash values to input global type IDs. The value is a set (a
+ hash) of global type IDs. Discarded before each rehashing. The result of
+ the ctf_dedup function. */
+ ctf_dynhash_t *cd_output_mapping;
+
+ /* A map giving the GID of the first appearance of each type for each type
+ hash value. */
+ ctf_dynhash_t *cd_output_first_gid;
+
+ /* Used to ensure that we never try to map a single type ID to more than one
+ hash. */
+ ctf_dynhash_t *cd_output_mapping_guard;
+
+ /* Maps the global type IDs of structures in input TUs whose members still
+ need emission to the global type ID of the already-emitted target type
+ (which has no members yet) in the appropriate target. Uniquely, the latter
+ ID represents a *target* ID (i.e. the cd_output_mapping of some specified
+ input): we encode the shared (parent) dict with an ID of -1. */
+ ctf_dynhash_t *cd_emission_struct_members;
+
+ /* A set (a hash) of hash values of conflicting types. */
+ ctf_dynset_t *cd_conflicting_types;
+
+ /* Maps type hashes to ctf_id_t's in this dictionary. Populated only at
+ emission time, in the dictionary where emission is taking place. */
+ ctf_dynhash_t *cd_output_emission_hashes;
+
+ /* Maps the decorated names of conflicted cross-TU forwards that were forcibly
+ emitted in this TU to their emitted ctf_id_ts. Populated only at emission
+ time, in the dictionary where emission is taking place. */
+ ctf_dynhash_t *cd_output_emission_conflicted_forwards;
+
+ /* Points to the output counterpart of this input dictionary, at emission
+ time. */
+ ctf_dict_t *cd_output;
+} ctf_dedup_t;
+
+/* The ctf_dict is the structure used to represent a CTF dictionary to library
clients, who see it only as an opaque pointer. Modifications can therefore
be made freely to this structure without regard to client versioning. The
- ctf_file_t typedef appears in <ctf-api.h> and declares a forward tag.
+ ctf_dict_t typedef appears in <ctf-api.h> and declares a forward tag.
+ (A ctf_file_t typedef also appears there, for historical reasons.)
- NOTE: ctf_update() requires that everything inside of ctf_file either be an
- immediate value, a pointer to dynamically allocated data *outside* of the
- ctf_file itself, or a pointer to statically allocated data. If you add a
- pointer to ctf_file that points to something within the ctf_file itself,
- you must make corresponding changes to ctf_update(). */
+ NOTE: ctf_serialize() requires that everything inside of ctf_dict either be
+ an immediate value, a pointer to dynamically allocated data *outside* of the
+ ctf_dict itself, or a pointer to statically allocated data. If you add a
+ pointer to ctf_dict that points to something within the ctf_dict itself, you
+ must make corresponding changes to ctf_serialize(). */
-struct ctf_file
+struct ctf_dict
{
- const ctf_fileops_t *ctf_fileops; /* Version-specific file operations. */
- struct ctf_header *ctf_header; /* The header from this CTF file. */
- unsigned char ctf_openflags; /* Flags the file had when opened. */
+ const ctf_dictops_t *ctf_dictops; /* Version-specific dict operations. */
+ struct ctf_header *ctf_header; /* The header from this CTF dict. */
+ unsigned char ctf_openflags; /* Flags the dict had when opened. */
ctf_sect_t ctf_data; /* CTF data from object file. */
ctf_sect_t ctf_symtab; /* Symbol table from object file. */
ctf_sect_t ctf_strtab; /* String table from object file. */
+ int ctf_symsect_little_endian; /* Endianness of the ctf_symtab. */
ctf_dynhash_t *ctf_prov_strtab; /* Maps provisional-strtab offsets
to names. */
ctf_dynhash_t *ctf_syn_ext_strtab; /* Maps ext-strtab offsets to names. */
unsigned char *ctf_dynbase; /* Freeable CTF file pointer. */
unsigned char *ctf_buf; /* Uncompressed CTF data buffer. */
size_t ctf_size; /* Size of CTF header + uncompressed data. */
- uint32_t *ctf_sxlate; /* Translation table for symtab entries. */
+ uint32_t *ctf_sxlate; /* Translation table for unindexed symtypetab
+ entries. */
unsigned long ctf_nsyms; /* Number of entries in symtab xlate table. */
uint32_t *ctf_txlate; /* Translation table for type IDs. */
uint32_t *ctf_ptrtab; /* Translation table for pointer-to lookups. */
size_t ctf_ptrtab_len; /* Num types storable in ptrtab currently. */
+ uint32_t *ctf_funcidx_names; /* Name of each function symbol in symtypetab
+ (if indexed). */
+ uint32_t *ctf_objtidx_names; /* Likewise, for object symbols. */
+ size_t ctf_nfuncidx; /* Number of funcidx entries. */
+ uint32_t *ctf_funcidx_sxlate; /* Offsets into funcinfo for a given funcidx. */
+ uint32_t *ctf_objtidx_sxlate; /* Likewise, for ctf_objtidx. */
+ size_t ctf_nobjtidx; /* Number of objtidx entries. */
+ ctf_dynhash_t *ctf_objthash; /* name -> type ID. */
+ ctf_dynhash_t *ctf_funchash; /* name -> CTF_K_FUNCTION type ID. */
+
+ /* The next three are linker-derived state found in ctf_link targets only. */
+
+ ctf_dynhash_t *ctf_dynsyms; /* Symbol info from ctf_link_shuffle_syms. */
+ ctf_link_sym_t **ctf_dynsymidx; /* Indexes ctf_dynsyms by symidx. */
+ uint32_t ctf_dynsymmax; /* Maximum ctf_dynsym index. */
+ ctf_list_t ctf_in_flight_dynsyms; /* Dynsyms during accumulation. */
struct ctf_varent *ctf_vars; /* Sorted variable->type mapping. */
unsigned long ctf_nvars; /* Number of variables in ctf_vars. */
unsigned long ctf_typemax; /* Maximum valid type ID number. */
const ctf_dmodel_t *ctf_dmodel; /* Data model pointer (see above). */
const char *ctf_cuname; /* Compilation unit name (if any). */
char *ctf_dyncuname; /* Dynamically allocated name of CU. */
- struct ctf_file *ctf_parent; /* Parent CTF container (if any). */
+ struct ctf_dict *ctf_parent; /* Parent CTF dict (if any). */
int ctf_parent_unreffed; /* Parent set by ctf_import_unref? */
- const char *ctf_parlabel; /* Label in parent container (if any). */
+ const char *ctf_parlabel; /* Label in parent dict (if any). */
const char *ctf_parname; /* Basename of parent (if any). */
char *ctf_dynparname; /* Dynamically allocated name of parent. */
uint32_t ctf_parmax; /* Highest type ID of a parent type. */
unsigned long ctf_dtoldid; /* Oldest id that has been committed. */
unsigned long ctf_snapshots; /* ctf_snapshot() plus ctf_update() count. */
unsigned long ctf_snapshot_lu; /* ctf_snapshot() call count at last update. */
- ctf_archive_t *ctf_archive; /* Archive this ctf_file_t came from. */
+ ctf_archive_t *ctf_archive; /* Archive this ctf_dict_t came from. */
ctf_list_t ctf_errs_warnings; /* CTF errors and warnings. */
ctf_dynhash_t *ctf_link_inputs; /* Inputs to this link. */
ctf_dynhash_t *ctf_link_outputs; /* Additional outputs from this link. */
/* Allow the caller to change the name of link archive members. */
ctf_link_memb_name_changer_f *ctf_link_memb_name_changer;
- void *ctf_link_memb_name_changer_arg; /* Argument for it. */
+ void *ctf_link_memb_name_changer_arg; /* Argument for it. */
+
+ /* Allow the caller to filter out variables they don't care about. */
+ ctf_link_variable_filter_f *ctf_link_variable_filter;
+ void *ctf_link_variable_filter_arg; /* Argument for it. */
+
ctf_dynhash_t *ctf_add_processing; /* Types ctf_add_type is working on now. */
+
+ /* Atoms table for dedup string storage. All strings in the ctf_dedup_t are
+ stored here. Only the _alloc copy is allocated or freed: the
+ ctf_dedup_atoms may be pointed to some other CTF dict, to share its atoms.
+ We keep the atoms table outside the ctf_dedup so that atoms can be
+ preserved across multiple similar links, such as when doing cu-mapped
+ links. */
+ ctf_dynset_t *ctf_dedup_atoms;
+ ctf_dynset_t *ctf_dedup_atoms_alloc;
+
+ ctf_dedup_t ctf_dedup; /* Deduplicator state. */
+
char *ctf_tmp_typeslice; /* Storage for slicing up type names. */
size_t ctf_tmp_typeslicelen; /* Size of the typeslice. */
void *ctf_specific; /* Data for ctf_get/setspecific(). */
};
-/* An abstraction over both a ctf_file_t and a ctf_archive_t. */
+/* An abstraction over both a ctf_dict_t and a ctf_archive_t. */
struct ctf_archive_internal
{
int ctfi_is_archive;
int ctfi_unmap_on_close;
- ctf_file_t *ctfi_file;
+ ctf_dict_t *ctfi_dict;
struct ctf_archive *ctfi_archive;
+ ctf_dynhash_t *ctfi_dicts; /* Dicts we have opened and cached. */
+ ctf_dict_t **ctfi_symdicts; /* Array of index -> ctf_dict_t *. */
+ ctf_id_t *ctfi_syms; /* Array of index -> ctf_id_t. */
ctf_sect_t ctfi_symsect;
+ int ctfi_symsect_little_endian; /* -1 for unknown / do not set. */
ctf_sect_t ctfi_strsect;
int ctfi_free_symsect;
int ctfi_free_strsect;
void *ctfi_data;
- bfd *ctfi_abfd; /* Optional source of section data. */
+ bfd *ctfi_abfd; /* Optional source of section data. */
void (*ctfi_bfd_close) (struct ctf_archive_internal *);
};
ssize_t ctn_size;
ssize_t ctn_increment;
uint32_t ctn_n;
- /* We can save space on this side of things by noting that a container is
+ /* We can save space on this side of things by noting that a dictionary is
either dynamic or not, as a whole, and a given iterator can only iterate
over one kind of thing at once: so we can overlap the DTD and non-DTD
- members, and the structure, variable and enum members, etc. */
+ members, and the structure, variable and enum members, etc.
+
+ Some of the _next iterators actually thunk down to another _next iterator
+ themselves, so one of the options in here is a _next iterator! */
union
{
const ctf_member_t *ctn_mp;
const ctf_dmdef_t *ctn_dmd;
const ctf_enum_t *ctn_en;
const ctf_dvdef_t *ctn_dvd;
+ ctf_next_t *ctn_next;
ctf_next_hkv_t *ctn_sorted_hkv;
void **ctn_hash_slot;
} u;
- /* This union is of various sorts of container we can iterate over:
+ /* This union is of various sorts of dict we can iterate over:
currently dictionaries and archives, dynhashes, and dynsets. */
union
{
- const ctf_file_t *ctn_fp;
+ const ctf_dict_t *ctn_fp;
const ctf_archive_t *ctn_arc;
const ctf_dynhash_t *ctn_h;
const ctf_dynset_t *ctn_s;
(fp, i, fp->ctf_flags & LCTF_CHILD))->dtd_data) : \
(ctf_type_t *)((uintptr_t)(fp)->ctf_buf + (fp)->ctf_txlate[(i)]))
-#define LCTF_INFO_KIND(fp, info) ((fp)->ctf_fileops->ctfo_get_kind(info))
-#define LCTF_INFO_ISROOT(fp, info) ((fp)->ctf_fileops->ctfo_get_root(info))
-#define LCTF_INFO_VLEN(fp, info) ((fp)->ctf_fileops->ctfo_get_vlen(info))
+#define LCTF_INFO_KIND(fp, info) ((fp)->ctf_dictops->ctfo_get_kind(info))
+#define LCTF_INFO_ISROOT(fp, info) ((fp)->ctf_dictops->ctfo_get_root(info))
+#define LCTF_INFO_VLEN(fp, info) ((fp)->ctf_dictops->ctfo_get_vlen(info))
#define LCTF_VBYTES(fp, kind, size, vlen) \
- ((fp)->ctf_fileops->ctfo_get_vbytes(kind, size, vlen))
+ ((fp)->ctf_dictops->ctfo_get_vbytes(fp, kind, size, vlen))
+
+#define LCTF_CHILD 0x0001 /* CTF dict is a child. */
+#define LCTF_RDWR 0x0002 /* CTF dict is writable. */
+#define LCTF_DIRTY 0x0004 /* CTF dict has been modified. */
-#define LCTF_CHILD 0x0001 /* CTF container is a child */
-#define LCTF_RDWR 0x0002 /* CTF container is writable */
-#define LCTF_DIRTY 0x0004 /* CTF container has been modified */
+extern ctf_names_t *ctf_name_table (ctf_dict_t *, int);
+extern const ctf_type_t *ctf_lookup_by_id (ctf_dict_t **, ctf_id_t);
+extern ctf_id_t ctf_lookup_by_rawname (ctf_dict_t *, int, const char *);
+extern ctf_id_t ctf_lookup_by_rawhash (ctf_dict_t *, ctf_names_t *, const char *);
+extern void ctf_set_ctl_hashes (ctf_dict_t *);
-extern ctf_names_t *ctf_name_table (ctf_file_t *, int);
-extern const ctf_type_t *ctf_lookup_by_id (ctf_file_t **, ctf_id_t);
-extern ctf_id_t ctf_lookup_by_rawname (ctf_file_t *, int, const char *);
-extern ctf_id_t ctf_lookup_by_rawhash (ctf_file_t *, ctf_names_t *, const char *);
-extern void ctf_set_ctl_hashes (ctf_file_t *);
+extern int ctf_symtab_skippable (ctf_link_sym_t *sym);
+extern int ctf_add_funcobjt_sym (ctf_dict_t *, int is_function,
+ const char *, ctf_id_t);
-extern ctf_file_t *ctf_get_dict (ctf_file_t *fp, ctf_id_t type);
+extern ctf_dict_t *ctf_get_dict (ctf_dict_t *fp, ctf_id_t type);
typedef unsigned int (*ctf_hash_fun) (const void *ptr);
extern unsigned int ctf_hash_integer (const void *ptr);
extern unsigned int ctf_hash_string (const void *ptr);
extern unsigned int ctf_hash_type_key (const void *ptr);
+extern unsigned int ctf_hash_type_id_key (const void *ptr);
typedef int (*ctf_hash_eq_fun) (const void *, const void *);
extern int ctf_hash_eq_integer (const void *, const void *);
extern int ctf_hash_eq_string (const void *, const void *);
extern int ctf_hash_eq_type_key (const void *, const void *);
+extern int ctf_hash_eq_type_id_key (const void *, const void *);
extern int ctf_dynset_eq_string (const void *, const void *);
void *arg);
extern ctf_hash_t *ctf_hash_create (unsigned long, ctf_hash_fun, ctf_hash_eq_fun);
-extern int ctf_hash_insert_type (ctf_hash_t *, ctf_file_t *, uint32_t, uint32_t);
-extern int ctf_hash_define_type (ctf_hash_t *, ctf_file_t *, uint32_t, uint32_t);
-extern ctf_id_t ctf_hash_lookup_type (ctf_hash_t *, ctf_file_t *, const char *);
+extern int ctf_hash_insert_type (ctf_hash_t *, ctf_dict_t *, uint32_t, uint32_t);
+extern int ctf_hash_define_type (ctf_hash_t *, ctf_dict_t *, uint32_t, uint32_t);
+extern ctf_id_t ctf_hash_lookup_type (ctf_hash_t *, ctf_dict_t *, const char *);
extern uint32_t ctf_hash_size (const ctf_hash_t *);
extern void ctf_hash_destroy (ctf_hash_t *);
void *);
extern void *ctf_dynhash_iter_find (ctf_dynhash_t *, ctf_hash_iter_find_f,
void *);
+extern int ctf_dynhash_sort_by_name (const ctf_next_hkv_t *,
+ const ctf_next_hkv_t *,
+ void * _libctf_unused_);
extern int ctf_dynhash_next (ctf_dynhash_t *, ctf_next_t **,
void **key, void **value);
extern int ctf_dynhash_next_sorted (ctf_dynhash_t *, ctf_next_t **,
extern int ctf_dynset_next (ctf_dynset_t *, ctf_next_t **, void **key);
extern void *ctf_dynset_lookup_any (ctf_dynset_t *);
+extern void ctf_sha1_init (ctf_sha1_t *);
+extern void ctf_sha1_add (ctf_sha1_t *, const void *, size_t);
+extern char *ctf_sha1_fini (ctf_sha1_t *, char *);
+
#define ctf_list_prev(elem) ((void *)(((ctf_list_t *)(elem))->l_prev))
#define ctf_list_next(elem) ((void *)(((ctf_list_t *)(elem))->l_next))
extern void ctf_list_append (ctf_list_t *, void *);
extern void ctf_list_prepend (ctf_list_t *, void *);
extern void ctf_list_delete (ctf_list_t *, void *);
+extern void ctf_list_splice (ctf_list_t *, ctf_list_t *);
extern int ctf_list_empty_p (ctf_list_t *lp);
-extern int ctf_dtd_insert (ctf_file_t *, ctf_dtdef_t *, int flag, int kind);
-extern void ctf_dtd_delete (ctf_file_t *, ctf_dtdef_t *);
-extern ctf_dtdef_t *ctf_dtd_lookup (const ctf_file_t *, ctf_id_t);
-extern ctf_dtdef_t *ctf_dynamic_type (const ctf_file_t *, ctf_id_t);
-
-extern int ctf_dvd_insert (ctf_file_t *, ctf_dvdef_t *);
-extern void ctf_dvd_delete (ctf_file_t *, ctf_dvdef_t *);
-extern ctf_dvdef_t *ctf_dvd_lookup (const ctf_file_t *, const char *);
-
-extern void ctf_add_type_mapping (ctf_file_t *src_fp, ctf_id_t src_type,
- ctf_file_t *dst_fp, ctf_id_t dst_type);
-extern ctf_id_t ctf_type_mapping (ctf_file_t *src_fp, ctf_id_t src_type,
- ctf_file_t **dst_fp);
+extern int ctf_dtd_insert (ctf_dict_t *, ctf_dtdef_t *, int flag, int kind);
+extern void ctf_dtd_delete (ctf_dict_t *, ctf_dtdef_t *);
+extern ctf_dtdef_t *ctf_dtd_lookup (const ctf_dict_t *, ctf_id_t);
+extern ctf_dtdef_t *ctf_dynamic_type (const ctf_dict_t *, ctf_id_t);
+
+extern int ctf_dvd_insert (ctf_dict_t *, ctf_dvdef_t *);
+extern void ctf_dvd_delete (ctf_dict_t *, ctf_dvdef_t *);
+extern ctf_dvdef_t *ctf_dvd_lookup (const ctf_dict_t *, const char *);
+
+extern ctf_id_t ctf_add_encoded (ctf_dict_t *, uint32_t, const char *,
+ const ctf_encoding_t *, uint32_t kind);
+extern ctf_id_t ctf_add_reftype (ctf_dict_t *, uint32_t, ctf_id_t,
+ uint32_t kind);
+
+extern void ctf_add_type_mapping (ctf_dict_t *src_fp, ctf_id_t src_type,
+ ctf_dict_t *dst_fp, ctf_id_t dst_type);
+extern ctf_id_t ctf_type_mapping (ctf_dict_t *src_fp, ctf_id_t src_type,
+ ctf_dict_t **dst_fp);
+
+extern int ctf_dedup_atoms_init (ctf_dict_t *);
+extern int ctf_dedup (ctf_dict_t *, ctf_dict_t **, uint32_t ninputs,
+ uint32_t *parents, int cu_mapped);
+extern void ctf_dedup_fini (ctf_dict_t *, ctf_dict_t **, uint32_t);
+extern ctf_dict_t **ctf_dedup_emit (ctf_dict_t *, ctf_dict_t **,
+ uint32_t ninputs, uint32_t *parents,
+ uint32_t *noutputs, int cu_mapped);
extern void ctf_decl_init (ctf_decl_t *);
extern void ctf_decl_fini (ctf_decl_t *);
-extern void ctf_decl_push (ctf_decl_t *, ctf_file_t *, ctf_id_t);
+extern void ctf_decl_push (ctf_decl_t *, ctf_dict_t *, ctf_id_t);
_libctf_printflike_ (2, 3)
extern void ctf_decl_sprintf (ctf_decl_t *, const char *, ...);
extern char *ctf_decl_buf (ctf_decl_t *cd);
-extern const char *ctf_strptr (ctf_file_t *, uint32_t);
-extern const char *ctf_strraw (ctf_file_t *, uint32_t);
-extern const char *ctf_strraw_explicit (ctf_file_t *, uint32_t,
+extern const char *ctf_strptr (ctf_dict_t *, uint32_t);
+extern const char *ctf_strraw (ctf_dict_t *, uint32_t);
+extern const char *ctf_strraw_explicit (ctf_dict_t *, uint32_t,
ctf_strs_t *);
-extern int ctf_str_create_atoms (ctf_file_t *);
-extern void ctf_str_free_atoms (ctf_file_t *);
-extern uint32_t ctf_str_add (ctf_file_t *, const char *);
-extern uint32_t ctf_str_add_ref (ctf_file_t *, const char *, uint32_t *ref);
-extern int ctf_str_add_external (ctf_file_t *, const char *, uint32_t offset);
-extern void ctf_str_remove_ref (ctf_file_t *, const char *, uint32_t *ref);
-extern void ctf_str_rollback (ctf_file_t *, ctf_snapshot_id_t);
-extern void ctf_str_purge_refs (ctf_file_t *);
-extern ctf_strs_writable_t ctf_str_write_strtab (ctf_file_t *);
+extern int ctf_str_create_atoms (ctf_dict_t *);
+extern void ctf_str_free_atoms (ctf_dict_t *);
+extern uint32_t ctf_str_add (ctf_dict_t *, const char *);
+extern uint32_t ctf_str_add_ref (ctf_dict_t *, const char *, uint32_t *ref);
+extern int ctf_str_add_external (ctf_dict_t *, const char *, uint32_t offset);
+extern void ctf_str_remove_ref (ctf_dict_t *, const char *, uint32_t *ref);
+extern void ctf_str_rollback (ctf_dict_t *, ctf_snapshot_id_t);
+extern void ctf_str_purge_refs (ctf_dict_t *);
+extern ctf_strs_writable_t ctf_str_write_strtab (ctf_dict_t *);
extern struct ctf_archive_internal *
ctf_new_archive_internal (int is_archive, int unmap_on_close,
- struct ctf_archive *, ctf_file_t *,
+ struct ctf_archive *, ctf_dict_t *,
const ctf_sect_t *symsect,
const ctf_sect_t *strsect, int *errp);
extern struct ctf_archive *ctf_arc_open_internal (const char *, int *);
extern void ctf_arc_close_internal (struct ctf_archive *);
+extern const ctf_preamble_t *ctf_arc_bufpreamble (const ctf_sect_t *);
extern void *ctf_set_open_errno (int *, int);
-extern unsigned long ctf_set_errno (ctf_file_t *, int);
+extern unsigned long ctf_set_errno (ctf_dict_t *, int);
-extern ctf_file_t *ctf_simple_open_internal (const char *, size_t, const char *,
+extern ctf_dict_t *ctf_simple_open_internal (const char *, size_t, const char *,
size_t, size_t,
const char *, size_t,
ctf_dynhash_t *, int, int *);
-extern ctf_file_t *ctf_bufopen_internal (const ctf_sect_t *, const ctf_sect_t *,
+extern ctf_dict_t *ctf_bufopen_internal (const ctf_sect_t *, const ctf_sect_t *,
const ctf_sect_t *, ctf_dynhash_t *,
int, int *);
-extern int ctf_import_unref (ctf_file_t *fp, ctf_file_t *pfp);
-extern int ctf_serialize (ctf_file_t *);
+extern int ctf_import_unref (ctf_dict_t *fp, ctf_dict_t *pfp);
+extern int ctf_serialize (ctf_dict_t *);
_libctf_malloc_
extern void *ctf_mmap (size_t length, size_t offset, int fd);
extern void ctf_munmap (void *, size_t);
extern ssize_t ctf_pread (int fd, void *buf, ssize_t count, off_t offset);
-extern void *ctf_realloc (ctf_file_t *, void *, size_t);
+extern void *ctf_realloc (ctf_dict_t *, void *, size_t);
extern char *ctf_str_append (char *, const char *);
extern char *ctf_str_append_noerr (char *, const char *);
-extern ctf_id_t ctf_type_resolve_unsliced (ctf_file_t *, ctf_id_t);
-extern int ctf_type_kind_unsliced (ctf_file_t *, ctf_id_t);
+extern ctf_id_t ctf_type_resolve_unsliced (ctf_dict_t *, ctf_id_t);
+extern int ctf_type_kind_unsliced (ctf_dict_t *, ctf_id_t);
_libctf_printflike_ (1, 2)
extern void ctf_dprintf (const char *, ...);
extern void libctf_init_debug (void);
-_libctf_printflike_ (3, 4)
-extern void ctf_err_warn (ctf_file_t *, int is_warning, const char *, ...);
-extern void ctf_assert_fail_internal (ctf_file_t *, const char *,
+_libctf_printflike_ (4, 5)
+extern void ctf_err_warn (ctf_dict_t *, int is_warning, int err,
+ const char *, ...);
+extern void ctf_err_warn_to_open (ctf_dict_t *);
+extern void ctf_assert_fail_internal (ctf_dict_t *, const char *,
size_t, const char *);
-extern const char *ctf_link_input_name (ctf_file_t *);
+extern const char *ctf_link_input_name (ctf_dict_t *);
-extern Elf64_Sym *ctf_sym_to_elf64 (const Elf32_Sym *src, Elf64_Sym *dst);
-extern const char *ctf_lookup_symbol_name (ctf_file_t *fp, unsigned long symidx);
+extern ctf_link_sym_t *ctf_elf32_to_link_sym (ctf_dict_t *fp, ctf_link_sym_t *dst,
+ const Elf32_Sym *src, uint32_t symidx);
+extern ctf_link_sym_t *ctf_elf64_to_link_sym (ctf_dict_t *fp, ctf_link_sym_t *dst,
+ const Elf64_Sym *src, uint32_t symidx);
+extern const char *ctf_lookup_symbol_name (ctf_dict_t *fp, unsigned long symidx);
/* Variables, all underscore-prepended. */