This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA] fix inferior call for avr
- From: Tristan Gingold <gingold at adacore dot com>
- To: gdb-patches ml <gdb-patches at sourceware dot org>
- Date: Fri, 23 Oct 2009 17:16:39 +0200
- Subject: [RFA] fix inferior call for avr
Hi,
there are two issues in avr_push_dummy_call:
* avr6 architecture (were PC size is 3 bytes instead of 2) was not
correctly handled
* the returned value was not correct, which made gdb assertions failed.
Ok for trunk ?
Tristan.
2009-10-23 Tristan Gingold <gingold@adacore.com>
* avr-tdep.c (avr_push_dummy_call): Handle avr6 architecture.
Fix the returned value. Fix style.
--- avr-tdep.c 2 Jul 2009 17:25:52 -0000 1.115
+++ avr-tdep.c 23 Oct 2009 15:13:35 -0000
@@ -1181,7 +1181,8 @@
{
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
int i;
- unsigned char buf[2];
+ unsigned char buf[3];
+ int call_length = gdbarch_tdep (gdbarch)->call_length;
CORE_ADDR return_pc = avr_convert_iaddr_to_raw (bp_addr);
int regnum = AVR_ARGN_REGNUM;
struct stack_item *si = NULL;
@@ -1219,11 +1220,9 @@
regnum--;
val = extract_unsigned_integer (contents, len, byte_order);
- for (j=0; j<len; j++)
- {
- regcache_cooked_write_unsigned (regcache, regnum--,
- val >> (8*(len-j-1)));
- }
+ for (j = 0; j < len; j++)
+ regcache_cooked_write_unsigned
+ (regcache, regnum--, val >> (8 * (len - j - 1)));
}
/* No registers available, push the args onto the stack. */
else
@@ -1245,17 +1244,23 @@
/* Set the return address. For the avr, the return address is the
BP_ADDR.
Need to push the return address onto the stack noting that it
needs to be
in big-endian order on the stack. */
- buf[0] = (return_pc >> 8) & 0xff;
- buf[1] = return_pc & 0xff;
+ for (i = 1; i <= call_length; i++)
+ {
+ buf[call_length - i] = return_pc & 0xff;
+ return_pc >>= 8;
+ }
- sp -= 2;
- write_memory (sp + 1, buf, 2); /* Add one since pushes are post
decr ops. */
+ sp -= call_length;
+ /* Use 'sp + 1' since pushes are post decr ops. */
+ write_memory (sp + 1, buf, call_length);
/* Finally, update the SP register. */
regcache_cooked_write_unsigned (regcache, AVR_SP_REGNUM,
avr_convert_saddr_to_raw (sp));
- return sp;
+ /* Return SP value for the dummy frame, where the return address
hasn't been
+ pushed. */
+ return sp + call_length;
}
/* Initialize the gdbarch structure for the AVR's. */