about summary refs log tree commit diff
path: root/sysdeps/s390/s390-64/__longjmp.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/s390/s390-64/__longjmp.c')
-rw-r--r--sysdeps/s390/s390-64/__longjmp.c41
1 files changed, 12 insertions, 29 deletions
diff --git a/sysdeps/s390/s390-64/__longjmp.c b/sysdeps/s390/s390-64/__longjmp.c
index 030fb5b515..80abd3849a 100644
--- a/sysdeps/s390/s390-64/__longjmp.c
+++ b/sysdeps/s390/s390-64/__longjmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
 
@@ -29,35 +29,18 @@
 void
 __longjmp (__jmp_buf env, int val)
 {
-  register long int r2 __asm ("%r2") = val == 0 ? 1 : val;
-#ifdef PTR_DEMANGLE
-  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 ("ld   %%f7,104(%1)\n\t"
-		"ld   %%f5,96(%1)\n\t"
-		"ld   %%f3,88(%1)\n\t"
-		"ld   %%f1,80(%1)\n\t"
-#ifdef PTR_DEMANGLE
-		"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"
-#endif
-		: : "r" (r2),
-#ifdef PTR_DEMANGLE
-		    "r" (r1), "r" (r3)
-#else
-		    "a" (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"
+		 "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"
+                 "br   %%r14"
+                 : : "r" (val == 0 ? 1 : val),
+                 "a" (env) : "2" );
 
   /* Avoid `volatile function does return' warnings.  */
   for (;;);
 }
+