From fd6d6815538394e49c70d2df8fd65ebddb05ffbe Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Fri, 13 Nov 2009 10:32:58 +0000 Subject: [PATCH] 2009-11-13 Tristan Gingold * avr-tdep.c (avr_push_dummy_call): Fix endianness issue and avoid overlap between returned structure and return address/parameters. --- gdb/ChangeLog | 5 +++++ gdb/avr-tdep.c | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 275955c..5111dbc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2009-11-13 Tristan Gingold + + * avr-tdep.c (avr_push_dummy_call): Fix endianness issue and avoid + overlap between returned structure and return address/parameters. + 2009-11-12 Daniel Jacobowitz * remote-fileio.c (remote_fileio_func_read): Limit console diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index ba6e8cb..0c76cf4 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -1252,10 +1252,14 @@ avr_push_dummy_call (struct gdbarch *gdbarch, struct value *function, if (struct_return) { - regcache_cooked_write_unsigned (regcache, regnum--, - struct_addr & 0xff); - regcache_cooked_write_unsigned (regcache, regnum--, - (struct_addr >> 8) & 0xff); + regcache_cooked_write_unsigned + (regcache, regnum--, (struct_addr >> 8) & 0xff); + regcache_cooked_write_unsigned + (regcache, regnum--, struct_addr & 0xff); + /* SP being post decremented, we need to reserve one byte so that the + return address won't overwrite the result (or vice-versa). */ + if (sp == struct_addr) + sp--; } for (i = 0; i < nargs; i++) -- 2.7.4