* gdb/avr-tdep.c(avr_scan_prologue): Fix bad call to

generic_read_register_dummy() (PR gdb/703).
(avr_push_return_address): #if 0 out unused vars.
(avr_gdbarch_init): Enable use of avr_push_return_address().

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3d850e1cf2203223c83685279772bc6c56568536..7223ea08003d2c1e5bc726aee696a9756ee9bf9d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-17  Theodore A. Roth  <troth@verinet.com>
+
+       * gdb/avr-tdep.c(avr_scan_prologue): Fix bad call to 
+       generic_read_register_dummy() (PR gdb/703).
+       (avr_push_return_address): #if 0 out unused vars.
+       (avr_gdbarch_init): Enable use of avr_push_return_address().
+
 2002-09-17  Michael Snyder  <msnyder@redhat.com>
 
        * m32r-stub.c (restore_and_return): Postpone restoring of PSW.

diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index bcd78e11db37b48c5d791ea57fa9f0a8368588b0..c67e4e8d8d50fcbda3782694655242b555b5ab36 100644 (file)
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -524,7 +524,6 @@ avr_scan_prologue (struct frame_info *fi)
                {
                  fi->frame = locals;
 
-                 /* TRoth: Does -1 mean we're in main? */
                  fi->extra_info->is_main = 1;
                  return;
                }
@@ -755,11 +754,8 @@ avr_init_extra_frame_info (int fromleaf, struct frame_info *fi)
     {
       /* We need to setup fi->frame here because run_stack_dummy gets it wrong
          by assuming it's always FP.  */
-      /* FIXME: cagney/2002-09-13: This is wrong.  The third parameter
-         to deprecated_read_register_dummy() is REGNUM and not a frame
-         address.  */
       fi->frame = deprecated_read_register_dummy (fi->pc, fi->frame,
-                                                 fi->frame);
+                                                 AVR_PC_REGNUM);
     }
   else if (!fi->next)          /* this is the innermost frame? */
     fi->frame = read_register (fi->extra_info->framereg);
@@ -961,10 +957,10 @@ avr_push_return_address (CORE_ADDR pc, CORE_ADDR sp)
 {
   unsigned char buf[2];
   int wordsize = 2;
+#if 0
   struct minimal_symbol *msymbol;
   CORE_ADDR mon_brk;
-
-  fprintf_unfiltered (gdb_stderr, "avr_push_return_address() was called\n");
+#endif
 
   buf[0] = 0;
   buf[1] = 0;
@@ -1243,7 +1239,7 @@ avr_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_deprecated_extract_return_value (gdbarch, avr_extract_return_value);
   set_gdbarch_push_arguments (gdbarch, avr_push_arguments);
   set_gdbarch_push_dummy_frame (gdbarch, generic_push_dummy_frame);
-/*    set_gdbarch_push_return_address (gdbarch, avr_push_return_address); */
+  set_gdbarch_push_return_address (gdbarch, avr_push_return_address);
   set_gdbarch_pop_frame (gdbarch, avr_pop_frame);
 
   set_gdbarch_deprecated_store_return_value (gdbarch, avr_store_return_value);