espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-23 03:29:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdbtypes: return value from get_unsigned_type_max

Browse Source 
Changes the signature of get_unsigned_type_max to return the computed
value rather than returning void and writing the value into a pointer
passed by the caller.

gdb/ChangeLog:

2021-07-30  George Barrett  <bob@bob131.so>

	* gdbtypes.h (get_unsigned_type_max): Change signature to
	return the result instead of accepting a pointer argument in
	which to store the result.
	* gdbtypes.c (get_unsigned_type_max): Likewise.
	* guile/scm-math.c (vlscm_convert_typed_number): Update caller
	of get_unsigned_type_max.
	(vlscm_integer_fits_p): Likewise.

Change-Id: Ibb1bf0c0fa181fac7853147dfde082a7d1ae2323
This commit is contained in:
George Barrett
2021-07-30 01:12:03 +10:00
committed by Simon Marchi
parent cd026728f3
commit c3c1e6459f
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/gdbtypes.c
View File

@ -1891,11 +1891,10 @@ lookup_struct_elt_type (struct type *type, const char *name, int noerr)
return NULL; return NULL;
} }
/* Store in *MAX the largest number representable by unsigned integer type /* Return the largest number representable by unsigned integer type TYPE. */
TYPE. */
void ULONGEST
get_unsigned_type_max (struct type *type, ULONGEST *max) get_unsigned_type_max (struct type *type)
{ {
unsigned int n; unsigned int n;
@ -1905,7 +1904,7 @@ get_unsigned_type_max (struct type *type, ULONGEST *max)
/* Written this way to avoid overflow. */ /* Written this way to avoid overflow. */
n = TYPE_LENGTH (type) * TARGET_CHAR_BIT; n = TYPE_LENGTH (type) * TARGET_CHAR_BIT;
*max = ((((ULONGEST) 1 << (n - 1)) - 1) << 1) | 1; return ((((ULONGEST) 1 << (n - 1)) - 1) << 1) | 1;
} }
/* Store in *MIN, *MAX the smallest and largest numbers representable by /* Store in *MIN, *MAX the smallest and largest numbers representable by

2
gdb/gdbtypes.h
View File

@ -2519,7 +2519,7 @@ extern struct type *lookup_unsigned_typename (const struct language_defn *,
extern struct type *lookup_signed_typename (const struct language_defn *, extern struct type *lookup_signed_typename (const struct language_defn *,
const char *); const char *);
extern void get_unsigned_type_max (struct type *, ULONGEST *); extern ULONGEST get_unsigned_type_max (struct type *);
extern void get_signed_type_minmax (struct type *, LONGEST *, LONGEST *); extern void get_signed_type_minmax (struct type *, LONGEST *, LONGEST *);

9
gdb/guile/scm-math.c
View File

@ -529,9 +529,7 @@ vlscm_convert_typed_number (const char *func_name, int obj_arg_pos, SCM obj,
{ {
if (type->is_unsigned ()) if (type->is_unsigned ())
{ {
ULONGEST max; ULONGEST max = get_unsigned_type_max (type);
get_unsigned_type_max (type, &max);
if (!scm_is_unsigned_integer (obj, 0, max)) if (!scm_is_unsigned_integer (obj, 0, max))
{ {
*except_scmp *except_scmp
@ -575,12 +573,11 @@ vlscm_integer_fits_p (SCM obj, struct type *type)
{ {
if (type->is_unsigned ()) if (type->is_unsigned ())
{ {
ULONGEST max;
/* If scm_is_unsigned_integer can't work with this type, just punt. */ /* If scm_is_unsigned_integer can't work with this type, just punt. */
if (TYPE_LENGTH (type) > sizeof (uintmax_t)) if (TYPE_LENGTH (type) > sizeof (uintmax_t))
return 0; return 0;
get_unsigned_type_max (type, &max);
ULONGEST max = get_unsigned_type_max (type);
return scm_is_unsigned_integer (obj, 0, max); return scm_is_unsigned_integer (obj, 0, max);
} }
else else