#include <string.h>
#include <zlib.h>
+#ifndef roundup
+#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
+#endif
+
/* To create an empty CTF container, we just declare a zeroed header and call
ctf_bufopen() on it. If ctf_bufopen succeeds, we mark the new container r/w
- and initialize the dynamic members. We set dtvstrlen to 1 to reserve the
- first byte of the string table for a \0 byte, and we start assigning type
- IDs at 1 because type ID 0 is used as a sentinel and a not-found
- indicator. */
+ and initialize the dynamic members. We start assigning type IDs at 1 because
+ type ID 0 is used as a sentinel and a not-found indicator. */
ctf_file_t *
ctf_create (int *errp)
}
cts.cts_name = _CTF_SECTION;
- cts.cts_type = SHT_PROGBITS;
- cts.cts_flags = 0;
cts.cts_data = &hdr;
cts.cts_size = sizeof (hdr);
cts.cts_entsize = 1;
- cts.cts_offset = 0;
if ((fp = ctf_bufopen (&cts, NULL, NULL, errp)) == NULL)
goto err_dtbyname;
fp->ctf_dtbyname = dtbyname;
fp->ctf_dthash = dthash;
fp->ctf_dvhash = dvhash;
- fp->ctf_dtvstrlen = 1;
fp->ctf_dtnextid = 1;
fp->ctf_dtoldid = 0;
- fp->ctf_snapshots = 0;
+ fp->ctf_snapshots = 1;
fp->ctf_snapshot_lu = 0;
return fp;
}
static unsigned char *
-ctf_copy_smembers (ctf_dtdef_t *dtd, uint32_t soff, unsigned char *t)
+ctf_copy_smembers (ctf_file_t *fp, ctf_dtdef_t *dtd, unsigned char *t)
{
ctf_dmdef_t *dmd = ctf_list_next (&dtd->dtd_u.dtu_members);
ctf_member_t ctm;
for (; dmd != NULL; dmd = ctf_list_next (dmd))
{
- if (dmd->dmd_name)
- {
- ctm.ctm_name = soff;
- soff += strlen (dmd->dmd_name) + 1;
- }
- else
- ctm.ctm_name = 0;
+ ctf_member_t *copied;
+ ctm.ctm_name = 0;
ctm.ctm_type = (uint32_t) dmd->dmd_type;
ctm.ctm_offset = (uint32_t) dmd->dmd_offset;
memcpy (t, &ctm, sizeof (ctm));
+ copied = (ctf_member_t *) t;
+ if (dmd->dmd_name)
+ ctf_str_add_ref (fp, dmd->dmd_name, &copied->ctm_name);
+
t += sizeof (ctm);
}
}
static unsigned char *
-ctf_copy_lmembers (ctf_dtdef_t *dtd, uint32_t soff, unsigned char *t)
+ctf_copy_lmembers (ctf_file_t *fp, ctf_dtdef_t *dtd, unsigned char *t)
{
ctf_dmdef_t *dmd = ctf_list_next (&dtd->dtd_u.dtu_members);
ctf_lmember_t ctlm;
for (; dmd != NULL; dmd = ctf_list_next (dmd))
{
- if (dmd->dmd_name)
- {
- ctlm.ctlm_name = soff;
- soff += strlen (dmd->dmd_name) + 1;
- }
- else
- ctlm.ctlm_name = 0;
+ ctf_lmember_t *copied;
+ ctlm.ctlm_name = 0;
ctlm.ctlm_type = (uint32_t) dmd->dmd_type;
ctlm.ctlm_offsethi = CTF_OFFSET_TO_LMEMHI (dmd->dmd_offset);
ctlm.ctlm_offsetlo = CTF_OFFSET_TO_LMEMLO (dmd->dmd_offset);
memcpy (t, &ctlm, sizeof (ctlm));
+ copied = (ctf_lmember_t *) t;
+ if (dmd->dmd_name)
+ ctf_str_add_ref (fp, dmd->dmd_name, &copied->ctlm_name);
+
t += sizeof (ctlm);
}
}
static unsigned char *
-ctf_copy_emembers (ctf_dtdef_t *dtd, uint32_t soff, unsigned char *t)
+ctf_copy_emembers (ctf_file_t *fp, ctf_dtdef_t *dtd, unsigned char *t)
{
ctf_dmdef_t *dmd = ctf_list_next (&dtd->dtd_u.dtu_members);
ctf_enum_t cte;
for (; dmd != NULL; dmd = ctf_list_next (dmd))
{
- cte.cte_name = soff;
+ ctf_enum_t *copied;
+
cte.cte_value = dmd->dmd_value;
- soff += strlen (dmd->dmd_name) + 1;
memcpy (t, &cte, sizeof (cte));
+ copied = (ctf_enum_t *) t;
+ ctf_str_add_ref (fp, dmd->dmd_name, &copied->cte_name);
t += sizeof (cte);
}
return t;
}
-static unsigned char *
-ctf_copy_membnames (ctf_dtdef_t *dtd, unsigned char *s)
-{
- ctf_dmdef_t *dmd = ctf_list_next (&dtd->dtd_u.dtu_members);
- size_t len;
-
- for (; dmd != NULL; dmd = ctf_list_next (dmd))
- {
- if (dmd->dmd_name == NULL)
- continue; /* Skip anonymous members. */
- len = strlen (dmd->dmd_name) + 1;
- memcpy (s, dmd->dmd_name, len);
- s += len;
- }
-
- return s;
-}
-
/* Sort a newly-constructed static variable array. */
static int
ctf_update (ctf_file_t *fp)
{
ctf_file_t ofp, *nfp;
- ctf_header_t hdr;
+ ctf_header_t hdr, *hdrp;
ctf_dtdef_t *dtd;
ctf_dvdef_t *dvd;
ctf_varent_t *dvarents;
+ ctf_strs_writable_t strtab;
- unsigned char *s, *s0, *t;
+ unsigned char *t;
unsigned long i;
size_t buf_size, type_size, nvars;
- void *buf;
+ unsigned char *buf, *newbuf;
int err;
if (!(fp->ctf_flags & LCTF_RDWR))
hdr.cth_magic = CTF_MAGIC;
hdr.cth_version = CTF_VERSION;
- if (fp->ctf_flags & LCTF_CHILD)
- hdr.cth_parname = 1; /* parname added just below. */
-
/* Iterate through the dynamic type definition list and compute the
size of the CTF type section we will need to generate. */
for (nvars = 0, dvd = ctf_list_next (&fp->ctf_dvdefs);
dvd != NULL; dvd = ctf_list_next (dvd), nvars++);
- /* Fill in the string table and type offset and size, compute the size
- of the entire CTF buffer we need, and then allocate a new buffer and
- memcpy the finished header to the start of the buffer. */
+ /* Compute the size of the CTF buffer we need, sans only the string table,
+ then allocate a new buffer and memcpy the finished header to the start of
+ the buffer. (We will adjust this later with strtab length info.) */
hdr.cth_typeoff = hdr.cth_varoff + (nvars * sizeof (ctf_varent_t));
hdr.cth_stroff = hdr.cth_typeoff + type_size;
- hdr.cth_strlen = fp->ctf_dtvstrlen;
- if (fp->ctf_parname != NULL)
- hdr.cth_strlen += strlen (fp->ctf_parname) + 1;
+ hdr.cth_strlen = 0;
buf_size = sizeof (ctf_header_t) + hdr.cth_stroff + hdr.cth_strlen;
- if ((buf = ctf_data_alloc (buf_size)) == NULL)
+ if ((buf = malloc (buf_size)) == NULL)
return (ctf_set_errno (fp, EAGAIN));
memcpy (buf, &hdr, sizeof (ctf_header_t));
t = (unsigned char *) buf + sizeof (ctf_header_t) + hdr.cth_varoff;
- s = s0 = (unsigned char *) buf + sizeof (ctf_header_t) + hdr.cth_stroff;
-
- s[0] = '\0';
- s++;
- if (fp->ctf_parname != NULL)
- {
- memcpy (s, fp->ctf_parname, strlen (fp->ctf_parname) + 1);
- s += strlen (fp->ctf_parname) + 1;
- }
+ hdrp = (ctf_header_t *) buf;
+ if ((fp->ctf_flags & LCTF_CHILD) && (fp->ctf_parname != NULL))
+ ctf_str_add_ref (fp, fp->ctf_parname, &hdrp->cth_parname);
- /* Work over the variable list, translating everything into
- ctf_varent_t's and filling out the string table, then sort the buffer
- of ctf_varent_t's. */
+ /* Work over the variable list, translating everything into ctf_varent_t's and
+ prepping the string table. */
dvarents = (ctf_varent_t *) t;
for (i = 0, dvd = ctf_list_next (&fp->ctf_dvdefs); dvd != NULL;
dvd = ctf_list_next (dvd), i++)
{
ctf_varent_t *var = &dvarents[i];
- size_t len = strlen (dvd->dvd_name) + 1;
- var->ctv_name = (uint32_t) (s - s0);
+ ctf_str_add_ref (fp, dvd->dvd_name, &var->ctv_name);
var->ctv_type = dvd->dvd_type;
- memcpy (s, dvd->dvd_name, len);
- s += len;
}
assert (i == nvars);
- qsort_r (dvarents, nvars, sizeof (ctf_varent_t), ctf_sort_var, s0);
t += sizeof (ctf_varent_t) * nvars;
assert (t == (unsigned char *) buf + sizeof (ctf_header_t) + hdr.cth_typeoff);
- /* We now take a final lap through the dynamic type definition list and
- copy the appropriate type records and strings to the output buffer. */
+ /* We now take a final lap through the dynamic type definition list and copy
+ the appropriate type records to the output buffer, noting down the
+ strings as we go. */
for (dtd = ctf_list_next (&fp->ctf_dtdefs);
dtd != NULL; dtd = ctf_list_next (dtd))
{
-
uint32_t kind = LCTF_INFO_KIND (fp, dtd->dtd_data.ctt_info);
uint32_t vlen = LCTF_INFO_VLEN (fp, dtd->dtd_data.ctt_info);
ctf_array_t cta;
uint32_t encoding;
size_t len;
+ ctf_stype_t *copied;
- if (dtd->dtd_name != NULL)
- {
- dtd->dtd_data.ctt_name = (uint32_t) (s - s0);
- len = strlen (dtd->dtd_name) + 1;
- memcpy (s, dtd->dtd_name, len);
- s += len;
- }
- else
- dtd->dtd_data.ctt_name = 0;
+ dtd->dtd_data.ctt_name = 0;
if (dtd->dtd_data.ctt_size != CTF_LSIZE_SENT)
len = sizeof (ctf_stype_t);
len = sizeof (ctf_type_t);
memcpy (t, &dtd->dtd_data, len);
+ copied = (ctf_stype_t *) t; /* name is at the start: constant offset. */
+ if (dtd->dtd_name)
+ ctf_str_add_ref (fp, dtd->dtd_name, &copied->ctt_name);
t += len;
switch (kind)
case CTF_K_STRUCT:
case CTF_K_UNION:
if (dtd->dtd_data.ctt_size < CTF_LSTRUCT_THRESH)
- t = ctf_copy_smembers (dtd, (uint32_t) (s - s0), t);
+ t = ctf_copy_smembers (fp, dtd, t);
else
- t = ctf_copy_lmembers (dtd, (uint32_t) (s - s0), t);
- s = ctf_copy_membnames (dtd, s);
+ t = ctf_copy_lmembers (fp, dtd, t);
break;
case CTF_K_ENUM:
- t = ctf_copy_emembers (dtd, (uint32_t) (s - s0), t);
- s = ctf_copy_membnames (dtd, s);
+ t = ctf_copy_emembers (fp, dtd, t);
break;
}
}
assert (t == (unsigned char *) buf + sizeof (ctf_header_t) + hdr.cth_stroff);
+ /* Construct the final string table and fill out all the string refs with the
+ final offsets. Then purge the refs list, because we're about to move this
+ strtab onto the end of the buf, invalidating all the offsets. */
+ strtab = ctf_str_write_strtab (fp);
+ ctf_str_purge_refs (fp);
+
+ /* Now the string table is constructed, we can sort the buffer of
+ ctf_varent_t's. */
+ ctf_qsort_r (dvarents, nvars, sizeof (ctf_varent_t), ctf_sort_var,
+ strtab.cts_strs);
+
+ if ((newbuf = ctf_realloc (fp, buf, buf_size + strtab.cts_len)) == NULL)
+ {
+ ctf_free (buf);
+ ctf_free (strtab.cts_strs);
+ return (ctf_set_errno (fp, EAGAIN));
+ }
+ buf = newbuf;
+ memcpy (buf + buf_size, strtab.cts_strs, strtab.cts_len);
+ hdrp = (ctf_header_t *) buf;
+ hdrp->cth_strlen = strtab.cts_len;
+ buf_size += hdrp->cth_strlen;
+ ctf_free (strtab.cts_strs);
+
/* Finally, we are ready to ctf_simple_open() the new container. If this
is successful, we then switch nfp and fp and free the old container. */
- ctf_data_protect (buf, buf_size);
-
- if ((nfp = ctf_simple_open (buf, buf_size, NULL, 0, 0, NULL, 0, &err)) == NULL)
+ if ((nfp = ctf_simple_open ((char *) buf, buf_size, NULL, 0, 0, NULL,
+ 0, &err)) == NULL)
{
- ctf_data_free (buf, buf_size);
+ ctf_free (buf);
return (ctf_set_errno (fp, err));
}
nfp->ctf_refcnt = fp->ctf_refcnt;
nfp->ctf_flags |= fp->ctf_flags & ~LCTF_DIRTY;
- nfp->ctf_data.cts_data = NULL; /* Force ctf_data_free() on close. */
+ nfp->ctf_data.cts_data = NULL; /* Force ctf_free() on close. */
nfp->ctf_dthash = fp->ctf_dthash;
nfp->ctf_dtdefs = fp->ctf_dtdefs;
nfp->ctf_dtbyname = fp->ctf_dtbyname;
nfp->ctf_dvhash = fp->ctf_dvhash;
nfp->ctf_dvdefs = fp->ctf_dvdefs;
- nfp->ctf_dtvstrlen = fp->ctf_dtvstrlen;
nfp->ctf_dtnextid = fp->ctf_dtnextid;
nfp->ctf_dtoldid = fp->ctf_dtnextid - 1;
nfp->ctf_snapshots = fp->ctf_snapshots + 1;
fp->ctf_dtbyname = NULL;
fp->ctf_dthash = NULL;
+ ctf_str_free_atoms (nfp);
+ nfp->ctf_str_atoms = fp->ctf_str_atoms;
+ fp->ctf_str_atoms = NULL;
memset (&fp->ctf_dtdefs, 0, sizeof (ctf_list_t));
fp->ctf_dvhash = NULL;
return prefixed;
}
-void
+int
ctf_dtd_insert (ctf_file_t *fp, ctf_dtdef_t *dtd)
{
- ctf_dynhash_insert (fp->ctf_dthash, (void *) dtd->dtd_type, dtd);
- ctf_list_append (&fp->ctf_dtdefs, dtd);
+ if (ctf_dynhash_insert (fp->ctf_dthash, (void *) dtd->dtd_type, dtd) < 0)
+ return -1;
+
if (dtd->dtd_name)
{
int kind = LCTF_INFO_KIND (fp, dtd->dtd_data.ctt_info);
- ctf_dynhash_insert (fp->ctf_dtbyname, ctf_prefixed_name (kind,
- dtd->dtd_name),
- dtd);
+ if (ctf_dynhash_insert (fp->ctf_dtbyname,
+ ctf_prefixed_name (kind, dtd->dtd_name),
+ dtd) < 0)
+ return -1;
}
+ ctf_list_append (&fp->ctf_dtdefs, dtd);
+ return 0;
}
void
dmd != NULL; dmd = nmd)
{
if (dmd->dmd_name != NULL)
- {
- fp->ctf_dtvstrlen -= strlen (dmd->dmd_name) + 1;
ctf_free (dmd->dmd_name);
- }
nmd = ctf_list_next (dmd);
ctf_free (dmd);
}
name = ctf_prefixed_name (kind, dtd->dtd_name);
ctf_dynhash_remove (fp->ctf_dtbyname, name);
free (name);
-
- fp->ctf_dtvstrlen -= strlen (dtd->dtd_name) + 1;
ctf_free (dtd->dtd_name);
}
return NULL;
}
-void
+int
ctf_dvd_insert (ctf_file_t *fp, ctf_dvdef_t *dvd)
{
- ctf_dynhash_insert (fp->ctf_dvhash, dvd->dvd_name, dvd);
+ if (ctf_dynhash_insert (fp->ctf_dvhash, dvd->dvd_name, dvd) < 0)
+ return -1;
ctf_list_append (&fp->ctf_dvdefs, dvd);
+ return 0;
}
void
ctf_dvd_delete (ctf_file_t *fp, ctf_dvdef_t *dvd)
{
ctf_dynhash_remove (fp->ctf_dvhash, dvd->dvd_name);
-
- fp->ctf_dtvstrlen -= strlen (dvd->dvd_name) + 1;
ctf_free (dvd->dvd_name);
ctf_list_delete (&fp->ctf_dvdefs, dvd);
dtd->dtd_name = s;
dtd->dtd_type = type;
- if (s != NULL)
- fp->ctf_dtvstrlen += strlen (s) + 1;
-
- ctf_dtd_insert (fp, dtd);
+ if (ctf_dtd_insert (fp, dtd) < 0)
+ {
+ ctf_free (dtd);
+ return CTF_ERR; /* errno is set for us. */
+ }
fp->ctf_flags |= LCTF_DIRTY;
*rp = dtd;
return CTF_ERR; /* errno is set for us. */
dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, flag, 0);
- dtd->dtd_data.ctt_size = clp2 (P2ROUNDUP (ep->cte_bits, NBBY) / NBBY);
+ dtd->dtd_data.ctt_size = clp2 (P2ROUNDUP (ep->cte_bits, CHAR_BIT)
+ / CHAR_BIT);
dtd->dtd_u.dtu_enc = *ep;
return type;
ctf_id_t type;
ctf_file_t *tmp = fp;
- if (ref == CTF_ERR || ref < 0 || ref > CTF_MAX_TYPE)
+ if (ref == CTF_ERR || ref > CTF_MAX_TYPE)
return (ctf_set_errno (fp, EINVAL));
if (ctf_lookup_by_id (&tmp, ref) == NULL)
if ((ep->cte_bits > 255) || (ep->cte_offset > 255))
return (ctf_set_errno (fp, ECTF_SLICEOVERFLOW));
- if (ref == CTF_ERR || ref < 0 || ref > CTF_MAX_TYPE)
+ if (ref == CTF_ERR || ref > CTF_MAX_TYPE)
return (ctf_set_errno (fp, EINVAL));
if ((tp = ctf_lookup_by_id (&tmp, ref)) == NULL)
return CTF_ERR; /* errno is set for us. */
dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_SLICE, flag, 0);
- dtd->dtd_data.ctt_size = clp2 (P2ROUNDUP (ep->cte_bits, NBBY) / NBBY);
+ dtd->dtd_data.ctt_size = clp2 (P2ROUNDUP (ep->cte_bits, CHAR_BIT)
+ / CHAR_BIT);
dtd->dtd_u.dtu_slice.cts_type = ref;
dtd->dtd_u.dtu_slice.cts_bits = ep->cte_bits;
dtd->dtd_u.dtu_slice.cts_offset = ep->cte_offset;
ctf_id_t type;
ctf_file_t *tmp = fp;
- if (ref == CTF_ERR || ref < 0 || ref > CTF_MAX_TYPE)
+ if (ref == CTF_ERR || ref > CTF_MAX_TYPE)
return (ctf_set_errno (fp, EINVAL));
if (ctf_lookup_by_id (&tmp, ref) == NULL)
dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, root, vlen + 1);
ctf_list_append (&dtd->dtd_u.dtu_members, dmd);
- fp->ctf_dtvstrlen += strlen (s) + 1;
fp->ctf_flags |= LCTF_DIRTY;
return 0;
}
}
- if ((msize = ctf_type_size (fp, type)) == CTF_ERR ||
- (malign = ctf_type_align (fp, type)) == CTF_ERR)
- return CTF_ERR; /* errno is set for us. */
+ if ((msize = ctf_type_size (fp, type)) < 0 ||
+ (malign = ctf_type_align (fp, type)) < 0)
+ return -1; /* errno is set for us. */
if ((dmd = ctf_alloc (sizeof (ctf_dmdef_t))) == NULL)
return (ctf_set_errno (fp, EAGAIN));
ctf_encoding_t linfo;
ssize_t lsize;
- if (ctf_type_encoding (fp, ltype, &linfo) != CTF_ERR)
+ if (ctf_type_encoding (fp, ltype, &linfo) == 0)
off += linfo.cte_bits;
- else if ((lsize = ctf_type_size (fp, ltype)) != CTF_ERR)
- off += lsize * NBBY;
+ else if ((lsize = ctf_type_size (fp, ltype)) > 0)
+ off += lsize * CHAR_BIT;
/* Round up the offset of the end of the last member to
the next byte boundary, convert 'off' to bytes, and
packing if the new member is a bit-field, but we're
the "compiler" and ANSI says we can do as we choose. */
- off = roundup (off, NBBY) / NBBY;
+ off = roundup (off, CHAR_BIT) / CHAR_BIT;
off = roundup (off, MAX (malign, 1));
- dmd->dmd_offset = off * NBBY;
+ dmd->dmd_offset = off * CHAR_BIT;
ssize = off + msize;
}
else
dmd->dmd_offset = bit_offset;
ssize = ctf_get_ctt_size (fp, &dtd->dtd_data, NULL, NULL);
- ssize = MAX (ssize, (bit_offset / NBBY) + msize);
+ ssize = MAX (ssize, ((signed) bit_offset / CHAR_BIT) + msize);
}
}
else
ssize = MAX (ssize, msize);
}
- if (ssize > CTF_MAX_SIZE)
+ if ((size_t) ssize > CTF_MAX_SIZE)
{
dtd->dtd_data.ctt_size = CTF_LSIZE_SENT;
dtd->dtd_data.ctt_lsizehi = CTF_SIZE_TO_LSIZE_HI (ssize);
dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, root, vlen + 1);
ctf_list_append (&dtd->dtd_u.dtu_members, dmd);
- if (s != NULL)
- fp->ctf_dtvstrlen += strlen (s) + 1;
-
fp->ctf_flags |= LCTF_DIRTY;
return 0;
}
return (ctf_set_errno (fp, ECTF_NOTINTFP));
if ((type = ctf_add_slice (fp, CTF_ADD_NONROOT, otype, &encoding)) == CTF_ERR)
- return CTF_ERR; /* errno is set for us. */
+ return -1; /* errno is set for us. */
return ctf_add_member_offset (fp, souid, name, type, bit_offset);
}
return (ctf_set_errno (fp, ECTF_DUPLICATE));
if (ctf_lookup_by_id (&tmp, ref) == NULL)
- return CTF_ERR; /* errno is set for us. */
+ return -1; /* errno is set for us. */
if ((dvd = ctf_alloc (sizeof (ctf_dvdef_t))) == NULL)
return (ctf_set_errno (fp, EAGAIN));
dvd->dvd_type = ref;
dvd->dvd_snapshots = fp->ctf_snapshots;
- ctf_dvd_insert (fp, dvd);
+ if (ctf_dvd_insert (fp, dvd) < 0)
+ {
+ ctf_free (dvd);
+ return -1; /* errno is set for us. */
+ }
- fp->ctf_dtvstrlen += strlen (name) + 1;
fp->ctf_flags |= LCTF_DIRTY;
return 0;
}
+static int
+enumcmp (const char *name, int value, void *arg)
+{
+ ctf_bundle_t *ctb = arg;
+ int bvalue;
+
+ if (ctf_enum_value (ctb->ctb_file, ctb->ctb_type, name, &bvalue) < 0)
+ {
+ ctf_dprintf ("Conflict due to member %s iteration error.\n", name);
+ return 1;
+ }
+ if (value != bvalue)
+ {
+ ctf_dprintf ("Conflict due to value change: %i versus %i\n",
+ value, bvalue);
+ return 1;
+ }
+ return 0;
+}
+
+static int
+enumadd (const char *name, int value, void *arg)
+{
+ ctf_bundle_t *ctb = arg;
+
+ return (ctf_add_enumerator (ctb->ctb_file, ctb->ctb_type,
+ name, value) < 0);
+}
+
+static int
+membcmp (const char *name, ctf_id_t type _libctf_unused_, unsigned long offset,
+ void *arg)
+{
+ ctf_bundle_t *ctb = arg;
+ ctf_membinfo_t ctm;
+
+ if (ctf_member_info (ctb->ctb_file, ctb->ctb_type, name, &ctm) < 0)
+ {
+ ctf_dprintf ("Conflict due to member %s iteration error.\n", name);
+ return 1;
+ }
+ if (ctm.ctm_offset != offset)
+ {
+ ctf_dprintf ("Conflict due to member %s offset change: "
+ "%lx versus %lx\n", name, ctm.ctm_offset, offset);
+ return 1;
+ }
+ return 0;
+}
+
+static int
+membadd (const char *name, ctf_id_t type, unsigned long offset, void *arg)
+{
+ ctf_bundle_t *ctb = arg;
+ ctf_dmdef_t *dmd;
+ char *s = NULL;
+
+ if ((dmd = ctf_alloc (sizeof (ctf_dmdef_t))) == NULL)
+ return (ctf_set_errno (ctb->ctb_file, EAGAIN));
+
+ if (name != NULL && (s = ctf_strdup (name)) == NULL)
+ {
+ ctf_free (dmd);
+ return (ctf_set_errno (ctb->ctb_file, EAGAIN));
+ }
+
+ /* For now, dmd_type is copied as the src_fp's type; it is reset to an
+ equivalent dst_fp type by a final loop in ctf_add_type(), below. */
+ dmd->dmd_name = s;
+ dmd->dmd_type = type;
+ dmd->dmd_offset = offset;
+ dmd->dmd_value = -1;
+
+ ctf_list_append (&ctb->ctb_dtd->dtd_u.dtu_members, dmd);
+
+ ctb->ctb_file->ctf_flags |= LCTF_DIRTY;
+ return 0;
+}
+
+/* The ctf_add_type routine is used to copy a type from a source CTF container
+ to a dynamic destination container. This routine operates recursively by
+ following the source type's links and embedded member types. If the
+ destination container already contains a named type which has the same
+ attributes, then we succeed and return this type but no changes occur. */
+ctf_id_t
+ctf_add_type (ctf_file_t *dst_fp, ctf_file_t *src_fp, ctf_id_t src_type)
+{
+ ctf_id_t dst_type = CTF_ERR;
+ uint32_t dst_kind = CTF_K_UNKNOWN;
+ ctf_id_t tmp;
+
+ const char *name;
+ uint32_t kind, flag, vlen;
+
+ const ctf_type_t *src_tp, *dst_tp;
+ ctf_bundle_t src, dst;
+ ctf_encoding_t src_en, dst_en;
+ ctf_arinfo_t src_ar, dst_ar;
+
+ ctf_dtdef_t *dtd;
+ ctf_funcinfo_t ctc;
+
+ ctf_hash_t *hp;
+
+ if (!(dst_fp->ctf_flags & LCTF_RDWR))
+ return (ctf_set_errno (dst_fp, ECTF_RDONLY));
+
+ if ((src_tp = ctf_lookup_by_id (&src_fp, src_type)) == NULL)
+ return (ctf_set_errno (dst_fp, ctf_errno (src_fp)));
+
+ name = ctf_strptr (src_fp, src_tp->ctt_name);
+ kind = LCTF_INFO_KIND (src_fp, src_tp->ctt_info);
+ flag = LCTF_INFO_ISROOT (src_fp, src_tp->ctt_info);
+ vlen = LCTF_INFO_VLEN (src_fp, src_tp->ctt_info);
+
+ switch (kind)
+ {
+ case CTF_K_STRUCT:
+ hp = dst_fp->ctf_structs;
+ break;
+ case CTF_K_UNION:
+ hp = dst_fp->ctf_unions;
+ break;
+ case CTF_K_ENUM:
+ hp = dst_fp->ctf_enums;
+ break;
+ default:
+ hp = dst_fp->ctf_names;
+ break;
+ }
+
+ /* If the source type has a name and is a root type (visible at the
+ top-level scope), lookup the name in the destination container and
+ verify that it is of the same kind before we do anything else. */
+
+ if ((flag & CTF_ADD_ROOT) && name[0] != '\0'
+ && (tmp = ctf_hash_lookup_type (hp, dst_fp, name)) != 0)
+ {
+ dst_type = tmp;
+ dst_kind = ctf_type_kind_unsliced (dst_fp, dst_type);
+ }
+
+ /* If an identically named dst_type exists, fail with ECTF_CONFLICT
+ unless dst_type is a forward declaration and src_type is a struct,
+ union, or enum (i.e. the definition of the previous forward decl). */
+
+ if (dst_type != CTF_ERR && dst_kind != kind
+ && (dst_kind != CTF_K_FORWARD
+ || (kind != CTF_K_ENUM && kind != CTF_K_STRUCT
+ && kind != CTF_K_UNION)))
+ {
+ ctf_dprintf ("Conflict for type %s: kinds differ, new: %i; "
+ "old (ID %lx): %i\n", name, kind, dst_type, dst_kind);
+ return (ctf_set_errno (dst_fp, ECTF_CONFLICT));
+ }
+
+ /* We take special action for an integer, float, or slice since it is
+ described not only by its name but also its encoding. For integers,
+ bit-fields exploit this degeneracy. */
+
+ if (kind == CTF_K_INTEGER || kind == CTF_K_FLOAT || kind == CTF_K_SLICE)
+ {
+ if (ctf_type_encoding (src_fp, src_type, &src_en) != 0)
+ return (ctf_set_errno (dst_fp, ctf_errno (src_fp)));
+
+ if (dst_type != CTF_ERR)
+ {
+ ctf_file_t *fp = dst_fp;
+
+ if ((dst_tp = ctf_lookup_by_id (&fp, dst_type)) == NULL)
+ return CTF_ERR;
+
+ if (LCTF_INFO_ISROOT (fp, dst_tp->ctt_info) & CTF_ADD_ROOT)
+ {
+ /* The type that we found in the hash is also root-visible. If
+ the two types match then use the existing one; otherwise,
+ declare a conflict. Note: slices are not certain to match
+ even if there is no conflict: we must check the contained type
+ too. */
+
+ if (ctf_type_encoding (dst_fp, dst_type, &dst_en) != 0)
+ return CTF_ERR; /* errno set for us. */
+
+ if (memcmp (&src_en, &dst_en, sizeof (ctf_encoding_t)) == 0)
+ {
+ if (kind != CTF_K_SLICE)
+ return dst_type;
+ }
+ else
+ {
+ return (ctf_set_errno (dst_fp, ECTF_CONFLICT));
+ }
+ }
+ else
+ {
+ /* We found a non-root-visible type in the hash. We reset
+ dst_type to ensure that we continue to look for a possible
+ conflict in the pending list. */
+
+ dst_type = CTF_ERR;
+ }
+ }
+ }
+
+ /* If the non-empty name was not found in the appropriate hash, search
+ the list of pending dynamic definitions that are not yet committed.
+ If a matching name and kind are found, assume this is the type that
+ we are looking for. This is necessary to permit ctf_add_type() to
+ operate recursively on entities such as a struct that contains a
+ pointer member that refers to the same struct type. */
+
+ if (dst_type == CTF_ERR && name[0] != '\0')
+ {
+ for (dtd = ctf_list_prev (&dst_fp->ctf_dtdefs); dtd != NULL
+ && LCTF_TYPE_TO_INDEX (src_fp, dtd->dtd_type) > dst_fp->ctf_dtoldid;
+ dtd = ctf_list_prev (dtd))
+ {
+ if (LCTF_INFO_KIND (src_fp, dtd->dtd_data.ctt_info) == kind
+ && dtd->dtd_name != NULL && strcmp (dtd->dtd_name, name) == 0)
+ {
+ int sroot; /* Is the src root-visible? */
+ int droot; /* Is the dst root-visible? */
+ int match; /* Do the encodings match? */
+
+ if (kind != CTF_K_INTEGER && kind != CTF_K_FLOAT && kind != CTF_K_SLICE)
+ return dtd->dtd_type;
+
+ sroot = (flag & CTF_ADD_ROOT);
+ droot = (LCTF_INFO_ISROOT (dst_fp,
+ dtd->dtd_data.
+ ctt_info) & CTF_ADD_ROOT);
+
+ match = (memcmp (&src_en, &dtd->dtd_u.dtu_enc,
+ sizeof (ctf_encoding_t)) == 0);
+
+ /* If the types share the same encoding then return the id of the
+ first unless one type is root-visible and the other is not; in
+ that case the new type must get a new id if a match is never
+ found. Note: slices are not certain to match even if there is
+ no conflict: we must check the contained type too. */
+
+ if (match && sroot == droot)
+ {
+ if (kind != CTF_K_SLICE)
+ return dtd->dtd_type;
+ }
+ else if (!match && sroot && droot)
+ {
+ return (ctf_set_errno (dst_fp, ECTF_CONFLICT));
+ }
+ }
+ }
+ }
+
+ src.ctb_file = src_fp;
+ src.ctb_type = src_type;
+ src.ctb_dtd = NULL;
+
+ dst.ctb_file = dst_fp;
+ dst.ctb_type = dst_type;
+ dst.ctb_dtd = NULL;
+
+ /* Now perform kind-specific processing. If dst_type is CTF_ERR, then
+ we add a new type with the same properties as src_type to dst_fp.
+ If dst_type is not CTF_ERR, then we verify that dst_type has the
+ same attributes as src_type. We recurse for embedded references. */
+ switch (kind)
+ {
+ case CTF_K_INTEGER:
+ /* If we found a match we will have either returned it or declared a
+ conflict. */
+ dst_type = ctf_add_integer (dst_fp, flag, name, &src_en);
+ break;
+
+ case CTF_K_FLOAT:
+ /* If we found a match we will have either returned it or declared a
+ conflict. */
+ dst_type = ctf_add_float (dst_fp, flag, name, &src_en);
+ break;
+
+ case CTF_K_SLICE:
+ /* We have checked for conflicting encodings: now try to add the
+ contained type. */
+ src_type = ctf_type_reference (src_fp, src_type);
+ dst_type = ctf_add_type (dst_fp, src_fp, src_type);
+
+ if (src_type == CTF_ERR)
+ return CTF_ERR; /* errno is set for us. */
+
+ dst_type = ctf_add_slice (dst_fp, flag, src_type, &src_en);
+ break;
+
+ case CTF_K_POINTER:
+ case CTF_K_VOLATILE:
+ case CTF_K_CONST:
+ case CTF_K_RESTRICT:
+ src_type = ctf_type_reference (src_fp, src_type);
+ src_type = ctf_add_type (dst_fp, src_fp, src_type);
+
+ if (src_type == CTF_ERR)
+ return CTF_ERR; /* errno is set for us. */
+
+ dst_type = ctf_add_reftype (dst_fp, flag, src_type, kind);
+ break;
+
+ case CTF_K_ARRAY:
+ if (ctf_array_info (src_fp, src_type, &src_ar) != 0)
+ return (ctf_set_errno (dst_fp, ctf_errno (src_fp)));
+
+ src_ar.ctr_contents =
+ ctf_add_type (dst_fp, src_fp, src_ar.ctr_contents);
+ src_ar.ctr_index = ctf_add_type (dst_fp, src_fp, src_ar.ctr_index);
+ src_ar.ctr_nelems = src_ar.ctr_nelems;
+
+ if (src_ar.ctr_contents == CTF_ERR || src_ar.ctr_index == CTF_ERR)
+ return CTF_ERR; /* errno is set for us. */
+
+ if (dst_type != CTF_ERR)
+ {
+ if (ctf_array_info (dst_fp, dst_type, &dst_ar) != 0)
+ return CTF_ERR; /* errno is set for us. */
+
+ if (memcmp (&src_ar, &dst_ar, sizeof (ctf_arinfo_t)))
+ {
+ ctf_dprintf ("Conflict for type %s against ID %lx: "
+ "array info differs, old %lx/%lx/%x; "
+ "new: %lx/%lx/%x\n", name, dst_type,
+ src_ar.ctr_contents, src_ar.ctr_index,
+ src_ar.ctr_nelems, dst_ar.ctr_contents,
+ dst_ar.ctr_index, dst_ar.ctr_nelems);
+ return (ctf_set_errno (dst_fp, ECTF_CONFLICT));
+ }
+ }
+ else
+ dst_type = ctf_add_array (dst_fp, flag, &src_ar);
+ break;
+
+ case CTF_K_FUNCTION:
+ ctc.ctc_return = ctf_add_type (dst_fp, src_fp, src_tp->ctt_type);
+ ctc.ctc_argc = 0;
+ ctc.ctc_flags = 0;
+
+ if (ctc.ctc_return == CTF_ERR)
+ return CTF_ERR; /* errno is set for us. */
+
+ dst_type = ctf_add_function (dst_fp, flag, &ctc, NULL);
+ break;
+
+ case CTF_K_STRUCT:
+ case CTF_K_UNION:
+ {
+ ctf_dmdef_t *dmd;
+ int errs = 0;
+ size_t size;
+ ssize_t ssize;
+
+ /* Technically to match a struct or union we need to check both
+ ways (src members vs. dst, dst members vs. src) but we make
+ this more optimal by only checking src vs. dst and comparing
+ the total size of the structure (which we must do anyway)
+ which covers the possibility of dst members not in src.
+ This optimization can be defeated for unions, but is so
+ pathological as to render it irrelevant for our purposes. */
+
+ if (dst_type != CTF_ERR && dst_kind != CTF_K_FORWARD)
+ {
+ if (ctf_type_size (src_fp, src_type) !=
+ ctf_type_size (dst_fp, dst_type))
+ {
+ ctf_dprintf ("Conflict for type %s against ID %lx: "
+ "union size differs, old %li, new %li\n",
+ name, dst_type,
+ (long) ctf_type_size (src_fp, src_type),
+ (long) ctf_type_size (dst_fp, dst_type));
+ return (ctf_set_errno (dst_fp, ECTF_CONFLICT));
+ }
+
+ if (ctf_member_iter (src_fp, src_type, membcmp, &dst))
+ {
+ ctf_dprintf ("Conflict for type %s against ID %lx: "
+ "members differ, see above\n", name, dst_type);
+ return (ctf_set_errno (dst_fp, ECTF_CONFLICT));
+ }
+
+ break;
+ }
+
+ /* Unlike the other cases, copying structs and unions is done
+ manually so as to avoid repeated lookups in ctf_add_member
+ and to ensure the exact same member offsets as in src_type. */
+
+ dst_type = ctf_add_generic (dst_fp, flag, name, &dtd);
+ if (dst_type == CTF_ERR)
+ return CTF_ERR; /* errno is set for us. */
+
+ dst.ctb_type = dst_type;
+ dst.ctb_dtd = dtd;
+
+ if (ctf_member_iter (src_fp, src_type, membadd, &dst) != 0)
+ errs++; /* Increment errs and fail at bottom of case. */
+
+ if ((ssize = ctf_type_size (src_fp, src_type)) < 0)
+ return CTF_ERR; /* errno is set for us. */
+
+ size = (size_t) ssize;
+ if (size > CTF_MAX_SIZE)
+ {
+ dtd->dtd_data.ctt_size = CTF_LSIZE_SENT;
+ dtd->dtd_data.ctt_lsizehi = CTF_SIZE_TO_LSIZE_HI (size);
+ dtd->dtd_data.ctt_lsizelo = CTF_SIZE_TO_LSIZE_LO (size);
+ }
+ else
+ dtd->dtd_data.ctt_size = (uint32_t) size;
+
+ dtd->dtd_data.ctt_info = CTF_TYPE_INFO (kind, flag, vlen);
+
+ /* Make a final pass through the members changing each dmd_type (a
+ src_fp type) to an equivalent type in dst_fp. We pass through all
+ members, leaving any that fail set to CTF_ERR. */
+ for (dmd = ctf_list_next (&dtd->dtd_u.dtu_members);
+ dmd != NULL; dmd = ctf_list_next (dmd))
+ {
+ if ((dmd->dmd_type = ctf_add_type (dst_fp, src_fp,
+ dmd->dmd_type)) == CTF_ERR)
+ errs++;
+ }
+
+ if (errs)
+ return CTF_ERR; /* errno is set for us. */
+ break;
+ }
+
+ case CTF_K_ENUM:
+ if (dst_type != CTF_ERR && dst_kind != CTF_K_FORWARD)
+ {
+ if (ctf_enum_iter (src_fp, src_type, enumcmp, &dst)
+ || ctf_enum_iter (dst_fp, dst_type, enumcmp, &src))
+ {
+ ctf_dprintf ("Conflict for enum %s against ID %lx: "
+ "members differ, see above\n", name, dst_type);
+ return (ctf_set_errno (dst_fp, ECTF_CONFLICT));
+ }
+ }
+ else
+ {
+ dst_type = ctf_add_enum (dst_fp, flag, name);
+ if ((dst.ctb_type = dst_type) == CTF_ERR
+ || ctf_enum_iter (src_fp, src_type, enumadd, &dst))
+ return CTF_ERR; /* errno is set for us */
+ }
+ break;
+
+ case CTF_K_FORWARD:
+ if (dst_type == CTF_ERR)
+ {
+ dst_type = ctf_add_forward (dst_fp, flag,
+ name, CTF_K_STRUCT); /* Assume STRUCT. */
+ }
+ break;
+
+ case CTF_K_TYPEDEF:
+ src_type = ctf_type_reference (src_fp, src_type);
+ src_type = ctf_add_type (dst_fp, src_fp, src_type);
+
+ if (src_type == CTF_ERR)
+ return CTF_ERR; /* errno is set for us. */
+
+ /* If dst_type is not CTF_ERR at this point, we should check if
+ ctf_type_reference(dst_fp, dst_type) != src_type and if so fail with
+ ECTF_CONFLICT. However, this causes problems with bitness typedefs
+ that vary based on things like if 32-bit then pid_t is int otherwise
+ long. We therefore omit this check and assume that if the identically
+ named typedef already exists in dst_fp, it is correct or
+ equivalent. */
+
+ if (dst_type == CTF_ERR)
+ {
+ dst_type = ctf_add_typedef (dst_fp, flag, name, src_type);
+ }
+ break;
+
+ default:
+ return (ctf_set_errno (dst_fp, ECTF_CORRUPT));
+ }
+
+ return dst_type;
+}
+
/* Write the compressed CTF data stream to the specified gzFile descriptor.
This is useful for saving the results of dynamic CTF containers. */
int
memcpy (hp, fp->ctf_base, header_len);
hp->cth_flags |= CTF_F_COMPRESS;
- if ((buf = ctf_data_alloc (max_compress_len)) == NULL)
+ if ((buf = ctf_alloc (max_compress_len)) == NULL)
return (ctf_set_errno (fp, ECTF_ZALLOC));
compress_len = max_compress_len;
- if ((rc = compress (buf, (uLongf *) & compress_len,
+ if ((rc = compress (buf, (uLongf *) &compress_len,
fp->ctf_base + header_len,
fp->ctf_size - header_len)) != Z_OK)
{
ctf_dprintf ("zlib deflate err: %s\n", zError (rc));
err = ctf_set_errno (fp, ECTF_COMPRESS);
+ ctf_free (buf);
goto ret;
}
}
ret:
- ctf_data_free (buf, max_compress_len);
+ ctf_free (buf);
return err;
}
projects / deliverable / binutils-gdb.git / blobdiff