* s390-tdep.c (s390_get_frame_info): Don't used fextra_info to set

orig_sp if it's not initialized.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 732be2559d9ef56451ce15ae73fb1380b6d6e330..06ef02ea22dcaa1c353e0780987dbc316b6502c9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-03  Jim Blandy  <[email protected]>
+
+       * s390-tdep.c (s390_get_frame_info): Don't used fextra_info to set
+       orig_sp if it's not initialized.
+
 2001-11-30  Pierre Muller  <[email protected]>
 
        * findvar.c (locate_var_value): Specify in which register a register

diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index 4ec129c9cccf10037c2d39be5b16cfcabc591264..f91b6963454ac543d81e121228a4793fc62e0240 100644 (file)
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -242,7 +242,8 @@ s390_get_frame_info (CORE_ADDR pc, struct frame_extra_info *fextra_info,
     {
       if (fi && fi->frame)
        {
-         orig_sp = fi->frame + fextra_info->stack_bought;
+          if (! init_extra_info && fextra_info->initialised)
+            orig_sp = fi->frame + fextra_info->stack_bought;
          saved_regs = fi->saved_regs;
        }
       if (init_extra_info || !fextra_info->initialised)