forked from Imagelibrary/binutils-gdb
libctf: consecutive ctf_id_t assignment
This change modifies type ID assignment in CTF so that it works like BTF: rather than flipping the high bit on for types in child dicts, types ascend directly from IDs in the parent to IDs in the child, without interruption (so type 0x4 in the parent is immediately followed by 0x5 in all children). Doing this while retaining useful semantics for modification of parents is challenging. By definition, child type IDs are not known until the parent is written out, but we don't want to find ourselves constrained to adding types to the parent in one go, followed by all child types: that would make the deduplicator a nightmare and would frankly make the entire ctf_add*() interface next to useless: all existing clients that add types at all add types to both parents and children without regard for ordering, and breaking that would probably necessitate redesigning all of them. So we have to be a litle cleverer. We approach this the same way as we approach strings in the recent refs rework: if a parent has children attached (or has ever had them attached since it was created or last read in), any new types created in the parent are assigned provisional IDs starting at the very top of the type space and working down. (Their indexes in the internal libctf arrays remain unchanged, so we don't suddenly need multigigabyte indexes!). At writeout (preserialization) time, we traverse the type table (and all other table containing type IDs) and assign refs to every type ID in exactly the same way we assign refs to every string offset (just a different set of refs -- we don't want to update type IDs with string offset values!). For a parent dict with children, these refs are real entities in memory: pointers to the memory locations where type IDs are stored, tracked in the DTD of each type. As we traverse the type table, we assign real IDs to each type (by simple incrementation), storing those IDs in a new dtd_final_type field in the DTD for each type. Once the type table and all other tables containing type IDs are fully traversed, we update all the refs and overwrite the IDs currently residing in each with the final IDs for each type. That fixes up IDs in the parent dict itself (including forward references in structs and the like: that's why the ref updates only happen at the end); but what about child dicts' references, both to parent types and to their own? We add armouring to enforce that parent dicts are always serialized before their children (which ctf-link.c already does, because it's a precondition for strtab deduplication), and then arrange that when a ref is added to a type whose ID has been assigned (has a dtd_final_type), we just immediately do an update rather than storing a ref for later updating. Since the parent is already serialized, all parent type IDs have a dtd_final_type by this point, and all parent IDs in the children are properly updated. The child types can now be renumbered now we now the number of types in the parent, and their refs updated identically to what was just done with the parent. One wrinkle: before the child refs are updated, while we are working over the child's type section, the type IDs in the child start from 1 (or something like that), which might seem to overlap the parent IDs. But this is not the case: when you serialize the parent, the IDs written out to disk are changed, but the only change to the representation in memory is that we remember a dtd_final_type for each type (and use it to update all the child type refs): its ID in memory is the same as it always was, a nonoverlapping provisional ID higher than any other valid ID. We enforce all of this by asserting that when you add a ref to a type, the memory location that is modified must be in the buffer being serialized: the code will not let you accidentally modify the actual DTDs in memory. We track the number of types in the parent in a new CTFv4 (not BTF) header field (the dumper is updated): we will also use this to open CTFv3 child dicts without change by simply declaring for them that the parent dict has 2^31 types in it (or 2^15, for v2 and below): the IDs in the children then naturally come out right with no other changes needed. (Right now, opening CTFv3 child dicts requires extra compatibility code that has not been written, but that code will no longer need to worry about type ID differences.) Various things are newly forbidden: - you cannot ctf_import() a child into a parent if you already ctf_add()ed types to the child, because all its IDs would change (and since you already cannot ctf_add() types to a child that hasn't had its parent imported, this in practice means only that ctf_create() must be followed immediately by a ctf_import() if this is a new child, which all sane clients were doing anyway). - You cannot import a child into a parent which has the wrong number of (non-provisional) types, again because all its IDs would be wrong: because parents only add types in the provisional space if children are attached to it, this would break the not unknown case of opening an archive, adding types to the parent, and only then importing children into it, so we add a special case: archive members which are not children in an archive with more than one member always pretend to have at least one child, so type additions in them are always provisional even before you ctf_import anything. In practice, this does exactly what we want, since all archives so far are created by the linker and have one parent and N children of that parent. Because this introduces huge gaps between index and type ID for provisional types, some extra assertions are added to ensure that the internal ctf_type_to_index() is only ever called on types in the current dict (never a parent dict): before now, this was just taken on trust, and it was often wrong (which at best led to wrong results, as wrong array indexes were used, and at worst to a buffer overflow). When hash debugging is on (suggesting that the user doesn't mind expensive checks), every ctf_type_to_index() triggers a ctf_index_to_type() to make sure that the operations are proper inverses. Lots and lots of tests are added to verify that assignment works and that updating of every type kind works fine -- existing tests suffice for type IDs in the variable and symtypetab sections. The ld-ctf tests get a bunch of largely display-based updates: various tests refer to 0x8... type IDs, which no longer exist, and because the IDs are shorter all the spacing and alignment has changed.
This commit is contained in:
@@ -178,6 +178,8 @@ typedef struct ctf_dtdef
|
||||
{
|
||||
ctf_list_t dtd_list; /* List forward/back pointers. */
|
||||
ctf_id_t dtd_type; /* Type identifier for this definition. */
|
||||
ctf_id_t dtd_final_type; /* Final (nonprovisional) id, if nonzero. */
|
||||
ctf_list_t dtd_refs; /* Refs to this DTD's dtd_type: see below. */
|
||||
ctf_type_t dtd_data; /* Type node, including name. */
|
||||
size_t dtd_vlen_alloc; /* Total vlen space allocated (vbytes). */
|
||||
unsigned char *dtd_vlen; /* Variable-length data for this type. */
|
||||
@@ -423,8 +425,12 @@ struct ctf_dict
|
||||
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. */
|
||||
unsigned long ctf_stypes; /* Number of static (non-dynamic) types. */
|
||||
uint32_t ctf_typemax; /* Maximum valid type index. */
|
||||
uint32_t ctf_idmax; /* Maximum valid non-provisional type ID. */
|
||||
uint32_t ctf_stypes; /* Number of static (non-dynamic) types. */
|
||||
uint32_t ctf_provtypemax; /* Latest valid provisional type ID.
|
||||
Counts down. Parent only. */
|
||||
uint32_t ctf_nprovtypes; /* Number of provisional types (convenience). */
|
||||
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. */
|
||||
@@ -433,7 +439,6 @@ struct ctf_dict
|
||||
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. */
|
||||
uint32_t ctf_refcnt; /* Reference count (for parent links). */
|
||||
uint32_t ctf_flags; /* Libctf flags (see below). */
|
||||
uint32_t ctf_max_children; /* Max number of child dicts. */
|
||||
@@ -598,7 +603,7 @@ extern ctf_id_t ctf_index_to_type (const ctf_dict_t *, uint32_t);
|
||||
#define LCTF_LINKING 0x0002 /* CTF link is underway: respect ctf_link_flags. */
|
||||
#define LCTF_STRICT_NO_DUP_ENUMERATORS 0x0004 /* Duplicate enums prohibited. */
|
||||
#define LCTF_NO_STR 0x0008 /* No string lookup possible yet. */
|
||||
#define LCTF_NO_SERIALIZE 0x0010 /* Serialization of this dict prohibited. */
|
||||
#define LCTF_NO_TYPE 0x0010 /* No type additions possible. */
|
||||
#define LCTF_PRESERIALIZED 0x0020 /* Already serialized all but the strtab. */
|
||||
|
||||
extern ctf_dynhash_t *ctf_name_table (ctf_dict_t *, int);
|
||||
|
||||
Reference in New Issue
Block a user