* s390-tdep.c (s390_get_frame_info): Give orig_sp a reasonable

value, even when fextra_info->stack_bought can't be trusted,

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d4888d3c78a15549fbebe83b9bf7a0d016fe6595..6246f80495076dd5c75543d5c672dad1702f89f6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2001-12-19  Jim Blandy  <jimb@redhat.com>
 
+       * s390-tdep.c (s390_get_frame_info): Give orig_sp a reasonable
+       value, even when fextra_info->stack_bought can't be trusted,
+
        * s390-tdep.c (s390_readinstruction): Don't call
        info->read_memory_func to read zero bytes.  Some targets'
        xfer_memory functions can't cope with that.

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