OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

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.
This commit is contained in:
Andreas Jaeger 2000-11-27 14:41:40 +00:00
parent 1435536e90
commit f8028a9708
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

14
sysdeps/mips/__longjmp.c
View File

@ -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

15
sysdeps/mips/mips64/__longjmp.c
View File

@ -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