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

infcall: move assertions in 'call_function_by_hand_dummy' to an earlier spot

Browse Source 
This is a refactoring that performs type assertions on the callee
function at the beginning of 'call_function_by_hand_dummy' rather than
at a later point so that

- the checks are grouped together at the beginning of the function for
improved readability, and

- we don't have to align and push things on the stack only to find out
later that the function call is illegal.

gdb/ChangeLog:
2019-10-23  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>

	* infcall.c (call_function_by_hand_dummy): Refactor.

Change-Id: I411ac083ac6a9ee6eb93c4b82393a81a4fc927be
This commit is contained in:
Tankut Baris Aktemur
2019-10-23 20:40:02 +02:00
parent bd888c0fe2
commit 39bcc47c7e
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2019-10-23 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
* infcall.c (call_function_by_hand_dummy): Refactor.
2019-10-23 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> 2019-10-23 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com>
* MAINTAINERS (Write After Approval): Add Tankut Baris Aktemur. * MAINTAINERS (Write After Approval): Add Tankut Baris Aktemur.

41
gdb/infcall.c
View File

@ -746,6 +746,27 @@ call_function_by_hand_dummy (struct value *function,
if (!gdbarch_push_dummy_call_p (gdbarch)) if (!gdbarch_push_dummy_call_p (gdbarch))
error (_("This target does not support function calls.")); error (_("This target does not support function calls."));
/* Find the function type and do a sanity check. */
type *ftype;
type *values_type;
CORE_ADDR funaddr = find_function_addr (function, &values_type, &ftype);
if (values_type == NULL)
values_type = default_return_type;
if (values_type == NULL)
{
const char *name = get_function_name (funaddr,
name_buf, sizeof (name_buf));
error (_("'%s' has unknown return type; "
"cast the call to its declared return type"),
name);
}
values_type = check_typedef (values_type);
if (args.size () < TYPE_NFIELDS (ftype))
error (_("Too few arguments in function call."));
/* A holder for the inferior status. /* A holder for the inferior status.
This is only needed while we're preparing the inferior function call. */ This is only needed while we're preparing the inferior function call. */
infcall_control_state_up inf_status (save_infcall_control_state ()); infcall_control_state_up inf_status (save_infcall_control_state ());
@ -851,23 +872,6 @@ call_function_by_hand_dummy (struct value *function,
} }
} }
type *ftype;
type *values_type;
CORE_ADDR funaddr = find_function_addr (function, &values_type, &ftype);
if (values_type == NULL)
values_type = default_return_type;
if (values_type == NULL)
{
const char *name = get_function_name (funaddr,
name_buf, sizeof (name_buf));
error (_("'%s' has unknown return type; "
"cast the call to its declared return type"),
name);
}
values_type = check_typedef (values_type);
/* Are we returning a value using a structure return? */ /* Are we returning a value using a structure return? */
if (gdbarch_return_in_first_hidden_param_p (gdbarch, values_type)) if (gdbarch_return_in_first_hidden_param_p (gdbarch, values_type))
@ -945,9 +949,6 @@ call_function_by_hand_dummy (struct value *function,
internal_error (__FILE__, __LINE__, _("bad switch")); internal_error (__FILE__, __LINE__, _("bad switch"));
} }
if (args.size () < TYPE_NFIELDS (ftype))
error (_("Too few arguments in function call."));
for (int i = args.size () - 1; i >= 0; i--) for (int i = args.size () - 1; i >= 0; i--)
{ {
int prototyped; int prototyped;