* s390-tdep.c (s390_push_dummy_call): Set addressing mode bit

	in return PSWA.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 83cfd5b80e402c056c4931ad5ab5f3b22a7ab013..6b4b889471bb48b66cf935c6071cf94f7c9ef372 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-19  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * s390-tdep.c (s390_push_dummy_call): Set addressing mode bit
+       in return PSWA.
+
 2011-12-17  Mark Kettenis  <kettenis@gnu.org>
 
        * amd64obsd-tdep.c (amd64obsd_init_abi): Don't set

diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index 1c09739a2388ce063f20c2dde545d1e22bc2ab1a..cd0ef9c7ccc32df5c22d292863f2aede7e9f1bfa 100644 (file)
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -2749,9 +2749,15 @@ s390_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
       }
   }
 
-  /* Store return address.  */
+  /* Store return PSWA.  In 31-bit mode, keep addressing mode bit.  */
+  if (word_size == 4)
+    {
+      ULONGEST pswa;
+      regcache_cooked_read_unsigned (regcache, S390_PSWA_REGNUM, &pswa);
+      bp_addr = (bp_addr & 0x7fffffff) | (pswa & 0x80000000);
+    }
   regcache_cooked_write_unsigned (regcache, S390_RETADDR_REGNUM, bp_addr);
-  
+
   /* Store updated stack pointer.  */
   regcache_cooked_write_unsigned (regcache, S390_SP_REGNUM, sp);