mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-05-22 17:57:45 +08:00
libctf: fix a number of build problems found on Solaris and NetBSD
- 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.
This commit is contained in:
Jose E. Marchesi
@ -47,10 +47,10 @@ ctf_member_iter (ctf_file_t *fp, ctf_id_t type, ctf_member_f *func, void *arg)
|
||||
int rc;
|
||||
|
||||
if ((type = ctf_type_resolve (fp, type)) == CTF_ERR)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if ((tp = ctf_lookup_by_id (&fp, type)) == NULL)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
(void) ctf_get_ctt_size (fp, tp, &size, &increment);
|
||||
kind = LCTF_INFO_KIND (fp, tp->ctt_info);
|
||||
@ -102,10 +102,10 @@ ctf_enum_iter (ctf_file_t *fp, ctf_id_t type, ctf_enum_f *func, void *arg)
|
||||
int rc;
|
||||
|
||||
if ((type = ctf_type_resolve_unsliced (fp, type)) == CTF_ERR)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if ((tp = ctf_lookup_by_id (&fp, type)) == NULL)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if (LCTF_INFO_KIND (fp, tp->ctt_info) != CTF_K_ENUM)
|
||||
return (ctf_set_errno (ofp, ECTF_NOTENUM));
|
||||
@ -406,8 +406,8 @@ ctf_type_size (ctf_file_t *fp, ctf_id_t type)
|
||||
if ((size = ctf_get_ctt_size (fp, tp, NULL, NULL)) > 0)
|
||||
return size;
|
||||
|
||||
if (ctf_array_info (fp, type, &ar) == CTF_ERR
|
||||
|| (size = ctf_type_size (fp, ar.ctr_contents)) == CTF_ERR)
|
||||
if (ctf_array_info (fp, type, &ar) < 0
|
||||
|| (size = ctf_type_size (fp, ar.ctr_contents)) < 0)
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
return size * ar.ctr_nelems;
|
||||
@ -445,7 +445,7 @@ ctf_type_align (ctf_file_t *fp, ctf_id_t type)
|
||||
case CTF_K_ARRAY:
|
||||
{
|
||||
ctf_arinfo_t r;
|
||||
if (ctf_array_info (fp, type, &r) == CTF_ERR)
|
||||
if (ctf_array_info (fp, type, &r) < 0)
|
||||
return -1; /* errno is set for us. */
|
||||
return (ctf_type_align (fp, r.ctr_contents));
|
||||
}
|
||||
@ -474,7 +474,7 @@ ctf_type_align (ctf_file_t *fp, ctf_id_t type)
|
||||
for (; n != 0; n--, mp++)
|
||||
{
|
||||
ssize_t am = ctf_type_align (fp, mp->ctm_type);
|
||||
align = MAX (align, am);
|
||||
align = MAX (align, (size_t) am);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -483,7 +483,7 @@ ctf_type_align (ctf_file_t *fp, ctf_id_t type)
|
||||
for (; n != 0; n--, lmp++)
|
||||
{
|
||||
ssize_t am = ctf_type_align (fp, lmp->ctlm_type);
|
||||
align = MAX (align, am);
|
||||
align = MAX (align, (size_t) am);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -495,7 +495,7 @@ ctf_type_align (ctf_file_t *fp, ctf_id_t type)
|
||||
dmd != NULL; dmd = ctf_list_next (dmd))
|
||||
{
|
||||
ssize_t am = ctf_type_align (fp, dmd->dmd_type);
|
||||
align = MAX (align, am);
|
||||
align = MAX (align, (size_t) am);
|
||||
if (kind == CTF_K_STRUCT)
|
||||
break;
|
||||
}
|
||||
@ -520,7 +520,7 @@ ctf_type_kind_unsliced (ctf_file_t *fp, ctf_id_t type)
|
||||
const ctf_type_t *tp;
|
||||
|
||||
if ((tp = ctf_lookup_by_id (&fp, type)) == NULL)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
return (LCTF_INFO_KIND (fp, tp->ctt_info));
|
||||
}
|
||||
@ -533,13 +533,13 @@ ctf_type_kind (ctf_file_t *fp, ctf_id_t type)
|
||||
{
|
||||
int kind;
|
||||
|
||||
if ((kind = ctf_type_kind_unsliced (fp, type)) == CTF_ERR)
|
||||
return CTF_ERR;
|
||||
if ((kind = ctf_type_kind_unsliced (fp, type)) < 0)
|
||||
return -1;
|
||||
|
||||
if (kind == CTF_K_SLICE)
|
||||
{
|
||||
if ((type = ctf_type_reference (fp, type)) == CTF_ERR)
|
||||
return CTF_ERR;
|
||||
return -1;
|
||||
kind = ctf_type_kind_unsliced (fp, type);
|
||||
}
|
||||
|
||||
@ -624,7 +624,7 @@ ctf_type_encoding (ctf_file_t *fp, ctf_id_t type, ctf_encoding_t *ep)
|
||||
uint32_t data;
|
||||
|
||||
if ((tp = ctf_lookup_by_id (&fp, type)) == NULL)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if ((dtd = ctf_dynamic_type (ofp, type)) != NULL)
|
||||
{
|
||||
@ -790,10 +790,10 @@ ctf_member_info (ctf_file_t *fp, ctf_id_t type, const char *name,
|
||||
uint32_t kind, n;
|
||||
|
||||
if ((type = ctf_type_resolve (fp, type)) == CTF_ERR)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if ((tp = ctf_lookup_by_id (&fp, type)) == NULL)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
(void) ctf_get_ctt_size (fp, tp, &size, &increment);
|
||||
kind = LCTF_INFO_KIND (fp, tp->ctt_info);
|
||||
@ -847,7 +847,7 @@ ctf_array_info (ctf_file_t *fp, ctf_id_t type, ctf_arinfo_t *arp)
|
||||
ssize_t increment;
|
||||
|
||||
if ((tp = ctf_lookup_by_id (&fp, type)) == NULL)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if (LCTF_INFO_KIND (fp, tp->ctt_info) != CTF_K_ARRAY)
|
||||
return (ctf_set_errno (ofp, ECTF_NOTARRAY));
|
||||
@ -919,15 +919,15 @@ ctf_enum_value (ctf_file_t * fp, ctf_id_t type, const char *name, int *valp)
|
||||
uint32_t n;
|
||||
|
||||
if ((type = ctf_type_resolve_unsliced (fp, type)) == CTF_ERR)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if ((tp = ctf_lookup_by_id (&fp, type)) == NULL)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if (LCTF_INFO_KIND (fp, tp->ctt_info) != CTF_K_ENUM)
|
||||
{
|
||||
(void) ctf_set_errno (ofp, ECTF_NOTENUM);
|
||||
return CTF_ERR;
|
||||
return -1;
|
||||
}
|
||||
|
||||
(void) ctf_get_ctt_size (fp, tp, NULL, &increment);
|
||||
@ -945,7 +945,7 @@ ctf_enum_value (ctf_file_t * fp, ctf_id_t type, const char *name, int *valp)
|
||||
}
|
||||
|
||||
(void) ctf_set_errno (ofp, ECTF_NOENUMNAM);
|
||||
return CTF_ERR;
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* Recursively visit the members of any type. This function is used as the
|
||||
@ -965,10 +965,10 @@ ctf_type_rvisit (ctf_file_t *fp, ctf_id_t type, ctf_visit_f *func,
|
||||
int rc;
|
||||
|
||||
if ((type = ctf_type_resolve (fp, type)) == CTF_ERR)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if ((tp = ctf_lookup_by_id (&fp, type)) == NULL)
|
||||
return CTF_ERR; /* errno is set for us. */
|
||||
return -1; /* errno is set for us. */
|
||||
|
||||
if ((rc = func (name, otype, offset, depth, arg)) != 0)
|
||||
return rc;
|
||||
|
||||
Reference in New Issue
Block a user