diff options
author | Nick Alcock <nick.alcock@oracle.com> | 2021-03-18 12:37:52 +0000 |
---|---|---|
committer | Nick Alcock <nick.alcock@oracle.com> | 2021-03-18 12:40:40 +0000 |
commit | 534444b1ee161f342d303fd6549310963ce233c9 (patch) | |
tree | 40baedec204fb6417e0e412f8de81a0f4f406117 /libctf/ctf-create.c | |
parent | 7879dd88efdabc5a2e93b71f488f09303117a0a9 (diff) | |
download | binutils-534444b1ee161f342d303fd6549310963ce233c9.zip binutils-534444b1ee161f342d303fd6549310963ce233c9.tar.gz binutils-534444b1ee161f342d303fd6549310963ce233c9.tar.bz2 |
libctf: eliminate dtd_u, part 2: arrays
This is even simpler than ints, floats and slices, with the only extra
complication being the need to manually transfer the array parameter in
the rarely-used function ctf_set_array. (Arrays are unique in libctf in
that they can be modified post facto, not just created and appended to.
I'm not sure why they got this exemption, but it's easy to maintain.)
libctf/ChangeLog
2021-03-18 Nick Alcock <nick.alcock@oracle.com>
* ctf-impl.h (ctf_dtdef_t) <dtd_u.dtu_arr>: Remove.
* ctf-create.c (ctf_add_array): Use the dtd_vlen, not dtu_arr.
(ctf_set_array): Likewise.
* ctf-serialize.c (ctf_emit_type_sect): Just copy the dtd_vlen.
* ctf-types.c (ctf_array_info): Just use the vlen.
Diffstat (limited to 'libctf/ctf-create.c')
-rw-r--r-- | libctf/ctf-create.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/libctf/ctf-create.c b/libctf/ctf-create.c index 90db712..bc46cfa 100644 --- a/libctf/ctf-create.c +++ b/libctf/ctf-create.c @@ -635,6 +635,7 @@ ctf_id_t ctf_add_array (ctf_dict_t *fp, uint32_t flag, const ctf_arinfo_t *arp) { ctf_dtdef_t *dtd; + ctf_array_t cta; ctf_id_t type; ctf_dict_t *tmp = fp; @@ -658,12 +659,17 @@ ctf_add_array (ctf_dict_t *fp, uint32_t flag, const ctf_arinfo_t *arp) } if ((type = ctf_add_generic (fp, flag, NULL, CTF_K_ARRAY, - 0, &dtd)) == CTF_ERR) + sizeof (ctf_array_t), &dtd)) == CTF_ERR) return CTF_ERR; /* errno is set for us. */ + memset (&cta, 0, sizeof (ctf_array_t)); + dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_ARRAY, flag, 0); dtd->dtd_data.ctt_size = 0; - dtd->dtd_u.dtu_arr = *arp; + cta.cta_contents = (uint32_t) arp->ctr_contents; + cta.cta_index = (uint32_t) arp->ctr_index; + cta.cta_nelems = arp->ctr_nelems; + memcpy (dtd->dtd_vlen, &cta, sizeof (ctf_array_t)); return type; } @@ -672,6 +678,7 @@ int ctf_set_array (ctf_dict_t *fp, ctf_id_t type, const ctf_arinfo_t *arp) { ctf_dtdef_t *dtd = ctf_dtd_lookup (fp, type); + ctf_array_t *vlen; if (!(fp->ctf_flags & LCTF_RDWR)) return (ctf_set_errno (fp, ECTF_RDONLY)); @@ -680,8 +687,11 @@ ctf_set_array (ctf_dict_t *fp, ctf_id_t type, const ctf_arinfo_t *arp) || LCTF_INFO_KIND (fp, dtd->dtd_data.ctt_info) != CTF_K_ARRAY) return (ctf_set_errno (fp, ECTF_BADID)); + vlen = (ctf_array_t *) dtd->dtd_vlen; fp->ctf_flags |= LCTF_DIRTY; - dtd->dtd_u.dtu_arr = *arp; + vlen->cta_contents = (uint32_t) arp->ctr_contents; + vlen->cta_index = (uint32_t) arp->ctr_index; + vlen->cta_nelems = arp->ctr_nelems; return 0; } |