diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/amd64-windows-tdep.c | 21 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/call-sc.c | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/call-sc.exp | 13 |
5 files changed, 46 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 62dce76..57e8cc7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-10-05 Hannes Domani <ssbssa@yahoo.de> + + * amd64-windows-tdep.c (amd64_windows_passed_by_integer_register): + Add TYPE_CODE_COMPLEX. + (amd64_windows_return_value): Fix types returned via XMM0. + 2020-10-05 Alan Hayward <alan.hayward@arm.com> * MAINTAINERS (Responsible Maintainers): Add Luis Machado to diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c index e427c20..320388b 100644 --- a/gdb/amd64-windows-tdep.c +++ b/gdb/amd64-windows-tdep.c @@ -125,6 +125,7 @@ amd64_windows_passed_by_integer_register (struct type *type) case TYPE_CODE_RVALUE_REF: case TYPE_CODE_STRUCT: case TYPE_CODE_UNION: + case TYPE_CODE_COMPLEX: return (TYPE_LENGTH (type) == 1 || TYPE_LENGTH (type) == 2 || TYPE_LENGTH (type) == 4 @@ -364,17 +365,29 @@ amd64_windows_return_value (struct gdbarch *gdbarch, struct value *function, switch (type->code ()) { case TYPE_CODE_FLT: - case TYPE_CODE_DECFLOAT: - /* __m128, __m128i, __m128d, floats, and doubles are returned - via XMM0. */ - if (len == 4 || len == 8 || len == 16) + /* floats, and doubles are returned via XMM0. */ + if (len == 4 || len == 8) regnum = AMD64_XMM0_REGNUM; break; + case TYPE_CODE_ARRAY: + /* __m128, __m128i and __m128d are returned via XMM0. */ + if (TYPE_VECTOR (type) && len == 16) + { + enum type_code code = TYPE_TARGET_TYPE (type)->code (); + if (code == TYPE_CODE_INT || code == TYPE_CODE_FLT) + { + regnum = AMD64_XMM0_REGNUM; + break; + } + } + /* fall through */ default: /* All other values that are 1, 2, 4 or 8 bytes long are returned via RAX. */ if (len == 1 || len == 2 || len == 4 || len == 8) regnum = AMD64_RAX_REGNUM; + else if (len == 16 && type->code () == TYPE_CODE_INT) + regnum = AMD64_XMM0_REGNUM; break; } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a330b0c..e8fe944 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2020-10-05 Hannes Domani <ssbssa@yahoo.de> + + * gdb.base/call-sc.c: Fix return struct on stack test case. + * gdb.base/call-sc.exp: Likewise. + 2020-10-02 Gary Benson <gbenson@redhat.com> * README: Fix "paralell". diff --git a/gdb/testsuite/gdb.base/call-sc.c b/gdb/testsuite/gdb.base/call-sc.c index ba80576..eb140cd 100644 --- a/gdb/testsuite/gdb.base/call-sc.c +++ b/gdb/testsuite/gdb.base/call-sc.c @@ -35,6 +35,7 @@ typedef t T; #endif T foo = '1', L; +T init = '9'; T fun() { @@ -55,7 +56,10 @@ int main() { int i; - Fun(foo); + /* Use a different initial value then is later used in the + "value foo returned" test, so in case the struct is then returned + on the stack, it doesn't have the correct value by accident. */ + Fun(init); /* An infinite loop that first clears all the variables and then calls the function. This "hack" is to make re-testing easier - diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp index 9544dcc..685c6f2 100644 --- a/gdb/testsuite/gdb.base/call-sc.exp +++ b/gdb/testsuite/gdb.base/call-sc.exp @@ -280,6 +280,19 @@ proc test_scalar_returns { } { fail "${test}" } } + -re " = 57 .*${gdb_prompt} $" { + if $return_value_unknown { + # The struct return case. + # The return value is stored on the stack, and since GDB + # didn't override it, it still has value that was stored + # there in the earlier Foo(init) call. + pass "${test}" + } else { + # This contradicts the above claim that GDB knew + # the location of the return-value. + fail "${test}" + } + } -re ".*${gdb_prompt} $" { if $return_value_unimplemented { # What a suprize. The architecture hasn't implemented |