diff options
author | Luis Machado <luis.machado@arm.com> | 2022-01-04 14:06:36 -0300 |
---|---|---|
committer | Luis Machado <luis.machado@arm.com> | 2022-03-14 10:38:32 +0000 |
commit | bab22d0640914384d467e09c3e796585fd08e7c6 (patch) | |
tree | 96c9d0148f50a7686eab88239889a1d3c7b782a7 /gdb/arm-tdep.c | |
parent | d4661bf0e978da6e8b8a9cb792c9e82bfab403f0 (diff) | |
download | gdb-bab22d0640914384d467e09c3e796585fd08e7c6.zip gdb-bab22d0640914384d467e09c3e796585fd08e7c6.tar.gz gdb-bab22d0640914384d467e09c3e796585fd08e7c6.tar.bz2 |
[aarch64/arm] Properly extract the return value returned in memory
When running gdb.cp/non-trivial-retval.exp, the following shows up for
both aarch64-linux and armhf-linux:
Breakpoint 3, f1 (i1=23, i2=100) at src/gdb/testsuite/gdb.cp/non-trivial-retval.cc:35
35 A a;
(gdb) finish
Run till exit from #0 f1 (i1=23, i2=100) at src/gdb/testsuite/gdb.cp/non-trivial-retval.cc:35
main () at /src/gdb/testsuite/gdb.cp/non-trivial-retval.cc:163
163 B b = f2 (i1, i2);
Value returned is $6 = {a = -11952}
(gdb)
The return value should be {a = 123} instead. This happens because the
backends don't extract the return value from the correct location. GDB should
fetch a pointer to the memory location from X8 for aarch64 and r0 for armhf.
With the patch, gdb.cp/non-trivial-retval.exp has full passes on
aarch64-linux and armhf-linux on Ubuntu 20.04/18.04.
The problem only shows up with the "finish" command. The "call" command
works correctly and displays the correct return value.
This is also related to PR gdb/28681
(https://sourceware.org/bugzilla/show_bug.cgi?id=28681) and fixes FAIL's in
gdb.ada/mi_var_array.exp.
A new testcase is provided, and it exercises GDB's ability to "finish" a
function that returns a large struct (> 16 bytes) and display the
contents of this struct correctly. This has always been incorrect for
these backends, but no testcase exercised this particular scenario.
Diffstat (limited to 'gdb/arm-tdep.c')
-rw-r--r-- | gdb/arm-tdep.c | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index d36856e..8e24564 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -8075,7 +8075,8 @@ arm_return_in_memory (struct gdbarch *gdbarch, struct type *type) { /* The AAPCS says all aggregates not larger than a word are returned in a register. */ - if (TYPE_LENGTH (type) <= ARM_INT_REGISTER_SIZE) + if (TYPE_LENGTH (type) <= ARM_INT_REGISTER_SIZE + && language_pass_by_reference (type).trivially_copyable) return 0; return 1; @@ -8086,7 +8087,8 @@ arm_return_in_memory (struct gdbarch *gdbarch, struct type *type) /* All aggregate types that won't fit in a register must be returned in memory. */ - if (TYPE_LENGTH (type) > ARM_INT_REGISTER_SIZE) + if (TYPE_LENGTH (type) > ARM_INT_REGISTER_SIZE + || !language_pass_by_reference (type).trivially_copyable) return 1; /* In the ARM ABI, "integer" like aggregate types are returned in @@ -8307,9 +8309,33 @@ arm_return_value (struct gdbarch *gdbarch, struct value *function, || valtype->code () == TYPE_CODE_UNION || valtype->code () == TYPE_CODE_ARRAY) { + /* From the AAPCS document: + + Result return: + + A Composite Type larger than 4 bytes, or whose size cannot be + determined statically by both caller and callee, is stored in memory + at an address passed as an extra argument when the function was + called (Parameter Passing, rule A.4). The memory to be used for the + result may be modified at any point during the function call. + + Parameter Passing: + + A.4: If the subroutine is a function that returns a result in memory, + then the address for the result is placed in r0 and the NCRN is set + to r1. */ if (tdep->struct_return == pcc_struct_return || arm_return_in_memory (gdbarch, valtype)) - return RETURN_VALUE_STRUCT_CONVENTION; + { + if (readbuf) + { + CORE_ADDR addr; + + regcache->cooked_read (ARM_A1_REGNUM, &addr); + read_memory (addr, readbuf, TYPE_LENGTH (valtype)); + } + return RETURN_VALUE_ABI_RETURNS_ADDRESS; + } } else if (valtype->code () == TYPE_CODE_COMPLEX) { |