mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
a0486bac41
- Use of nonportable <endian.h> - Use of qsort_r - Use of zlib without appropriate magic to pull in the binutils zlib - Use of off64_t without checking (fixed by dropping the unused fields that need off64_t entirely) - signedness problems due to long being too short a type on 32-bit platforms: ctf_id_t is now 'unsigned long', and CTF_ERR must be used only for functions that return ctf_id_t - One lingering use of bzero() and of <sys/errno.h> All fixed, using code from gnulib where possible. Relatedly, set cts_size in a couple of places it was missed (string table and symbol table loading upon ctf_bfdopen()). binutils/ * objdump.c (make_ctfsect): Drop cts_type, cts_flags, and cts_offset. * readelf.c (shdr_to_ctf_sect): Likewise. include/ * ctf-api.h (ctf_sect_t): Drop cts_type, cts_flags, and cts_offset. (ctf_id_t): This is now an unsigned type. (CTF_ERR): Cast it to ctf_id_t. Note that it should only be used for ctf_id_t-returning functions. libctf/ * Makefile.am (ZLIB): New. (ZLIBINC): Likewise. (AM_CFLAGS): Use them. (libctf_a_LIBADD): New, for LIBOBJS. * configure.ac: Check for zlib, endian.h, and qsort_r. * ctf-endian.h: New, providing htole64 and le64toh. * swap.h: Code style fixes. (bswap_identity_64): New. * qsort_r.c: New, from gnulib (with one added #include). * ctf-decls.h: New, providing a conditional qsort_r declaration, and unconditional definitions of MIN and MAX. * ctf-impl.h: Use it. Do not use <sys/errno.h>. (ctf_set_errno): Now returns unsigned long. * ctf-util.c (ctf_set_errno): Adjust here too. * ctf-archive.c: Use ctf-endian.h. (ctf_arc_open_by_offset): Use memset, not bzero. Drop cts_type, cts_flags and cts_offset. (ctf_arc_write): Drop debugging dependent on the size of off_t. * ctf-create.c: Provide a definition of roundup if not defined. (ctf_create): Drop cts_type, cts_flags and cts_offset. (ctf_add_reftype): Do not check if type IDs are below zero. (ctf_add_slice): Likewise. (ctf_add_typedef): Likewise. (ctf_add_member_offset): Cast error-returning ssize_t's to size_t when known error-free. Drop CTF_ERR usage for functions returning int. (ctf_add_member_encoded): Drop CTF_ERR usage for functions returning int. (ctf_add_variable): Likewise. (enumcmp): Likewise. (enumadd): Likewise. (membcmp): Likewise. (ctf_add_type): Likewise. Cast error-returning ssize_t's to size_t when known error-free. * ctf-dump.c (ctf_is_slice): Drop CTF_ERR usage for functions returning int: use CTF_ERR for functions returning ctf_type_id. (ctf_dump_label): Likewise. (ctf_dump_objts): Likewise. * ctf-labels.c (ctf_label_topmost): Likewise. (ctf_label_iter): Likewise. (ctf_label_info): Likewise. * ctf-lookup.c (ctf_func_args): Likewise. * ctf-open.c (upgrade_types): Cast to size_t where appropriate. (ctf_bufopen): Likewise. Use zlib types as needed. * ctf-types.c (ctf_member_iter): Drop CTF_ERR usage for functions returning int. (ctf_enum_iter): Likewise. (ctf_type_size): Likewise. (ctf_type_align): Likewise. Cast to size_t where appropriate. (ctf_type_kind_unsliced): Likewise. (ctf_type_kind): Likewise. (ctf_type_encoding): Likewise. (ctf_member_info): Likewise. (ctf_array_info): Likewise. (ctf_enum_value): Likewise. (ctf_type_rvisit): Likewise. * ctf-open-bfd.c (ctf_bfdopen): Drop cts_type, cts_flags and cts_offset. (ctf_simple_open): Likewise. (ctf_bfdopen_ctfsect): Likewise. Set cts_size properly. * Makefile.in: Regenerate. * aclocal.m4: Likewise. * config.h: Likewise. * configure: Likewise.
139 lines
3.6 KiB
C
139 lines
3.6 KiB
C
/* Labelled ranges of type IDs.
|
|
Copyright (C) 2019 Free Software Foundation, Inc.
|
|
|
|
This file is part of libctf.
|
|
|
|
libctf is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free
|
|
Software Foundation; either version 3, or (at your option) any later
|
|
version.
|
|
|
|
This program is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; see the file COPYING. If not see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <ctf-impl.h>
|
|
#include <string.h>
|
|
|
|
static int
|
|
extract_label_info (ctf_file_t *fp, const ctf_lblent_t **ctl,
|
|
uint32_t *num_labels)
|
|
{
|
|
const ctf_header_t *h;
|
|
|
|
h = (const ctf_header_t *) fp->ctf_data.cts_data;
|
|
|
|
*ctl = (const ctf_lblent_t *) (fp->ctf_buf + h->cth_lbloff);
|
|
*num_labels = (h->cth_objtoff - h->cth_lbloff) / sizeof (ctf_lblent_t);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Returns the topmost label, or NULL if any errors are encountered. */
|
|
|
|
const char *
|
|
ctf_label_topmost (ctf_file_t *fp)
|
|
{
|
|
const ctf_lblent_t *ctlp = NULL;
|
|
const char *s;
|
|
uint32_t num_labels = 0;
|
|
|
|
if (extract_label_info (fp, &ctlp, &num_labels) < 0)
|
|
return NULL; /* errno is set for us. */
|
|
|
|
if (num_labels == 0)
|
|
{
|
|
(void) ctf_set_errno (fp, ECTF_NOLABELDATA);
|
|
return NULL;
|
|
}
|
|
|
|
if ((s = ctf_strraw (fp, (ctlp + num_labels - 1)->ctl_label)) == NULL)
|
|
(void) ctf_set_errno (fp, ECTF_CORRUPT);
|
|
|
|
return s;
|
|
}
|
|
|
|
/* Iterate over all labels. We pass the label string and the lblinfo_t struct
|
|
to the specified callback function. */
|
|
int
|
|
ctf_label_iter (ctf_file_t *fp, ctf_label_f *func, void *arg)
|
|
{
|
|
const ctf_lblent_t *ctlp = NULL;
|
|
uint32_t i;
|
|
uint32_t num_labels = 0;
|
|
ctf_lblinfo_t linfo;
|
|
const char *lname;
|
|
int rc;
|
|
|
|
if (extract_label_info (fp, &ctlp, &num_labels) < 0)
|
|
return -1; /* errno is set for us. */
|
|
|
|
if (num_labels == 0)
|
|
return (ctf_set_errno (fp, ECTF_NOLABELDATA));
|
|
|
|
for (i = 0; i < num_labels; i++, ctlp++)
|
|
{
|
|
if ((lname = ctf_strraw (fp, ctlp->ctl_label)) == NULL)
|
|
{
|
|
ctf_dprintf ("failed to decode label %u with "
|
|
"type %u\n", ctlp->ctl_label, ctlp->ctl_type);
|
|
return (ctf_set_errno (fp, ECTF_CORRUPT));
|
|
}
|
|
|
|
linfo.ctb_type = ctlp->ctl_type;
|
|
if ((rc = func (lname, &linfo, arg)) != 0)
|
|
return rc;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
typedef struct linfo_cb_arg
|
|
{
|
|
const char *lca_name; /* Label we want to retrieve info for. */
|
|
ctf_lblinfo_t *lca_info; /* Where to store the info about the label. */
|
|
} linfo_cb_arg_t;
|
|
|
|
static int
|
|
label_info_cb (const char *lname, const ctf_lblinfo_t *linfo, void *arg)
|
|
{
|
|
/* If lname matches the label we are looking for, copy the
|
|
lblinfo_t struct for the caller. */
|
|
|
|
if (strcmp (lname, ((linfo_cb_arg_t *) arg)->lca_name) == 0)
|
|
{
|
|
/* * Allow caller not to allocate storage to test if label exists. */
|
|
|
|
if (((linfo_cb_arg_t *) arg)->lca_info != NULL)
|
|
memcpy (((linfo_cb_arg_t *) arg)->lca_info, linfo,
|
|
sizeof (ctf_lblinfo_t));
|
|
return 1; /* Indicate we found a match. */
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* Retrieve information about the label with name "lname". */
|
|
int
|
|
ctf_label_info (ctf_file_t *fp, const char *lname, ctf_lblinfo_t *linfo)
|
|
{
|
|
linfo_cb_arg_t cb_arg;
|
|
int rc;
|
|
|
|
cb_arg.lca_name = lname;
|
|
cb_arg.lca_info = linfo;
|
|
|
|
if ((rc = ctf_label_iter (fp, label_info_cb, &cb_arg)) < 0)
|
|
return rc;
|
|
|
|
if (rc != 1)
|
|
return (ctf_set_errno (fp, ECTF_NOLABEL));
|
|
|
|
return 0;
|
|
}
|