aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/mips/__longjmp.c14
-rw-r--r--sysdeps/mips/mips64/__longjmp.c15
3 files changed, 22 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index efb6796..89e9a79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-25 Maciej W. Rozycki <macro@ds2.pg.gda.pl>
+
+ * sysdeps/mips/__longjmp.c (__longjmp): Restore SP and FP last and
+ in a single asm as they may be used to access other stored
+ registers.
+ * sysdeps/mips/mips64/__longjmp.c (__longjmp): Likewise.
+
2000-11-27 Andreas Jaeger <aj@suse.de>
* rt/tst-aio.c: Mark test functions as static to avoid warnings.
diff --git a/sysdeps/mips/__longjmp.c b/sysdeps/mips/__longjmp.c
index a1920ca..66810a5 100644
--- a/sysdeps/mips/__longjmp.c
+++ b/sysdeps/mips/__longjmp.c
@@ -45,16 +45,10 @@ __longjmp (env, val_arg)
asm volatile ("l.d $f28, %0" : : "m" (env[0].__fpregs[4]));
asm volatile ("l.d $f30, %0" : : "m" (env[0].__fpregs[5]));
- /* Restore the stack pointer. */
- asm volatile ("lw $29, %0" : : "m" (env[0].__sp));
-
/* Get and reconstruct the floating point csr. */
asm volatile ("lw $2, %0" : : "m" (env[0].__fpc_csr));
asm volatile ("ctc1 $2, $31");
- /* Get the FP. */
- asm volatile ("lw $30, %0" : : "m" (env[0].__fp));
-
/* Get the GP. */
asm volatile ("lw $gp, %0" : : "m" (env[0].__gp));
@@ -71,7 +65,13 @@ __longjmp (env, val_arg)
/* Get the PC. */
asm volatile ("lw $25, %0" : : "m" (env[0].__pc));
- /* Give setjmp 1 if given a 0, or what they gave us if non-zero. */
+ /* Restore the stack pointer and the FP. They have to be restored
+ last and in a single asm as gcc, depending on options used, may
+ use either of them to access env. */
+ asm volatile ("lw $29, %0\n\t"
+ "lw $30, %1\n\t" : : "m" (env[0].__sp), "m" (env[0].__fp));
+
+/* Give setjmp 1 if given a 0, or what they gave us if non-zero. */
if (val == 0)
asm volatile ("li $2, 1");
else
diff --git a/sysdeps/mips/mips64/__longjmp.c b/sysdeps/mips/mips64/__longjmp.c
index 28fef47..3527be5 100644
--- a/sysdeps/mips/mips64/__longjmp.c
+++ b/sysdeps/mips/mips64/__longjmp.c
@@ -47,16 +47,10 @@ __longjmp (env, val_arg)
asm volatile ("l.d $f30, %0" : : "m" (env[0].__fpregs[6]));
asm volatile ("l.d $f31, %0" : : "m" (env[0].__fpregs[7]));
- /* Restore the stack pointer. */
- asm volatile ("ld $29, %0" : : "m" (env[0].__sp));
-
/* Get and reconstruct the floating point csr. */
asm volatile ("lw $2, %0" : : "m" (env[0].__fpc_csr));
asm volatile ("ctc1 $2, $31");
- /* Get the FP. */
- asm volatile ("ld $30, %0" : : "m" (env[0].__fp));
-
/* Get the GP. */
asm volatile ("ld $gp, %0" : : "m" (env[0].__gp));
@@ -73,7 +67,14 @@ __longjmp (env, val_arg)
/* Get the PC. */
asm volatile ("ld $31, %0" : : "m" (env[0].__pc));
- /* Give setjmp 1 if given a 0, or what they gave us if non-zero. */
+
+ /* Restore the stack pointer and the FP. They have to be restored
+ last and in a single asm as gcc, depending on options used, may
+ use either of them to access env. */
+ asm volatile ("ld $29, %0\n\t"
+ "ld $30, %1\n\t" : : "m" (env[0].__sp), "m" (env[0].__fp));
+
+/* Give setjmp 1 if given a 0, or what they gave us if non-zero. */
if (val == 0)
asm volatile ("dli $2, 1");
else