From 81982d20fac4ae6981097a2d609093e8698fd179 Mon Sep 17 00:00:00 2001 From: Nick Alcock Date: Thu, 18 Mar 2021 12:37:52 +0000 Subject: libctf: eliminate dtd_u, part 3: functions One more member vanishes from the dtd_u, leaving only the member for struct/union/enum members. There's not much to do here, since as of commit afd78bd6f0a30ba5 we use the same representation (type sizes, etc) in the dtu_argv as we will use in the final vlen, with one exception: the vlen has alignment padding, and the dtu_argv did not. Simplify things by adding suitable padding in both cases. libctf/ChangeLog 2021-03-18 Nick Alcock * ctf-impl.h (ctf_dtdef_t) : Remove. * ctf-create.c (ctf_dtd_delete): No longer free it. (ctf_add_function): Use the dtd_vlen, not dtu_argv. Properly align. * ctf-serialize.c (ctf_emit_type_sect): Just copy the dtd_vlen. * ctf-types.c (ctf_func_type_info): Just use the vlen. (ctf_func_type_args): Likewise. --- libctf/ctf-create.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) (limited to 'libctf/ctf-create.c') diff --git a/libctf/ctf-create.c b/libctf/ctf-create.c index bc46cfa..6acc242 100644 --- a/libctf/ctf-create.c +++ b/libctf/ctf-create.c @@ -242,9 +242,6 @@ ctf_dtd_delete (ctf_dict_t *fp, ctf_dtdef_t *dtd) free (dmd); } break; - case CTF_K_FUNCTION: - free (dtd->dtd_u.dtu_argv); - break; case CTF_K_FORWARD: name_kind = dtd->dtd_data.ctt_type; break; @@ -703,8 +700,9 @@ ctf_add_function (ctf_dict_t *fp, uint32_t flag, ctf_dtdef_t *dtd; ctf_id_t type; uint32_t vlen; - uint32_t *vdat = NULL; + uint32_t *vdat; ctf_dict_t *tmp = fp; + size_t initial_vlen; size_t i; if (!(fp->ctf_flags & LCTF_RDWR)) @@ -720,38 +718,35 @@ ctf_add_function (ctf_dict_t *fp, uint32_t flag, if (ctc->ctc_return != 0 && ctf_lookup_by_id (&tmp, ctc->ctc_return) == NULL) - return CTF_ERR; /* errno is set for us. */ + return CTF_ERR; /* errno is set for us. */ if (vlen > CTF_MAX_VLEN) return (ctf_set_errno (fp, EOVERFLOW)); - if (vlen != 0 && (vdat = malloc (sizeof (ctf_id_t) * vlen)) == NULL) - return (ctf_set_errno (fp, EAGAIN)); + /* One word extra allocated for padding for 4-byte alignment if need be. + Not reflected in vlen: we don't want to copy anything into it, and + it's in addition to (e.g.) the trailing 0 indicating varargs. */ + + initial_vlen = (sizeof (uint32_t) * (vlen + (vlen & 1))); + if ((type = ctf_add_generic (fp, flag, NULL, CTF_K_FUNCTION, + initial_vlen, &dtd)) == CTF_ERR) + return CTF_ERR; /* errno is set for us. */ + + vdat = (uint32_t *) dtd->dtd_vlen; for (i = 0; i < ctc->ctc_argc; i++) { tmp = fp; if (argv[i] != 0 && ctf_lookup_by_id (&tmp, argv[i]) == NULL) - { - free (vdat); - return CTF_ERR; /* errno is set for us. */ - } + return CTF_ERR; /* errno is set for us. */ vdat[i] = (uint32_t) argv[i]; } - if ((type = ctf_add_generic (fp, flag, NULL, CTF_K_FUNCTION, - 0, &dtd)) == CTF_ERR) - { - free (vdat); - return CTF_ERR; /* errno is set for us. */ - } - dtd->dtd_data.ctt_info = CTF_TYPE_INFO (CTF_K_FUNCTION, flag, vlen); dtd->dtd_data.ctt_type = (uint32_t) ctc->ctc_return; if (ctc->ctc_flags & CTF_FUNC_VARARG) vdat[vlen - 1] = 0; /* Add trailing zero to indicate varargs. */ - dtd->dtd_u.dtu_argv = vdat; return type; } -- cgit v1.1