about summary refs log tree commit diff
path: root/sysdeps/s390
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/s390')
-rw-r--r--sysdeps/s390/bits/setjmp.h2
-rw-r--r--sysdeps/s390/s390-32/__longjmp.c28
-rw-r--r--sysdeps/s390/s390-32/elf/setjmp.S7
-rw-r--r--sysdeps/s390/s390-32/setjmp.S7
-rw-r--r--sysdeps/s390/s390-64/__longjmp.c28
-rw-r--r--sysdeps/s390/s390-64/elf/setjmp.S7
-rw-r--r--sysdeps/s390/s390-64/setjmp.S7
7 files changed, 53 insertions, 33 deletions
diff --git a/sysdeps/s390/bits/setjmp.h b/sysdeps/s390/bits/setjmp.h
index 01533ca367..37f600d0ad 100644
--- a/sysdeps/s390/bits/setjmp.h
+++ b/sysdeps/s390/bits/setjmp.h
@@ -40,7 +40,7 @@
 
 #ifndef	_ASM
 
-typedef struct {
+typedef struct __s390_jmp_buf {
     /* We save registers 6-15.  */
     long int __gregs[10];
 
diff --git a/sysdeps/s390/s390-32/__longjmp.c b/sysdeps/s390/s390-32/__longjmp.c
index 07814e080a..c47ebbc52a 100644
--- a/sysdeps/s390/s390-32/__longjmp.c
+++ b/sysdeps/s390/s390-32/__longjmp.c
@@ -29,24 +29,32 @@
 void
 __longjmp (__jmp_buf env, int val)
 {
+  register int r2 __asm ("%r2") = val == 0 ? 1 : val;
 #ifdef PTR_DEMANGLE
-  register uintptr_t r5 __asm ("%r5") = THREAD_GET_POINTER_GUARD ();
+  register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD ();
+  register void *r1 __asm ("%r1") = (void *) env;
 #endif
   /* Restore registers and jump back.  */
-  asm volatile ("lr   %%r2,%0\n\t"	  /* PUT val in grp 2.  */
-		"ld   %%f6,48(%1)\n\t"
+  asm volatile ("ld   %%f6,48(%1)\n\t"
 		"ld   %%f4,40(%1)\n\t"
-		"lm   %%r6,%%r15,0(%1)\n\t"
 #ifdef PTR_DEMANGLE
-		"xr   %%r14,%2\n\t"
-#endif
+		"lm   %%r6,%%r13,0(%1)\n\t"
+		"lm   %%r4,%%r5,32(%1)\n\t"
+		"xr   %%r4,%2\n\t"
+		"xr   %%r5,%2\n\t"
+		"lr   %%r15,%%r5\n\t"
+		"br   %%r4"
+#else
+		"lm   %%r6,%%r15,0(%1)\n\t"
 		"br   %%r14"
-		: : "r" (val == 0 ? 1 : val),
-		    "a" (env)
+#endif
+		: : "r" (r2),
 #ifdef PTR_DEMANGLE
-		    , "r" (r5)
+		    "r" (r1), "r" (r3)
+#else
+		    "a" (env)
 #endif
-		: "2" );
+		);
 
   /* Avoid `volatile function does return' warnings.  */
   for (;;);
diff --git a/sysdeps/s390/s390-32/elf/setjmp.S b/sysdeps/s390/s390-32/elf/setjmp.S
index f3ca8af6c2..ed28008a56 100644
--- a/sysdeps/s390/s390-32/elf/setjmp.S
+++ b/sysdeps/s390/s390-32/elf/setjmp.S
@@ -49,9 +49,10 @@ ENTRY(__sigsetjmp)
 #ifdef PTR_MANGLE
 	stm    %r6,%r13,0(%r2)      /* store registers in jmp_buf */
 	lr     %r4,%r14
-	PTR_MANGLE (%r4, %r5)
-	st     %r4,32(%r2)
-	st     %r15,36(%r2)
+	lr     %r5,%r15
+	PTR_MANGLE (%r4, %r1)
+	PTR_MANGLE2 (%r5, %r1)
+	stm    %r4,%r5,32(%r2)
 #else
 	stm    %r6,%r15,0(%r2)      /* store registers in jmp_buf */
 #endif
diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S
index a438595945..b943085e93 100644
--- a/sysdeps/s390/s390-32/setjmp.S
+++ b/sysdeps/s390/s390-32/setjmp.S
@@ -32,9 +32,10 @@ ENTRY(__sigsetjmp)
 #ifdef PTR_MANGLE
 	stm    %r6,%r13,0(%r2)      /* store registers in jmp_buf */
 	lr     %r4,%r14
-	PTR_MANGLE (%r4, %r5)
-	st     %r4,32(%r2)
-	st     %r15,36(%r2)
+	lr     %r5,%r15
+	PTR_MANGLE (%r4, %r1)
+	PTR_MANGLE2 (%r5, %r1)
+	stm    %r4,%r5,32(%r2)
 #else
 	stm    %r6,%r15,0(%r2)      /* store registers in jmp_buf */
 #endif
diff --git a/sysdeps/s390/s390-64/__longjmp.c b/sysdeps/s390/s390-64/__longjmp.c
index 6650bf702f..030fb5b515 100644
--- a/sysdeps/s390/s390-64/__longjmp.c
+++ b/sysdeps/s390/s390-64/__longjmp.c
@@ -29,26 +29,34 @@
 void
 __longjmp (__jmp_buf env, int val)
 {
+  register long int r2 __asm ("%r2") = val == 0 ? 1 : val;
 #ifdef PTR_DEMANGLE
-  register uintptr_t r5 __asm ("%r5") = THREAD_GET_POINTER_GUARD ();
+  register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD ();
+  register void *r1 __asm ("%r1") = (void *) env;
 #endif
   /* Restore registers and jump back.  */
-  asm volatile ("lgr  %%r2,%0\n\t"        /* Put val in grp 2.  */
-		"ld   %%f7,104(%1)\n\t"
+  asm volatile ("ld   %%f7,104(%1)\n\t"
 		"ld   %%f5,96(%1)\n\t"
 		"ld   %%f3,88(%1)\n\t"
 		"ld   %%f1,80(%1)\n\t"
-		"lmg  %%r6,%%r15,0(%1)\n\t"
 #ifdef PTR_DEMANGLE
-		"xgr  %%r14,%2\n\t"
-#endif
+		"lmg  %%r6,%%r13,0(%1)\n\t"
+		"lmg  %%r4,%%r5,64(%1)\n\t"
+		"xgr  %%r4,%2\n\t"
+		"xgr  %%r5,%2\n\t"
+		"lgr  %%r15,%%r5\n\t"
+		"br   %%r4"
+#else
+		"lmg  %%r6,%%r15,0(%1)\n\t"
 		"br   %%r14"
-		: : "r" (val == 0 ? 1 : val),
-		    "a" (env)
+#endif
+		: : "r" (r2),
 #ifdef PTR_DEMANGLE
-		    , "r" (r5)
+		    "r" (r1), "r" (r3)
+#else
+		    "a" (env)
 #endif
-		: "2" );
+		);
 
   /* Avoid `volatile function does return' warnings.  */
   for (;;);
diff --git a/sysdeps/s390/s390-64/elf/setjmp.S b/sysdeps/s390/s390-64/elf/setjmp.S
index 44f7cf08cc..28b6a5a35b 100644
--- a/sysdeps/s390/s390-64/elf/setjmp.S
+++ b/sysdeps/s390/s390-64/elf/setjmp.S
@@ -49,9 +49,10 @@ ENTRY(__sigsetjmp)
 #ifdef PTR_MANGLE
 	stmg   %r6,%r13,0(%r2)      /* Store registers in jmp_buf.  */
 	lgr    %r4,%r14
-	PTR_MANGLE (%r4, %r5)
-	stg    %r4,64(%r2)
-	stg    %r15,72(%r2)
+	lgr    %r5,%r15
+	PTR_MANGLE (%r4, %r1)
+	PTR_MANGLE2 (%r5, %r1)
+	stmg   %r4,%r5,64(%r2)
 #else
         stmg   %r6,%r15,0(%r2)      /* Store registers in jmp_buf.  */
 #endif
diff --git a/sysdeps/s390/s390-64/setjmp.S b/sysdeps/s390/s390-64/setjmp.S
index 25d97b6a6a..a962db46ce 100644
--- a/sysdeps/s390/s390-64/setjmp.S
+++ b/sysdeps/s390/s390-64/setjmp.S
@@ -31,9 +31,10 @@ ENTRY(__sigsetjmp)
 #ifdef PTR_MANGLE
 	stmg   %r6,%r13,0(%r2)      /* Store registers in jmp_buf.  */
 	lgr    %r4,%r14
-	PTR_MANGLE (%r4, %r5)
-	stg    %r4,64(%r2)
-	stg    %r15,72(%r2)
+	lgr    %r5,%r15
+	PTR_MANGLE (%r4, %r1)
+	PTR_MANGLE2 (%r5, %r1)
+	stmg   %r4,%r5,64(%r2)
 #else
         stmg   %r6,%r15,0(%r2)      /* Store registers in jmp_buf.  */
 #endif