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 | 81982d20fac4ae6981097a2d609093e8698fd179 (patch) | |
| tree | 62ce36d903e94cac575d47cd5dc2aa172f59f5f5 /libctf/ctf-serialize.c | |
| parent | 534444b1ee161f342d303fd6549310963ce233c9 (diff) | |
| download | binutils-gdb-81982d20fac4ae6981097a2d609093e8698fd179.tar.gz | |
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 <nick.alcock@oracle.com>
* ctf-impl.h (ctf_dtdef_t) <dtd_u.dtu_argv>: 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.
Diffstat (limited to 'libctf/ctf-serialize.c')
| -rw-r--r-- | libctf/ctf-serialize.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/libctf/ctf-serialize.c b/libctf/ctf-serialize.c index d8e78f361f4..460ae1a510e 100644 --- a/libctf/ctf-serialize.c +++ b/libctf/ctf-serialize.c @@ -892,19 +892,9 @@ ctf_emit_type_sect (ctf_dict_t *fp, unsigned char **tptr) break; case CTF_K_FUNCTION: - { - uint32_t *argv = (uint32_t *) (uintptr_t) t; - uint32_t argc; - - for (argc = 0; argc < vlen; argc++) - *argv++ = dtd->dtd_u.dtu_argv[argc]; - - if (vlen & 1) - *argv++ = 0; /* Pad to 4-byte boundary. */ - - t = (unsigned char *) argv; - break; - } + memcpy (t, dtd->dtd_vlen, sizeof (uint32_t) * (vlen + (vlen & 1))); + t += sizeof (uint32_t) * (vlen + (vlen & 1)); + break; case CTF_K_STRUCT: case CTF_K_UNION: |