MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass return_method to _push_dummy_call

Browse Source 
gdb/ChangeLog:

	* aarch64-tdep.c (aarch64_push_dummy_call): Replace arg with
	return_method.
	* alpha-tdep.c (alpha_push_dummy_call): Likewise.
	* amd64-tdep.c (amd64_push_arguments): Likewise.
	(amd64_push_dummy_call): Likewise.
	* amd64-windows-tdep.c (amd64_windows_push_arguments): Likewise.
	* arc-tdep.c (arc_push_dummy_call): Likewise.
	* arm-tdep.c (arm_push_dummy_call): Likewise.
	* avr-tdep.c (avr_push_dummy_call): Likewise.
	* bfin-tdep.c (bfin_push_dummy_call): Likewise.
	* cris-tdep.c (cris_push_dummy_call): Likewise.
	* csky-tdep.c (csky_push_dummy_call): Likewise.
	* frv-tdep.c (frv_push_dummy_call): Likewise.
	* gdbarch.c: Regenerate.
	* gdbarch.h: Regenerate.
	* gdbarch.sh (gdbarch_push_dummy_call): Replace arg with
	return_method.
	* h8300-tdep.c (h8300_push_dummy_call): Likewise.
	* hppa-tdep.c (hppa32_push_dummy_call): Likewise.
	(hppa64_push_dummy_call): Likewise.
	* i386-darwin-tdep.c (i386_darwin_push_dummy_call): Likewise.
	* i386-tdep.c (i386_push_dummy_call): Likewise.
	* ia64-tdep.c (ia64_push_dummy_call): Likewise.
	* infcall.c (call_function_by_hand_dummy): Likewise.
	* iq2000-tdep.c (iq2000_push_dummy_call): Likewise.
	* lm32-tdep.c (lm32_push_dummy_call): Likewise.
	* m32c-tdep.c (m32c_push_dummy_call): Likewise.
	* m32r-tdep.c (m32r_push_dummy_call): Likewise.
	* m68hc11-tdep.c (m68hc11_push_dummy_call): Likewise.
	* m68k-tdep.c (m68k_push_dummy_call): Likewise.
	* mep-tdep.c (mep_push_dummy_call): Likewise.
	* mips-tdep.c (mips_eabi_push_dummy_call): Likewise.
	(mips_n32n64_push_dummy_call): Likewise.
	(mips_o32_push_dummy_call): Likewise.
	(mips_o64_push_dummy_call): Likewise.
	* mn10300-tdep.c (mn10300_push_dummy_call): Likewise.
	* msp430-tdep.c (msp430_push_dummy_call): Likewise.
	* nds32-tdep.c (nds32_push_dummy_call): Likewise.
	* nios2-tdep.c (nios2_push_dummy_call): Likewise.
	* or1k-tdep.c (or1k_push_dummy_call): Likewise.
	* ppc-sysv-tdep.c (ppc_sysv_abi_push_dummy_call): Likewise.
	(ppc64_sysv_abi_push_dummy_call): Likewise.
	* ppc-tdep.h (ppc_sysv_abi_push_dummy_call): Likewise.
	(ppc64_sysv_abi_push_dummy_call): Likewise.
	* riscv-tdep.c (riscv_push_dummy_call): Likewise.
	* rl78-tdep.c (rl78_push_dummy_call): Likewise.
	* rs6000-aix-tdep.c (rs6000_push_dummy_call): Likewise.
	* rs6000-lynx178-tdep.c (rs6000_lynx178_push_dummy_call): Likewise.
	* rx-tdep.c (rx_push_dummy_call): Likewise.
	* s390-tdep.c (s390_push_dummy_call): Likewise.
	* score-tdep.c (score_push_dummy_call): Likewise.
	* sh-tdep.c (sh_push_dummy_call_fpu): Likewise.
	(sh_push_dummy_call_nofpu): Likewise.
	* sparc-tdep.c (sparc32_store_arguments): Likewise.
	(sparc32_push_dummy_call): Likewise.
	* sparc64-tdep.c (sparc64_store_arguments): Likewise.
	(sparc64_push_dummy_call): Likewise.
	* spu-tdep.c (spu_push_dummy_call): Likewise.
	* tic6x-tdep.c (tic6x_push_dummy_call): Likewise.
	* tilegx-tdep.c (tilegx_push_dummy_call): Likewise.
	* v850-tdep.c (v850_push_dummy_call): Likewise.
	* vax-tdep.c (vax_push_dummy_call): Likewise.
	* xstormy16-tdep.c (xstormy16_push_dummy_call): Likewise.
	* xtensa-tdep.c (xtensa_push_dummy_call): Likewise.
This commit is contained in:
Alan Hayward 2018-11-16 11:21:04 +00:00
parent c5ac5cbb5b
commit cf84fa6bcf
53 changed files with 271 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
gdb/ChangeLog
View File

@ -1,3 +1,70 @@
2018-11-16 Alan Hayward <alan.hayward@arm.com>
* aarch64-tdep.c (aarch64_push_dummy_call): Replace arg with
return_method.
* alpha-tdep.c (alpha_push_dummy_call): Likewise.
* amd64-tdep.c (amd64_push_arguments): Likewise.
(amd64_push_dummy_call): Likewise.
* amd64-windows-tdep.c (amd64_windows_push_arguments): Likewise.
* arc-tdep.c (arc_push_dummy_call): Likewise.
* arm-tdep.c (arm_push_dummy_call): Likewise.
* avr-tdep.c (avr_push_dummy_call): Likewise.
* bfin-tdep.c (bfin_push_dummy_call): Likewise.
* cris-tdep.c (cris_push_dummy_call): Likewise.
* csky-tdep.c (csky_push_dummy_call): Likewise.
* frv-tdep.c (frv_push_dummy_call): Likewise.
* gdbarch.c: Regenerate.
* gdbarch.h: Regenerate.
* gdbarch.sh (gdbarch_push_dummy_call): Replace arg with
return_method.
* h8300-tdep.c (h8300_push_dummy_call): Likewise.
* hppa-tdep.c (hppa32_push_dummy_call): Likewise.
(hppa64_push_dummy_call): Likewise.
* i386-darwin-tdep.c (i386_darwin_push_dummy_call): Likewise.
* i386-tdep.c (i386_push_dummy_call): Likewise.
* ia64-tdep.c (ia64_push_dummy_call): Likewise.
* infcall.c (call_function_by_hand_dummy): Likewise.
* iq2000-tdep.c (iq2000_push_dummy_call): Likewise.
* lm32-tdep.c (lm32_push_dummy_call): Likewise.
* m32c-tdep.c (m32c_push_dummy_call): Likewise.
* m32r-tdep.c (m32r_push_dummy_call): Likewise.
* m68hc11-tdep.c (m68hc11_push_dummy_call): Likewise.
* m68k-tdep.c (m68k_push_dummy_call): Likewise.
* mep-tdep.c (mep_push_dummy_call): Likewise.
* mips-tdep.c (mips_eabi_push_dummy_call): Likewise.
(mips_n32n64_push_dummy_call): Likewise.
(mips_o32_push_dummy_call): Likewise.
(mips_o64_push_dummy_call): Likewise.
* mn10300-tdep.c (mn10300_push_dummy_call): Likewise.
* msp430-tdep.c (msp430_push_dummy_call): Likewise.
* nds32-tdep.c (nds32_push_dummy_call): Likewise.
* nios2-tdep.c (nios2_push_dummy_call): Likewise.
* or1k-tdep.c (or1k_push_dummy_call): Likewise.
* ppc-sysv-tdep.c (ppc_sysv_abi_push_dummy_call): Likewise.
(ppc64_sysv_abi_push_dummy_call): Likewise.
* ppc-tdep.h (ppc_sysv_abi_push_dummy_call): Likewise.
(ppc64_sysv_abi_push_dummy_call): Likewise.
* riscv-tdep.c (riscv_push_dummy_call): Likewise.
* rl78-tdep.c (rl78_push_dummy_call): Likewise.
* rs6000-aix-tdep.c (rs6000_push_dummy_call): Likewise.
* rs6000-lynx178-tdep.c (rs6000_lynx178_push_dummy_call): Likewise.
* rx-tdep.c (rx_push_dummy_call): Likewise.
* s390-tdep.c (s390_push_dummy_call): Likewise.
* score-tdep.c (score_push_dummy_call): Likewise.
* sh-tdep.c (sh_push_dummy_call_fpu): Likewise.
(sh_push_dummy_call_nofpu): Likewise.
* sparc-tdep.c (sparc32_store_arguments): Likewise.
(sparc32_push_dummy_call): Likewise.
* sparc64-tdep.c (sparc64_store_arguments): Likewise.
(sparc64_push_dummy_call): Likewise.
* spu-tdep.c (spu_push_dummy_call): Likewise.
* tic6x-tdep.c (tic6x_push_dummy_call): Likewise.
* tilegx-tdep.c (tilegx_push_dummy_call): Likewise.
* v850-tdep.c (v850_push_dummy_call): Likewise.
* vax-tdep.c (vax_push_dummy_call): Likewise.
* xstormy16-tdep.c (xstormy16_push_dummy_call): Likewise.
* xtensa-tdep.c (xtensa_push_dummy_call): Likewise.
2018-11-16 Alan Hayward <alan.hayward@arm.com> 2018-11-16 Alan Hayward <alan.hayward@arm.com>
* gdbarch.sh (enum function_call_return_method): Add enum. * gdbarch.sh (enum function_call_return_method): Add enum.

5
gdb/aarch64-tdep.c
View File

@ -1514,7 +1514,8 @@ static CORE_ADDR
aarch64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, aarch64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, int nargs,
struct value **args, CORE_ADDR sp, int struct_return, struct value **args, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
int argnum; int argnum;
@ -1578,7 +1579,7 @@ aarch64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
} }
/* The struct_return pointer occupies X8. */ /* The struct_return pointer occupies X8. */
if (struct_return || lang_struct_return) if (return_method == return_method_struct || lang_struct_return)
{ {
if (aarch64_debug) if (aarch64_debug)
{ {

7
gdb/alpha-tdep.c
View File

@ -295,11 +295,12 @@ static CORE_ADDR
alpha_push_dummy_call (struct gdbarch *gdbarch, struct value *function, alpha_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int i; int i;
int accumulate_size = struct_return ? 8 : 0; int accumulate_size = (return_method == return_method_struct) ? 8 : 0;
struct alpha_arg struct alpha_arg
{ {
const gdb_byte *contents; const gdb_byte *contents;
@ -446,7 +447,7 @@ alpha_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* Everything else goes to the stack. */ /* Everything else goes to the stack. */
write_memory (sp + offset - sizeof(arg_reg_buffer), contents, len); write_memory (sp + offset - sizeof(arg_reg_buffer), contents, len);
} }
if (struct_return) if (return_method == return_method_struct)
store_unsigned_integer (arg_reg_buffer, ALPHA_REGISTER_SIZE, store_unsigned_integer (arg_reg_buffer, ALPHA_REGISTER_SIZE,
byte_order, struct_addr); byte_order, struct_addr);

13
gdb/amd64-tdep.c
View File

@ -861,8 +861,8 @@ amd64_return_value (struct gdbarch *gdbarch, struct value *function,
static CORE_ADDR static CORE_ADDR
amd64_push_arguments (struct regcache *regcache, int nargs, amd64_push_arguments (struct regcache *regcache, int nargs, struct value **args,
struct value **args, CORE_ADDR sp, int struct_return) CORE_ADDR sp, function_call_return_method return_method)
{ {
static int integer_regnum[] = static int integer_regnum[] =
{ {
@ -890,7 +890,7 @@ amd64_push_arguments (struct regcache *regcache, int nargs,
int i; int i;
/* Reserve a register for the "hidden" argument. */ /* Reserve a register for the "hidden" argument. */
if (struct_return) if (return_method == return_method_struct)
integer_reg++; integer_reg++;
for (i = 0; i < nargs; i++) for (i = 0; i < nargs; i++)
@ -996,7 +996,8 @@ static CORE_ADDR
amd64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, amd64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
gdb_byte buf[8]; gdb_byte buf[8];
@ -1009,10 +1010,10 @@ amd64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
i387_reset_bnd_regs (gdbarch, regcache); i387_reset_bnd_regs (gdbarch, regcache);
/* Pass arguments. */ /* Pass arguments. */
sp = amd64_push_arguments (regcache, nargs, args, sp, struct_return); sp = amd64_push_arguments (regcache, nargs, args, sp, return_method);
/* Pass "hidden" argument". */ /* Pass "hidden" argument". */
if (struct_return) if (return_method == return_method_struct)
{ {
store_unsigned_integer (buf, 8, byte_order, struct_addr); store_unsigned_integer (buf, 8, byte_order, struct_addr);
regcache->cooked_write (AMD64_RDI_REGNUM, buf); regcache->cooked_write (AMD64_RDI_REGNUM, buf);

12
gdb/amd64-windows-tdep.c
View File

@ -157,7 +157,7 @@ amd64_windows_store_arg_in_reg (struct regcache *regcache,
static CORE_ADDR static CORE_ADDR
amd64_windows_push_arguments (struct regcache *regcache, int nargs, amd64_windows_push_arguments (struct regcache *regcache, int nargs,
struct value **args, CORE_ADDR sp, struct value **args, CORE_ADDR sp,
int struct_return) function_call_return_method return_method)
{ {
int reg_idx = 0; int reg_idx = 0;
int i; int i;
@ -180,7 +180,7 @@ amd64_windows_push_arguments (struct regcache *regcache, int nargs,
} }
/* Reserve a register for the "hidden" argument. */ /* Reserve a register for the "hidden" argument. */
if (struct_return) if (return_method == return_method_struct)
reg_idx++; reg_idx++;
for (i = 0; i < nargs; i++) for (i = 0; i < nargs; i++)
@ -244,18 +244,18 @@ static CORE_ADDR
amd64_windows_push_dummy_call amd64_windows_push_dummy_call
(struct gdbarch *gdbarch, struct value *function, (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, int nargs, struct value **args, CORE_ADDR sp,
CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method, CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
gdb_byte buf[8]; gdb_byte buf[8];
/* Pass arguments. */ /* Pass arguments. */
sp = amd64_windows_push_arguments (regcache, nargs, args, sp, sp = amd64_windows_push_arguments (regcache, nargs, args, sp,
struct_return); return_method);
/* Pass "hidden" argument". */ /* Pass "hidden" argument". */
if (struct_return) if (return_method == return_method_struct)
{ {
/* The "hidden" argument is passed throught the first argument /* The "hidden" argument is passed throught the first argument
register. */ register. */

5
gdb/arc-tdep.c
View File

@ -592,7 +592,8 @@ arc_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)
static CORE_ADDR static CORE_ADDR
arc_push_dummy_call (struct gdbarch *gdbarch, struct value *function, arc_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
struct value **args, CORE_ADDR sp, int struct_return, struct value **args, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
if (arc_debug) if (arc_debug)
@ -607,7 +608,7 @@ arc_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
value return? If so, struct_addr is the address of the reserved space for value return? If so, struct_addr is the address of the reserved space for
the return structure to be written on the stack, and that address is the return structure to be written on the stack, and that address is
passed to that function as a hidden first argument. */ passed to that function as a hidden first argument. */
if (struct_return) if (return_method == return_method_struct)
{ {
/* Pass the return address in the first argument register. */ /* Pass the return address in the first argument register. */
regcache_cooked_write_unsigned (regcache, arg_reg, struct_addr); regcache_cooked_write_unsigned (regcache, arg_reg, struct_addr);

5
gdb/arm-tdep.c
View File

@ -3683,7 +3683,8 @@ arm_vfp_abi_for_function (struct gdbarch *gdbarch, struct type *func_type)
static CORE_ADDR static CORE_ADDR
arm_push_dummy_call (struct gdbarch *gdbarch, struct value *function, arm_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
struct value **args, CORE_ADDR sp, int struct_return, struct value **args, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -3718,7 +3719,7 @@ arm_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* The struct_return pointer occupies the first parameter /* The struct_return pointer occupies the first parameter
passing register. */ passing register. */
if (struct_return) if (return_method == return_method_struct)
{ {
if (arm_debug) if (arm_debug)
fprintf_unfiltered (gdb_stdlog, "struct return in %s = %s\n", fprintf_unfiltered (gdb_stdlog, "struct return in %s = %s\n",

5
gdb/avr-tdep.c
View File

@ -1263,7 +1263,8 @@ static CORE_ADDR
avr_push_dummy_call (struct gdbarch *gdbarch, struct value *function, avr_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
int i; int i;
gdb_byte buf[3]; gdb_byte buf[3];
@ -1272,7 +1273,7 @@ avr_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
int regnum = AVR_ARGN_REGNUM; int regnum = AVR_ARGN_REGNUM;
struct stack_item *si = NULL; struct stack_item *si = NULL;
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_cooked_write_unsigned regcache_cooked_write_unsigned
(regcache, regnum--, (struct_addr >> 8) & 0xff); (regcache, regnum--, (struct_addr >> 8) & 0xff);

4
gdb/bfin-tdep.c
View File

@ -498,7 +498,7 @@ bfin_push_dummy_call (struct gdbarch *gdbarch,
int nargs, int nargs,
struct value **args, struct value **args,
CORE_ADDR sp, CORE_ADDR sp,
int struct_return, function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -543,7 +543,7 @@ bfin_push_dummy_call (struct gdbarch *gdbarch,
/* Store struct value address. */ /* Store struct value address. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, BFIN_P0_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, BFIN_P0_REGNUM, struct_addr);
/* Set the dummy return value to bp_addr. /* Set the dummy return value to bp_addr.

7
gdb/cris-tdep.c
View File

@ -808,7 +808,8 @@ static CORE_ADDR
cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function, cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int argreg; int argreg;
@ -822,10 +823,8 @@ cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* Are we returning a value using a structure return or a normal value /* Are we returning a value using a structure return or a normal value
return? struct_addr is the address of the reserved space for the return return? struct_addr is the address of the reserved space for the return
structure to be written on the stack. */ structure to be written on the stack. */
if (struct_return) if (return_method == return_method_struct)
{
regcache_cooked_write_unsigned (regcache, STR_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, STR_REGNUM, struct_addr);
}
/* Now load as many as possible of the first arguments into registers, /* Now load as many as possible of the first arguments into registers,
and push the rest onto the stack. */ and push the rest onto the stack. */

5
gdb/csky-tdep.c
View File

@ -336,7 +336,8 @@ static CORE_ADDR
csky_push_dummy_call (struct gdbarch *gdbarch, struct value *function, csky_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
int argnum; int argnum;
int argreg = CSKY_ABI_A0_REGNUM; int argreg = CSKY_ABI_A0_REGNUM;
@ -351,7 +352,7 @@ csky_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* The struct_return pointer occupies the first parameter /* The struct_return pointer occupies the first parameter
passing register. */ passing register. */
if (struct_return) if (return_method == return_method_struct)
{ {
if (csky_debug) if (csky_debug)
{ {

5
gdb/frv-tdep.c
View File

@ -1193,7 +1193,8 @@ static CORE_ADDR
frv_push_dummy_call (struct gdbarch *gdbarch, struct value *function, frv_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int argreg; int argreg;
@ -1230,7 +1231,7 @@ frv_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
argreg = 8; argreg = 8;
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, struct_return_regnum, regcache_cooked_write_unsigned (regcache, struct_return_regnum,
struct_addr); struct_addr);

4
gdb/gdbarch.c
View File

@ -2356,13 +2356,13 @@ gdbarch_push_dummy_call_p (struct gdbarch *gdbarch)
} }
CORE_ADDR CORE_ADDR
gdbarch_push_dummy_call (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr) gdbarch_push_dummy_call (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, function_call_return_method return_method, CORE_ADDR struct_addr)
{ {
gdb_assert (gdbarch != NULL); gdb_assert (gdbarch != NULL);
gdb_assert (gdbarch->push_dummy_call != NULL); gdb_assert (gdbarch->push_dummy_call != NULL);
if (gdbarch_debug >= 2) if (gdbarch_debug >= 2)
fprintf_unfiltered (gdb_stdlog, "gdbarch_push_dummy_call called\n"); fprintf_unfiltered (gdb_stdlog, "gdbarch_push_dummy_call called\n");
return gdbarch->push_dummy_call (gdbarch, function, regcache, bp_addr, nargs, args, sp, struct_return, struct_addr); return gdbarch->push_dummy_call (gdbarch, function, regcache, bp_addr, nargs, args, sp, return_method, struct_addr);
} }
void void

4
gdb/gdbarch.h
View File

@ -417,8 +417,8 @@ extern void set_gdbarch_deprecated_fp_regnum (struct gdbarch *gdbarch, int depre
extern int gdbarch_push_dummy_call_p (struct gdbarch *gdbarch); extern int gdbarch_push_dummy_call_p (struct gdbarch *gdbarch);
typedef CORE_ADDR (gdbarch_push_dummy_call_ftype) (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr); typedef CORE_ADDR (gdbarch_push_dummy_call_ftype) (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, function_call_return_method return_method, CORE_ADDR struct_addr);
extern CORE_ADDR gdbarch_push_dummy_call (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr); extern CORE_ADDR gdbarch_push_dummy_call (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, function_call_return_method return_method, CORE_ADDR struct_addr);
extern void set_gdbarch_push_dummy_call (struct gdbarch *gdbarch, gdbarch_push_dummy_call_ftype *push_dummy_call); extern void set_gdbarch_push_dummy_call (struct gdbarch *gdbarch, gdbarch_push_dummy_call_ftype *push_dummy_call);
extern int gdbarch_call_dummy_location (struct gdbarch *gdbarch); extern int gdbarch_call_dummy_location (struct gdbarch *gdbarch);

2
gdb/gdbarch.sh
View File

@ -485,7 +485,7 @@ M;struct frame_id;dummy_id;struct frame_info *this_frame;this_frame
# deprecated_fp_regnum. # deprecated_fp_regnum.
v;int;deprecated_fp_regnum;;;-1;-1;;0 v;int;deprecated_fp_regnum;;;-1;-1;;0
M;CORE_ADDR;push_dummy_call;struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr;function, regcache, bp_addr, nargs, args, sp, struct_return, struct_addr M;CORE_ADDR;push_dummy_call;struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, function_call_return_method return_method, CORE_ADDR struct_addr;function, regcache, bp_addr, nargs, args, sp, return_method, struct_addr
v;int;call_dummy_location;;;;AT_ENTRY_POINT;;0 v;int;call_dummy_location;;;;AT_ENTRY_POINT;;0
M;CORE_ADDR;push_dummy_code;CORE_ADDR sp, CORE_ADDR funaddr, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr, struct regcache *regcache;sp, funaddr, args, nargs, value_type, real_pc, bp_addr, regcache M;CORE_ADDR;push_dummy_code;CORE_ADDR sp, CORE_ADDR funaddr, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr, struct regcache *regcache;sp, funaddr, args, nargs, value_type, real_pc, bp_addr, regcache

5
gdb/h8300-tdep.c
View File

@ -634,7 +634,8 @@ static CORE_ADDR
h8300_push_dummy_call (struct gdbarch *gdbarch, struct value *function, h8300_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int stack_alloc = 0, stack_offset = 0; int stack_alloc = 0, stack_offset = 0;
@ -657,7 +658,7 @@ h8300_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
If we're returning a structure by value, then we must pass a If we're returning a structure by value, then we must pass a
pointer to the buffer for the return value as an invisible first pointer to the buffer for the return value as an invisible first
argument. */ argument. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, reg++, struct_addr); regcache_cooked_write_unsigned (regcache, reg++, struct_addr);
for (argument = 0; argument < nargs; argument++) for (argument = 0; argument < nargs; argument++)

10
gdb/hppa-tdep.c
View File

@ -714,7 +714,8 @@ static CORE_ADDR
hppa32_push_dummy_call (struct gdbarch *gdbarch, struct value *function, hppa32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -849,7 +850,7 @@ hppa32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* If a structure has to be returned, set up register 28 to hold its /* If a structure has to be returned, set up register 28 to hold its
address. */ address. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, 28, struct_addr); regcache_cooked_write_unsigned (regcache, 28, struct_addr);
gp = tdep->find_global_pointer (gdbarch, function); gp = tdep->find_global_pointer (gdbarch, function);
@ -969,7 +970,8 @@ static CORE_ADDR
hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -1113,7 +1115,7 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* If a structure has to be returned, set up GR 28 (%ret0) to hold /* If a structure has to be returned, set up GR 28 (%ret0) to hold
its address. */ its address. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, HPPA_RET0_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, HPPA_RET0_REGNUM, struct_addr);
/* Set up GR27 (%dp) to hold the global pointer (gp). */ /* Set up GR27 (%dp) to hold the global pointer (gp). */

5
gdb/i386-darwin-tdep.c
View File

@ -153,7 +153,8 @@ static CORE_ADDR
i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function, i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -169,7 +170,7 @@ i386_darwin_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
int args_space = 0; int args_space = 0;
int num_m128 = 0; int num_m128 = 0;
if (struct_return) if (return_method == return_method_struct)
{ {
if (write_pass) if (write_pass)
{ {

5
gdb/i386-tdep.c
View File

@ -2671,7 +2671,8 @@ i386_push_dummy_code (struct gdbarch *gdbarch, CORE_ADDR sp, CORE_ADDR funaddr,
static CORE_ADDR static CORE_ADDR
i386_push_dummy_call (struct gdbarch *gdbarch, struct value *function, i386_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
struct value **args, CORE_ADDR sp, int struct_return, struct value **args, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -2695,7 +2696,7 @@ i386_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
{ {
int args_space_used = 0; int args_space_used = 0;
if (struct_return) if (return_method == return_method_struct)
{ {
if (write_pass) if (write_pass)
{ {

7
gdb/ia64-tdep.c
View File

@ -3673,7 +3673,8 @@ static CORE_ADDR
ia64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, ia64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -3828,11 +3829,9 @@ ia64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
} }
/* Store the struct return value in r8 if necessary. */ /* Store the struct return value in r8 if necessary. */
if (struct_return) if (return_method == return_method_struct)
{
regcache_cooked_write_unsigned (regcache, IA64_GR8_REGNUM, regcache_cooked_write_unsigned (regcache, IA64_GR8_REGNUM,
(ULONGEST) struct_addr); (ULONGEST) struct_addr);
}
global_pointer = ia64_find_global_pointer (gdbarch, func_addr); global_pointer = ia64_find_global_pointer (gdbarch, func_addr);

3
gdb/infcall.c
View File

@ -1052,8 +1052,7 @@ call_function_by_hand_dummy (struct value *function,
presumably, the ABI code knows where, in the call dummy, the presumably, the ABI code knows where, in the call dummy, the
return address should be pointed. */ return address should be pointed. */
sp = gdbarch_push_dummy_call (gdbarch, function, get_current_regcache (), sp = gdbarch_push_dummy_call (gdbarch, function, get_current_regcache (),
bp_addr, nargs, args, sp, bp_addr, nargs, args, sp, return_method,
(return_method == return_method_struct),
struct_addr); struct_addr);
/* Set up a frame ID for the dummy frame so we can pass it to /* Set up a frame ID for the dummy frame so we can pass it to

9
gdb/iq2000-tdep.c
View File

@ -645,7 +645,8 @@ static CORE_ADDR
iq2000_push_dummy_call (struct gdbarch *gdbarch, struct value *function, iq2000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
const bfd_byte *val; const bfd_byte *val;
@ -657,7 +658,9 @@ iq2000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
CORE_ADDR struct_ptr; CORE_ADDR struct_ptr;
/* First determine how much stack space we will need. */ /* First determine how much stack space we will need. */
for (i = 0, argreg = E_1ST_ARGREG + (struct_return != 0); i < nargs; i++) for (i = 0, argreg = E_1ST_ARGREG + (return_method == return_method_struct);
i < nargs;
i++)
{ {
type = value_type (args[i]); type = value_type (args[i]);
typelen = TYPE_LENGTH (type); typelen = TYPE_LENGTH (type);
@ -716,7 +719,7 @@ iq2000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
stackspace = 0; stackspace = 0;
argreg = E_1ST_ARGREG; argreg = E_1ST_ARGREG;
if (struct_return) if (return_method == return_method_struct)
{ {
/* A function that returns a struct will consume one argreg to do so. /* A function that returns a struct will consume one argreg to do so.
*/ */

5
gdb/lm32-tdep.c
View File

@ -228,7 +228,8 @@ static CORE_ADDR
lm32_push_dummy_call (struct gdbarch *gdbarch, struct value *function, lm32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int first_arg_reg = SIM_LM32_R1_REGNUM; int first_arg_reg = SIM_LM32_R1_REGNUM;
@ -240,7 +241,7 @@ lm32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* If we're returning a large struct, a pointer to the address to /* If we're returning a large struct, a pointer to the address to
store it at is passed as a first hidden parameter. */ store it at is passed as a first hidden parameter. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_cooked_write_unsigned (regcache, first_arg_reg, struct_addr); regcache_cooked_write_unsigned (regcache, first_arg_reg, struct_addr);
first_arg_reg++; first_arg_reg++;

5
gdb/m32c-tdep.c
View File

@ -2016,7 +2016,8 @@ m32c_reg_arg_type (struct type *type)
static CORE_ADDR static CORE_ADDR
m32c_push_dummy_call (struct gdbarch *gdbarch, struct value *function, m32c_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
struct value **args, CORE_ADDR sp, int struct_return, struct value **args, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
@ -2054,7 +2055,7 @@ m32c_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* First, if the function returns an aggregate by value, push a /* First, if the function returns an aggregate by value, push a
pointer to a buffer for it. This doesn't affect the way pointer to a buffer for it. This doesn't affect the way
subsequent arguments are allocated to registers. */ subsequent arguments are allocated to registers. */
if (struct_return) if (return_method == return_method_struct)
{ {
int ptr_len = TYPE_LENGTH (tdep->ptr_voyd); int ptr_len = TYPE_LENGTH (tdep->ptr_voyd);
sp -= ptr_len; sp -= ptr_len;

5
gdb/m32r-tdep.c
View File

@ -659,7 +659,8 @@ m32r_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame)
static CORE_ADDR static CORE_ADDR
m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function, m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
struct value **args, CORE_ADDR sp, int struct_return, struct value **args, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -683,7 +684,7 @@ m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* If STRUCT_RETURN is true, then the struct return address (in /* If STRUCT_RETURN is true, then the struct return address (in
STRUCT_ADDR) will consume the first argument-passing register. STRUCT_ADDR) will consume the first argument-passing register.
Both adjust the register count and store that value. */ Both adjust the register count and store that value. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_cooked_write_unsigned (regcache, argreg, struct_addr); regcache_cooked_write_unsigned (regcache, argreg, struct_addr);
argreg++; argreg++;

7
gdb/m68hc11-tdep.c
View File

@ -1154,7 +1154,8 @@ static CORE_ADDR
m68hc11_push_dummy_call (struct gdbarch *gdbarch, struct value *function, m68hc11_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int argnum; int argnum;
@ -1164,10 +1165,8 @@ m68hc11_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
gdb_byte buf[2]; gdb_byte buf[2];
first_stack_argnum = 0; first_stack_argnum = 0;
if (struct_return) if (return_method == return_method_struct)
{
regcache_cooked_write_unsigned (regcache, HARD_D_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, HARD_D_REGNUM, struct_addr);
}
else if (nargs > 0) else if (nargs > 0)
{ {
type = value_type (args[0]); type = value_type (args[0]);

5
gdb/m68k-tdep.c
View File

@ -492,7 +492,8 @@ m68k_frame_align (struct gdbarch *gdbarch, CORE_ADDR sp)
static CORE_ADDR static CORE_ADDR
m68k_push_dummy_call (struct gdbarch *gdbarch, struct value *function, m68k_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
struct value **args, CORE_ADDR sp, int struct_return, struct value **args, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
@ -522,7 +523,7 @@ m68k_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
} }
/* Store struct value address. */ /* Store struct value address. */
if (struct_return) if (return_method == return_method_struct)
{ {
store_unsigned_integer (buf, 4, byte_order, struct_addr); store_unsigned_integer (buf, 4, byte_order, struct_addr);
regcache->cooked_write (tdep->struct_value_regnum, buf); regcache->cooked_write (tdep->struct_value_regnum, buf);

4
gdb/mep-tdep.c
View File

@ -2258,7 +2258,7 @@ static CORE_ADDR
mep_push_dummy_call (struct gdbarch *gdbarch, struct value *function, mep_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int argc, struct value **argv, CORE_ADDR sp, int argc, struct value **argv, CORE_ADDR sp,
int struct_return, function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -2287,7 +2287,7 @@ mep_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* If we're returning a structure by value, push the pointer to the /* If we're returning a structure by value, push the pointer to the
buffer as the first argument. */ buffer as the first argument. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_cooked_write_unsigned (regcache, arg_reg, struct_addr); regcache_cooked_write_unsigned (regcache, arg_reg, struct_addr);
arg_reg++; arg_reg++;

19
gdb/mips-tdep.c
View File

@ -4495,7 +4495,8 @@ static CORE_ADDR
mips_eabi_push_dummy_call (struct gdbarch *gdbarch, struct value *function, mips_eabi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
int argreg; int argreg;
int float_argreg; int float_argreg;
@ -4541,7 +4542,7 @@ mips_eabi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
float_argreg = mips_fpa0_regnum (gdbarch); float_argreg = mips_fpa0_regnum (gdbarch);
/* The struct_return pointer occupies the first parameter-passing reg. */ /* The struct_return pointer occupies the first parameter-passing reg. */
if (struct_return) if (return_method == return_method_struct)
{ {
if (mips_debug) if (mips_debug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
@ -4890,7 +4891,8 @@ static CORE_ADDR
mips_n32n64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, mips_n32n64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
int argreg; int argreg;
int float_argreg; int float_argreg;
@ -4933,7 +4935,7 @@ mips_n32n64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
float_argreg = mips_fpa0_regnum (gdbarch); float_argreg = mips_fpa0_regnum (gdbarch);
/* The struct_return pointer occupies the first parameter-passing reg. */ /* The struct_return pointer occupies the first parameter-passing reg. */
if (struct_return) if (return_method == return_method_struct)
{ {
if (mips_debug) if (mips_debug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
@ -5347,7 +5349,8 @@ static CORE_ADDR
mips_o32_push_dummy_call (struct gdbarch *gdbarch, struct value *function, mips_o32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
int argreg; int argreg;
int float_argreg; int float_argreg;
@ -5398,7 +5401,7 @@ mips_o32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
float_argreg = mips_fpa0_regnum (gdbarch); float_argreg = mips_fpa0_regnum (gdbarch);
/* The struct_return pointer occupies the first parameter-passing reg. */ /* The struct_return pointer occupies the first parameter-passing reg. */
if (struct_return) if (return_method == return_method_struct)
{ {
if (mips_debug) if (mips_debug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
@ -5872,7 +5875,7 @@ mips_o64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, int nargs,
struct value **args, CORE_ADDR sp, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method, CORE_ADDR struct_addr)
{ {
int argreg; int argreg;
int float_argreg; int float_argreg;
@ -5920,7 +5923,7 @@ mips_o64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
float_argreg = mips_fpa0_regnum (gdbarch); float_argreg = mips_fpa0_regnum (gdbarch);
/* The struct_return pointer occupies the first parameter-passing reg. */ /* The struct_return pointer occupies the first parameter-passing reg. */
if (struct_return) if (return_method == return_method_struct)
{ {
if (mips_debug) if (mips_debug)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,

6
gdb/mn10300-tdep.c
View File

@ -1191,7 +1191,7 @@ mn10300_push_dummy_call (struct gdbarch *gdbarch,
CORE_ADDR bp_addr, CORE_ADDR bp_addr,
int nargs, struct value **args, int nargs, struct value **args,
CORE_ADDR sp, CORE_ADDR sp,
int struct_return, function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -1211,7 +1211,7 @@ mn10300_push_dummy_call (struct gdbarch *gdbarch,
XXX This doesn't appear to handle pass-by-invisible reference XXX This doesn't appear to handle pass-by-invisible reference
arguments. */ arguments. */
regs_used = struct_return ? 1 : 0; regs_used = (return_method == return_method_struct) ? 1 : 0;
for (len = 0, argnum = 0; argnum < nargs; argnum++) for (len = 0, argnum = 0; argnum < nargs; argnum++)
{ {
arg_len = (TYPE_LENGTH (value_type (args[argnum])) + 3) & ~3; arg_len = (TYPE_LENGTH (value_type (args[argnum])) + 3) & ~3;
@ -1226,7 +1226,7 @@ mn10300_push_dummy_call (struct gdbarch *gdbarch,
/* Allocate stack space. */ /* Allocate stack space. */
sp -= len; sp -= len;
if (struct_return) if (return_method == return_method_struct)
{ {
regs_used = 1; regs_used = 1;
regcache_cooked_write_unsigned (regcache, E_D0_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, E_D0_REGNUM, struct_addr);

5
gdb/msp430-tdep.c
View File

@ -669,7 +669,8 @@ static CORE_ADDR
msp430_push_dummy_call (struct gdbarch *gdbarch, struct value *function, msp430_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int write_pass; int write_pass;
@ -699,7 +700,7 @@ msp430_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
sp = align_down (sp - sp_off, 4); sp = align_down (sp - sp_off, 4);
sp_off = 0; sp_off = 0;
if (struct_return) if (return_method == return_method_struct)
{ {
if (write_pass) if (write_pass)
regcache_cooked_write_unsigned (regcache, arg_reg, struct_addr); regcache_cooked_write_unsigned (regcache, arg_reg, struct_addr);

5
gdb/nds32-tdep.c
View File

@ -1490,7 +1490,8 @@ static CORE_ADDR
nds32_push_dummy_call (struct gdbarch *gdbarch, struct value *function, nds32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
const int REND = 6; /* End for register offset. */ const int REND = 6; /* End for register offset. */
int goff = 0; /* Current gpr offset for argument. */ int goff = 0; /* Current gpr offset for argument. */
@ -1511,7 +1512,7 @@ nds32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* If STRUCT_RETURN is true, then the struct return address (in /* If STRUCT_RETURN is true, then the struct return address (in
STRUCT_ADDR) will consume the first argument-passing register. STRUCT_ADDR) will consume the first argument-passing register.
Both adjust the register count and store that value. */ Both adjust the register count and store that value. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_cooked_write_unsigned (regcache, NDS32_R0_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, NDS32_R0_REGNUM, struct_addr);
goff++; goff++;

5
gdb/nios2-tdep.c
View File

@ -1811,7 +1811,8 @@ static CORE_ADDR
nios2_push_dummy_call (struct gdbarch *gdbarch, struct value *function, nios2_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
int argreg; int argreg;
int argnum; int argnum;
@ -1833,7 +1834,7 @@ nios2_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* The struct_return pointer occupies the first parameter-passing /* The struct_return pointer occupies the first parameter-passing
register. */ register. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, argreg++, struct_addr); regcache_cooked_write_unsigned (regcache, argreg++, struct_addr);
/* Now load as many as possible of the first arguments into /* Now load as many as possible of the first arguments into

5
gdb/or1k-tdep.c
View File

@ -595,7 +595,8 @@ static CORE_ADDR
or1k_push_dummy_call (struct gdbarch *gdbarch, struct value *function, or1k_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
int argreg; int argreg;
@ -617,7 +618,7 @@ or1k_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* Location for a returned structure. This is passed as a silent first /* Location for a returned structure. This is passed as a silent first
argument. */ argument. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_cooked_write_unsigned (regcache, OR1K_FIRST_ARG_REGNUM, regcache_cooked_write_unsigned (regcache, OR1K_FIRST_ARG_REGNUM,
struct_addr); struct_addr);

10
gdb/ppc-sysv-tdep.c
View File

@ -62,7 +62,8 @@ CORE_ADDR
ppc_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, struct value *function, ppc_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -107,7 +108,7 @@ ppc_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
(which will be passed in r3) is used for struct return (which will be passed in r3) is used for struct return
address. In that case we should advance one word and start address. In that case we should advance one word and start
from r4 register to copy parameters. */ from r4 register to copy parameters. */
if (struct_return) if (return_method == return_method_struct)
{ {
if (write_pass) if (write_pass)
regcache_cooked_write_signed (regcache, regcache_cooked_write_signed (regcache,
@ -1540,7 +1541,8 @@ ppc64_sysv_abi_push_dummy_call (struct gdbarch *gdbarch,
struct value *function, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
CORE_ADDR func_addr = find_function_addr (function, NULL); CORE_ADDR func_addr = find_function_addr (function, NULL);
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
@ -1624,7 +1626,7 @@ ppc64_sysv_abi_push_dummy_call (struct gdbarch *gdbarch,
containing the address of that struct.. In that case we containing the address of that struct.. In that case we
should advance one word and start from r4 register to copy should advance one word and start from r4 register to copy
parameters. This also consumes one on-stack parameter slot. */ parameters. This also consumes one on-stack parameter slot. */
if (struct_return) if (return_method == return_method_struct)
ppc64_sysv_abi_push_integer (gdbarch, struct_addr, &argpos); ppc64_sysv_abi_push_integer (gdbarch, struct_addr, &argpos);
for (argno = 0; argno < nargs; argno++) for (argno = 0; argno < nargs; argno++)

25
gdb/ppc-tdep.h
View File

@ -39,20 +39,17 @@ enum return_value_convention ppc_sysv_abi_broken_return_value (struct gdbarch *g
struct regcache *regcache, struct regcache *regcache,
gdb_byte *readbuf, gdb_byte *readbuf,
const gdb_byte *writebuf); const gdb_byte *writebuf);
CORE_ADDR ppc_sysv_abi_push_dummy_call (struct gdbarch *gdbarch,
struct value *function, CORE_ADDR ppc_sysv_abi_push_dummy_call
struct regcache *regcache, (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache,
CORE_ADDR bp_addr, int nargs, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp,
struct value **args, CORE_ADDR sp, function_call_return_method return_method, CORE_ADDR struct_addr);
int struct_return,
CORE_ADDR struct_addr); CORE_ADDR ppc64_sysv_abi_push_dummy_call
CORE_ADDR ppc64_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache,
struct value *function, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp,
struct regcache *regcache, function_call_return_method return_method, CORE_ADDR struct_addr);
CORE_ADDR bp_addr, int nargs,
struct value **args, CORE_ADDR sp,
int struct_return,
CORE_ADDR struct_addr);
enum return_value_convention ppc64_sysv_abi_return_value (struct gdbarch *gdbarch, enum return_value_convention ppc64_sysv_abi_return_value (struct gdbarch *gdbarch,
struct value *function, struct value *function,
struct type *valtype, struct type *valtype,

8
gdb/riscv-tdep.c
View File

@ -2374,7 +2374,7 @@ riscv_push_dummy_call (struct gdbarch *gdbarch,
int nargs, int nargs,
struct value **args, struct value **args,
CORE_ADDR sp, CORE_ADDR sp,
int struct_return, function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
int i; int i;
@ -2394,7 +2394,7 @@ riscv_push_dummy_call (struct gdbarch *gdbarch,
ftype = check_typedef (TYPE_TARGET_TYPE (ftype)); ftype = check_typedef (TYPE_TARGET_TYPE (ftype));
/* We'll use register $a0 if we're returning a struct. */ /* We'll use register $a0 if we're returning a struct. */
if (struct_return) if (return_method == return_method_struct)
++call_info.int_regs.next_regnum; ++call_info.int_regs.next_regnum;
for (i = 0; i < nargs; ++i) for (i = 0; i < nargs; ++i)
@ -2425,7 +2425,7 @@ riscv_push_dummy_call (struct gdbarch *gdbarch,
(riscv_has_fp_abi (gdbarch) ? "is" : "is not")); (riscv_has_fp_abi (gdbarch) ? "is" : "is not"));
fprintf_unfiltered (gdb_stdlog, ": xlen: %d\n: flen: %d\n", fprintf_unfiltered (gdb_stdlog, ": xlen: %d\n: flen: %d\n",
call_info.xlen, call_info.flen); call_info.xlen, call_info.flen);
if (struct_return) if (return_method == return_method_struct)
fprintf_unfiltered (gdb_stdlog, fprintf_unfiltered (gdb_stdlog,
"[*] struct return pointer in register $A0\n"); "[*] struct return pointer in register $A0\n");
for (i = 0; i < nargs; ++i) for (i = 0; i < nargs; ++i)
@ -2452,7 +2452,7 @@ riscv_push_dummy_call (struct gdbarch *gdbarch,
/* Now load the argument into registers, or onto the stack. */ /* Now load the argument into registers, or onto the stack. */
if (struct_return) if (return_method == return_method_struct)
{ {
gdb_byte buf[sizeof (LONGEST)]; gdb_byte buf[sizeof (LONGEST)];

5
gdb/rl78-tdep.c
View File

@ -1336,7 +1336,8 @@ static CORE_ADDR
rl78_push_dummy_call (struct gdbarch *gdbarch, struct value *function, rl78_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
gdb_byte buf[4]; gdb_byte buf[4];
@ -1355,7 +1356,7 @@ rl78_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
} }
/* Store struct value address. */ /* Store struct value address. */
if (struct_return) if (return_method == return_method_struct)
{ {
store_unsigned_integer (buf, 2, byte_order, struct_addr); store_unsigned_integer (buf, 2, byte_order, struct_addr);
sp -= 2; sp -= 2;

5
gdb/rs6000-aix-tdep.c
View File

@ -285,7 +285,8 @@ static CORE_ADDR
rs6000_push_dummy_call (struct gdbarch *gdbarch, struct value *function, rs6000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -316,7 +317,7 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
(which will be passed in r3) is used for struct return address. (which will be passed in r3) is used for struct return address.
In that case we should advance one word and start from r4 In that case we should advance one word and start from r4
register to copy parameters. */ register to copy parameters. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_raw_write_unsigned (regcache, tdep->ppc_gp0_regnum + 3, regcache_raw_write_unsigned (regcache, tdep->ppc_gp0_regnum + 3,
struct_addr); struct_addr);

5
gdb/rs6000-lynx178-tdep.c
View File

@ -33,7 +33,8 @@ rs6000_lynx178_push_dummy_call (struct gdbarch *gdbarch,
struct value *function, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -63,7 +64,7 @@ rs6000_lynx178_push_dummy_call (struct gdbarch *gdbarch,
(which will be passed in r3) is used for struct return address. (which will be passed in r3) is used for struct return address.
In that case we should advance one word and start from r4 In that case we should advance one word and start from r4
register to copy parameters. */ register to copy parameters. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_raw_write_unsigned (regcache, tdep->ppc_gp0_regnum + 3, regcache_raw_write_unsigned (regcache, tdep->ppc_gp0_regnum + 3,
struct_addr); struct_addr);

8
gdb/rx-tdep.c
View File

@ -784,7 +784,8 @@ rx_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame)
static CORE_ADDR static CORE_ADDR
rx_push_dummy_call (struct gdbarch *gdbarch, struct value *function, rx_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
struct value **args, CORE_ADDR sp, int struct_return, struct value **args, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -830,7 +831,7 @@ rx_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
sp = align_down (sp - sp_off, 4); sp = align_down (sp - sp_off, 4);
sp_off = 0; sp_off = 0;
if (struct_return) if (return_method == return_method_struct)
{ {
struct type *return_type = TYPE_TARGET_TYPE (func_type); struct type *return_type = TYPE_TARGET_TYPE (func_type);
@ -854,7 +855,8 @@ rx_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct type *arg_type = check_typedef (value_type (arg)); struct type *arg_type = check_typedef (value_type (arg));
ULONGEST arg_size = TYPE_LENGTH (arg_type); ULONGEST arg_size = TYPE_LENGTH (arg_type);
if (i == 0 && struct_addr != 0 && !struct_return if (i == 0 && struct_addr != 0
&& return_method != return_method_struct
&& TYPE_CODE (arg_type) == TYPE_CODE_PTR && TYPE_CODE (arg_type) == TYPE_CODE_PTR
&& extract_unsigned_integer (arg_bits, 4, && extract_unsigned_integer (arg_bits, 4,
byte_order) == struct_addr) byte_order) == struct_addr)

7
gdb/s390-tdep.c
View File

@ -1865,7 +1865,8 @@ static CORE_ADDR
s390_push_dummy_call (struct gdbarch *gdbarch, struct value *function, s390_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
int word_size = gdbarch_ptr_bit (gdbarch) / 8; int word_size = gdbarch_ptr_bit (gdbarch) / 8;
@ -1879,7 +1880,7 @@ s390_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
ftype = check_typedef (TYPE_TARGET_TYPE (ftype)); ftype = check_typedef (TYPE_TARGET_TYPE (ftype));
arg_prep.copy = sp; arg_prep.copy = sp;
arg_prep.gr = struct_return ? 3 : 2; arg_prep.gr = (return_method == return_method_struct) ? 3 : 2;
arg_prep.fr = 0; arg_prep.fr = 0;
arg_prep.vr = 0; arg_prep.vr = 0;
arg_prep.argp = 0; arg_prep.argp = 0;
@ -1908,7 +1909,7 @@ s390_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
error (_("Stack overflow")); error (_("Stack overflow"));
/* Pass the structure return address in general register 2. */ /* Pass the structure return address in general register 2. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, S390_R2_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, S390_R2_REGNUM, struct_addr);
/* Initialize arg_state for "write mode". */ /* Initialize arg_state for "write mode". */

5
gdb/score-tdep.c
View File

@ -511,7 +511,8 @@ static CORE_ADDR
score_push_dummy_call (struct gdbarch *gdbarch, struct value *function, score_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int argnum; int argnum;
@ -535,7 +536,7 @@ score_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* Step 3, Check if struct return then save the struct address to /* Step 3, Check if struct return then save the struct address to
r4 and increase the stack_offset by 4. */ r4 and increase the stack_offset by 4. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_cooked_write_unsigned (regcache, argreg++, struct_addr); regcache_cooked_write_unsigned (regcache, argreg++, struct_addr);
stack_offset += SCORE_REGSIZE; stack_offset += SCORE_REGSIZE;

9
gdb/sh-tdep.c
View File

@ -1062,7 +1062,7 @@ sh_push_dummy_call_fpu (struct gdbarch *gdbarch,
struct regcache *regcache, struct regcache *regcache,
CORE_ADDR bp_addr, int nargs, CORE_ADDR bp_addr, int nargs,
struct value **args, struct value **args,
CORE_ADDR sp, int struct_return, CORE_ADDR sp, function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -1175,7 +1175,7 @@ sh_push_dummy_call_fpu (struct gdbarch *gdbarch,
} }
} }
if (struct_return) if (return_method == return_method_struct)
{ {
if (sh_is_renesas_calling_convention (func_type)) if (sh_is_renesas_calling_convention (func_type))
/* If the function uses the Renesas ABI, subtract another 4 bytes from /* If the function uses the Renesas ABI, subtract another 4 bytes from
@ -1204,7 +1204,8 @@ sh_push_dummy_call_nofpu (struct gdbarch *gdbarch,
struct regcache *regcache, struct regcache *regcache,
CORE_ADDR bp_addr, CORE_ADDR bp_addr,
int nargs, struct value **args, int nargs, struct value **args,
CORE_ADDR sp, int struct_return, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -1278,7 +1279,7 @@ sh_push_dummy_call_nofpu (struct gdbarch *gdbarch,
} }
} }
if (struct_return) if (return_method == return_method_struct)
{ {
if (sh_is_renesas_calling_convention (func_type)) if (sh_is_renesas_calling_convention (func_type))
/* If the function uses the Renesas ABI, subtract another 4 bytes from /* If the function uses the Renesas ABI, subtract another 4 bytes from

15
gdb/sparc-tdep.c
View File

@ -612,7 +612,8 @@ sparc32_push_dummy_code (struct gdbarch *gdbarch, CORE_ADDR sp,
static CORE_ADDR static CORE_ADDR
sparc32_store_arguments (struct regcache *regcache, int nargs, sparc32_store_arguments (struct regcache *regcache, int nargs,
struct value **args, CORE_ADDR sp, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
struct gdbarch *gdbarch = regcache->arch (); struct gdbarch *gdbarch = regcache->arch ();
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -697,7 +698,7 @@ sparc32_store_arguments (struct regcache *regcache, int nargs,
gdb_assert (element == num_elements); gdb_assert (element == num_elements);
if (struct_return) if (return_method == return_method_struct)
{ {
gdb_byte buf[4]; gdb_byte buf[4];
@ -712,16 +713,18 @@ static CORE_ADDR
sparc32_push_dummy_call (struct gdbarch *gdbarch, struct value *function, sparc32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
CORE_ADDR call_pc = (struct_return ? (bp_addr - 12) : (bp_addr - 8)); CORE_ADDR call_pc = (return_method == return_method_struct
? (bp_addr - 12) : (bp_addr - 8));
/* Set return address. */ /* Set return address. */
regcache_cooked_write_unsigned (regcache, SPARC_O7_REGNUM, call_pc); regcache_cooked_write_unsigned (regcache, SPARC_O7_REGNUM, call_pc);
/* Set up function arguments. */ /* Set up function arguments. */
sp = sparc32_store_arguments (regcache, nargs, args, sp, sp = sparc32_store_arguments (regcache, nargs, args, sp, return_method,
struct_return, struct_addr); struct_addr);
/* Allocate the 16-word window save area. */ /* Allocate the 16-word window save area. */
sp -= 16 * 4; sp -= 16 * 4;

14
gdb/sparc64-tdep.c
View File

@ -1367,7 +1367,8 @@ sparc64_extract_floating_fields (struct regcache *regcache, struct type *type,
static CORE_ADDR static CORE_ADDR
sparc64_store_arguments (struct regcache *regcache, int nargs, sparc64_store_arguments (struct regcache *regcache, int nargs,
struct value **args, CORE_ADDR sp, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
struct gdbarch *gdbarch = regcache->arch (); struct gdbarch *gdbarch = regcache->arch ();
/* Number of extended words in the "parameter array". */ /* Number of extended words in the "parameter array". */
@ -1381,7 +1382,7 @@ sparc64_store_arguments (struct regcache *regcache, int nargs,
/* First we calculate the number of extended words in the "parameter /* First we calculate the number of extended words in the "parameter
array". While doing so we also convert some of the arguments. */ array". While doing so we also convert some of the arguments. */
if (struct_return) if (return_method == return_method_struct)
num_elements++; num_elements++;
for (i = 0; i < nargs; i++) for (i = 0; i < nargs; i++)
@ -1477,7 +1478,7 @@ sparc64_store_arguments (struct regcache *regcache, int nargs,
contents of any unused memory or registers in the "parameter contents of any unused memory or registers in the "parameter
array" are undefined. */ array" are undefined. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_cooked_write_unsigned (regcache, SPARC_O0_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, SPARC_O0_REGNUM, struct_addr);
element++; element++;
@ -1621,14 +1622,15 @@ static CORE_ADDR
sparc64_push_dummy_call (struct gdbarch *gdbarch, struct value *function, sparc64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
/* Set return address. */ /* Set return address. */
regcache_cooked_write_unsigned (regcache, SPARC_O7_REGNUM, bp_addr - 8); regcache_cooked_write_unsigned (regcache, SPARC_O7_REGNUM, bp_addr - 8);
/* Set up function arguments. */ /* Set up function arguments. */
sp = sparc64_store_arguments (regcache, nargs, args, sp, sp = sparc64_store_arguments (regcache, nargs, args, sp, return_method,
struct_return, struct_addr); struct_addr);
/* Allocate the register save area. */ /* Allocate the register save area. */
sp -= 16 * 8; sp -= 16 * 8;

5
gdb/spu-tdep.c
View File

@ -1401,7 +1401,8 @@ static CORE_ADDR
spu_push_dummy_call (struct gdbarch *gdbarch, struct value *function, spu_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
CORE_ADDR sp_delta; CORE_ADDR sp_delta;
@ -1418,7 +1419,7 @@ spu_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* If STRUCT_RETURN is true, then the struct return address (in /* If STRUCT_RETURN is true, then the struct return address (in
STRUCT_ADDR) will consume the first argument-passing register. STRUCT_ADDR) will consume the first argument-passing register.
Both adjust the register count and store that value. */ Both adjust the register count and store that value. */
if (struct_return) if (return_method == return_method_struct)
{ {
memset (buf, 0, sizeof buf); memset (buf, 0, sizeof buf);
store_unsigned_integer (buf, 4, byte_order, SPUADDR_ADDR (struct_addr)); store_unsigned_integer (buf, 4, byte_order, SPUADDR_ADDR (struct_addr));

5
gdb/tic6x-tdep.c
View File

@ -875,7 +875,8 @@ static CORE_ADDR
tic6x_push_dummy_call (struct gdbarch *gdbarch, struct value *function, tic6x_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, struct regcache *regcache, CORE_ADDR bp_addr,
int nargs, struct value **args, CORE_ADDR sp, int nargs, struct value **args, CORE_ADDR sp,
int struct_return, CORE_ADDR struct_addr) function_call_return_method return_method,
CORE_ADDR struct_addr)
{ {
int argreg = 0; int argreg = 0;
int argnum; int argnum;
@ -894,7 +895,7 @@ tic6x_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* The caller must pass an argument in A3 containing a destination address /* The caller must pass an argument in A3 containing a destination address
for the returned value. The callee returns the object by copying it to for the returned value. The callee returns the object by copying it to
the address in A3. */ the address in A3. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, 3, struct_addr); regcache_cooked_write_unsigned (regcache, 3, struct_addr);
/* Determine the type of this function. */ /* Determine the type of this function. */

4
gdb/tilegx-tdep.c
View File

@ -281,7 +281,7 @@ tilegx_push_dummy_call (struct gdbarch *gdbarch,
struct regcache *regcache, struct regcache *regcache,
CORE_ADDR bp_addr, int nargs, CORE_ADDR bp_addr, int nargs,
struct value **args, struct value **args,
CORE_ADDR sp, int struct_return, CORE_ADDR sp, function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -293,7 +293,7 @@ tilegx_push_dummy_call (struct gdbarch *gdbarch,
/* If struct_return is 1, then the struct return address will /* If struct_return is 1, then the struct return address will
consume one argument-passing register. */ consume one argument-passing register. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, argreg++, struct_addr); regcache_cooked_write_unsigned (regcache, argreg++, struct_addr);
/* Arguments are passed in R0 - R9, and as soon as an argument /* Arguments are passed in R0 - R9, and as soon as an argument

4
gdb/v850-tdep.c
View File

@ -1013,7 +1013,7 @@ v850_push_dummy_call (struct gdbarch *gdbarch,
int nargs, int nargs,
struct value **args, struct value **args,
CORE_ADDR sp, CORE_ADDR sp,
int struct_return, function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -1039,7 +1039,7 @@ v850_push_dummy_call (struct gdbarch *gdbarch,
argreg = E_ARG0_REGNUM; argreg = E_ARG0_REGNUM;
/* The struct_return pointer occupies the first parameter register. */ /* The struct_return pointer occupies the first parameter register. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, argreg++, struct_addr); regcache_cooked_write_unsigned (regcache, argreg++, struct_addr);
/* Now load as many as possible of the first arguments into /* Now load as many as possible of the first arguments into

5
gdb/vax-tdep.c
View File

@ -141,7 +141,8 @@ vax_store_arguments (struct regcache *regcache, int nargs,
static CORE_ADDR static CORE_ADDR
vax_push_dummy_call (struct gdbarch *gdbarch, struct value *function, vax_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
struct value **args, CORE_ADDR sp, int struct_return, struct value **args, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -152,7 +153,7 @@ vax_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
sp = vax_store_arguments (regcache, nargs, args, sp); sp = vax_store_arguments (regcache, nargs, args, sp);
/* Store return value address. */ /* Store return value address. */
if (struct_return) if (return_method == return_method_struct)
regcache_cooked_write_unsigned (regcache, VAX_R1_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, VAX_R1_REGNUM, struct_addr);
/* Store return address in the PC slot. */ /* Store return address in the PC slot. */

9
gdb/xstormy16-tdep.c
View File

@ -226,7 +226,8 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch,
struct regcache *regcache, struct regcache *regcache,
CORE_ADDR bp_addr, int nargs, CORE_ADDR bp_addr, int nargs,
struct value **args, struct value **args,
CORE_ADDR sp, int struct_return, CORE_ADDR sp,
function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -236,9 +237,9 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch,
int typelen, slacklen; int typelen, slacklen;
gdb_byte buf[xstormy16_pc_size]; gdb_byte buf[xstormy16_pc_size];
/* If struct_return is true, then the struct return address will /* If returning a struct using target ABI method, then the struct return
consume one argument-passing register. */ address will consume one argument-passing register. */
if (struct_return) if (return_method == return_method_struct)
{ {
regcache_cooked_write_unsigned (regcache, E_PTR_RET_REGNUM, struct_addr); regcache_cooked_write_unsigned (regcache, E_PTR_RET_REGNUM, struct_addr);
argreg++; argreg++;

10
gdb/xtensa-tdep.c
View File

@ -1685,7 +1685,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
int nargs, int nargs,
struct value **args, struct value **args,
CORE_ADDR sp, CORE_ADDR sp,
int struct_return, function_call_return_method return_method,
CORE_ADDR struct_addr) CORE_ADDR struct_addr)
{ {
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
@ -1715,9 +1715,9 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
if (xtensa_debug_level > 3) if (xtensa_debug_level > 3)
{ {
DEBUGINFO ("[xtensa_push_dummy_call] nargs = %d\n", nargs); DEBUGINFO ("[xtensa_push_dummy_call] nargs = %d\n", nargs);
DEBUGINFO ("[xtensa_push_dummy_call] sp=0x%x, struct_return=%d, " DEBUGINFO ("[xtensa_push_dummy_call] sp=0x%x, return_method=%d, "
"struct_addr=0x%x\n", "struct_addr=0x%x\n",
(int) sp, (int) struct_return, (int) struct_addr); (int) sp, (int) return_method, (int) struct_addr);
for (int i = 0; i < nargs; i++) for (int i = 0; i < nargs; i++)
{ {
@ -1751,7 +1751,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
size = 0; size = 0;
onstack_size = 0; onstack_size = 0;
if (struct_return) if (return_method == return_method_struct)
size = REGISTER_SIZE; size = REGISTER_SIZE;
for (int i = 0; i < nargs; i++) for (int i = 0; i < nargs; i++)
@ -1828,7 +1828,7 @@ xtensa_push_dummy_call (struct gdbarch *gdbarch,
/* Second Loop: Load arguments. */ /* Second Loop: Load arguments. */
if (struct_return) if (return_method == return_method_struct)
{ {
store_unsigned_integer (buf, REGISTER_SIZE, byte_order, struct_addr); store_unsigned_integer (buf, REGISTER_SIZE, byte_order, struct_addr);
regcache->cooked_write (ARG_1ST (gdbarch), buf); regcache->cooked_write (ARG_1ST (gdbarch), buf);