* avr-tdep.c (avr_extract_return_value): New function.

(avr_gdbarch_init): Set extract_return_value method.

2 files changed, 39 insertions, 0 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 96ff655..462b20d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-16  Theodore A. Roth  <troth@openavr.org>
+
+	* avr-tdep.c (avr_extract_return_value): New function.
+	(avr_gdbarch_init): Set extract_return_value method.
+
 2003-06-16  Andrew Cagney  <cagney@redhat.com>
 
 	* frame.h (deprecated_get_next_frame_hack): Declare.
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index c9c5df0..cb23746 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -1094,6 +1094,39 @@ avr_breakpoint_from_pc (CORE_ADDR * pcptr, int *lenptr)
     return avr_break_insn;
 }
 
+/* Given a return value in `regbuf' with a type `valtype', 
+   extract and copy its value into `valbuf'.
+
+   Return values are always passed via registers r25:r24:...  */
+
+static void
+avr_extract_return_value (struct type *type, struct regcache *regcache,
+                          void *valbuf)
+{
+  if (TYPE_LENGTH (type) == 1)
+    {
+      ULONGEST c;
+
+      /* For single byte return values, r25 is always cleared, so we can
+         ignore it.  */
+      regcache_cooked_read_unsigned (regcache, 24, &c);
+      store_unsigned_integer (valbuf, 1, c);
+    }
+  else
+    {
+      int i;
+      /* The MSB of the return value is always in r25, calculate which
+         register holds the LSB.  */
+      int lsb_reg = 25 - TYPE_LENGTH (type) + 1;
+
+      for (i=0; i< TYPE_LENGTH (type); i++)
+        {
+          regcache_cooked_read (regcache, lsb_reg + i,
+                                (bfd_byte *) valbuf + i);
+        }
+    }
+}
+
 /* Initialize the gdbarch structure for the AVR's. */
 
 static struct gdbarch *
@@ -1157,6 +1190,7 @@ avr_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_register_name (gdbarch, avr_register_name);
   set_gdbarch_register_type (gdbarch, avr_register_type);
 
+  set_gdbarch_extract_return_value (gdbarch, avr_extract_return_value);
   set_gdbarch_print_insn (gdbarch, print_insn_avr);
 
   set_gdbarch_call_dummy_address (gdbarch, avr_call_dummy_address);