aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/mips
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2003-03-20 10:27:55 +0000
committerAlexandre Oliva <aoliva@redhat.com>2003-03-20 10:27:55 +0000
commit53fcb885017b3c01e960c0ad68616dbad61f9192 (patch)
tree40aad834f2f55e947a3ed9d23d56faab3b9278d0 /sysdeps/mips
parent7793bf7fd7409efaf9cdc8475404409d87c2c537 (diff)
downloadglibc-53fcb885017b3c01e960c0ad68616dbad61f9192.tar
glibc-53fcb885017b3c01e960c0ad68616dbad61f9192.tar.gz
glibc-53fcb885017b3c01e960c0ad68616dbad61f9192.tar.bz2
glibc-53fcb885017b3c01e960c0ad68616dbad61f9192.zip
* sysdeps/mips/bits/setjmp.h: Store all N32 and N64 registers, including pc, gp, sp and fp, as long long. * sysdeps/mips/mips64/setjmp.S: Pass gp to __sigsetjmp_aux. * sysdeps/mips/mips64/setjmp_aux.c: Adjust type of arguments. Add gp argument, and set gp in the jmpbuf to it. * sysdeps/mips/setjmp_aux.c: Revert to o32-only.
2003-03-20 Alexandre Oliva <aoliva@redhat.com> * sysdeps/mips/bits/setjmp.h: Store all N32 and N64 registers, including pc, gp, sp and fp, as long long. * sysdeps/mips/mips64/setjmp.S: Pass gp to __sigsetjmp_aux. * sysdeps/mips/mips64/setjmp_aux.c: Adjust type of arguments. Add gp argument, and set gp in the jmpbuf to it. * sysdeps/mips/setjmp_aux.c: Revert to o32-only.
Diffstat (limited to 'sysdeps/mips')
-rw-r--r--sysdeps/mips/bits/setjmp.h21
-rw-r--r--sysdeps/mips/mips64/setjmp.S3
-rw-r--r--sysdeps/mips/mips64/setjmp_aux.c7
-rw-r--r--sysdeps/mips/setjmp_aux.c36
4 files changed, 34 insertions, 33 deletions
diff --git a/sysdeps/mips/bits/setjmp.h b/sysdeps/mips/bits/setjmp.h
index fa48676445..562c13243c 100644
--- a/sysdeps/mips/bits/setjmp.h
+++ b/sysdeps/mips/bits/setjmp.h
@@ -24,6 +24,7 @@
typedef struct
{
+#if _MIPS_SIM == _MIPS_SIM_ABI32
/* Program counter. */
__ptr_t __pc;
@@ -31,17 +32,29 @@ typedef struct
__ptr_t __sp;
/* Callee-saved registers s0 through s7. */
-#if _MIPS_SIM == _MIPS_SIM_ABI32
int __regs[8];
-#else
- __extension__ long long __regs[8];
-#endif
/* The frame pointer. */
__ptr_t __fp;
/* The global pointer. */
__ptr_t __gp;
+#else
+ /* Program counter. */
+ __extension__ long long __pc;
+
+ /* Stack pointer. */
+ __extension__ long long __sp;
+
+ /* Callee-saved registers s0 through s7. */
+ __extension__ long long __regs[8];
+
+ /* The frame pointer. */
+ __extension__ long long __fp;
+
+ /* The global pointer. */
+ __extension__ long long __gp;
+#endif
/* Floating point status register. */
int __fpc_csr;
diff --git a/sysdeps/mips/mips64/setjmp.S b/sysdeps/mips/mips64/setjmp.S
index 3d2bf20e7c..d566921a87 100644
--- a/sysdeps/mips/mips64/setjmp.S
+++ b/sysdeps/mips/mips64/setjmp.S
@@ -37,5 +37,8 @@ ENTRY (__sigsetjmp)
nop
#endif
RESTORE_GP64
+#if _MIPS_SIM != _MIPS_SIM_ABI32
+ move a4, gp
+#endif
jr t9
.end __sigsetjmp
diff --git a/sysdeps/mips/mips64/setjmp_aux.c b/sysdeps/mips/mips64/setjmp_aux.c
index 6d1c9390bb..db75a21a30 100644
--- a/sysdeps/mips/mips64/setjmp_aux.c
+++ b/sysdeps/mips/mips64/setjmp_aux.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Brendan Kehoe (brendan@zen.org).
@@ -25,7 +25,8 @@
access them in C. */
int
-__sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp)
+__sigsetjmp_aux (jmp_buf env, int savemask, long long sp, long long fp,
+ long long gp)
{
/* Store the floating point callee-saved registers... */
asm volatile ("s.d $f24, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[0]));
@@ -47,7 +48,7 @@ __sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp)
env[0].__jmpbuf[0].__fp = fp;
/* .. and the GP; */
- asm volatile ("sd $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp));
+ env[0].__jmpbuf[0].__gp = gp;
/* .. and the callee-saved registers; */
asm volatile ("sd $16, %0" : : "m" (env[0].__jmpbuf[0].__regs[0]));
diff --git a/sysdeps/mips/setjmp_aux.c b/sysdeps/mips/setjmp_aux.c
index 9e6766f949..7125cc4f81 100644
--- a/sysdeps/mips/setjmp_aux.c
+++ b/sysdeps/mips/setjmp_aux.c
@@ -18,11 +18,6 @@
02111-1307 USA. */
#include <setjmp.h>
-#include <sys/asm.h>
-
-#define STRINGXP(X) __STRING(X)
-#define REGS STRINGXP(REG_S)
-#define PTRS STRINGXP(PTR_S)
/* This function is only called via the assembly language routine
__sigsetjmp, which arranges to pass in the stack pointer and the frame
@@ -33,26 +28,15 @@ int
__sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp)
{
/* Store the floating point callee-saved registers... */
-#if _MIPS_SIM == _MIPS_SIM_ABI32
asm volatile ("s.d $f20, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[0]));
asm volatile ("s.d $f22, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[1]));
asm volatile ("s.d $f24, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[2]));
asm volatile ("s.d $f26, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[3]));
asm volatile ("s.d $f28, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[4]));
asm volatile ("s.d $f30, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[5]));
-#else
- asm volatile ("s.d $f24, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[0]));
- asm volatile ("s.d $f25, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[1]));
- asm volatile ("s.d $f26, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[2]));
- asm volatile ("s.d $f27, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[3]));
- asm volatile ("s.d $f28, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[4]));
- asm volatile ("s.d $f29, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[5]));
- asm volatile ("s.d $f30, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[6]));
- asm volatile ("s.d $f31, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[7]));
-#endif
/* .. and the PC; */
- asm volatile (PTRS " $31, %0" : : "m" (env[0].__jmpbuf[0].__pc));
+ asm volatile ("sw $31, %0" : : "m" (env[0].__jmpbuf[0].__pc));
/* .. and the stack pointer; */
env[0].__jmpbuf[0].__sp = (void *) sp;
@@ -61,17 +45,17 @@ __sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp)
env[0].__jmpbuf[0].__fp = (void *) fp;
/* .. and the GP; */
- asm volatile (PTRS " $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp));
+ asm volatile ("sw $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp));
/* .. and the callee-saved registers; */
- asm volatile (REGS " $16, %0" : : "m" (env[0].__jmpbuf[0].__regs[0]));
- asm volatile (REGS " $17, %0" : : "m" (env[0].__jmpbuf[0].__regs[1]));
- asm volatile (REGS " $18, %0" : : "m" (env[0].__jmpbuf[0].__regs[2]));
- asm volatile (REGS " $19, %0" : : "m" (env[0].__jmpbuf[0].__regs[3]));
- asm volatile (REGS " $20, %0" : : "m" (env[0].__jmpbuf[0].__regs[4]));
- asm volatile (REGS " $21, %0" : : "m" (env[0].__jmpbuf[0].__regs[5]));
- asm volatile (REGS " $22, %0" : : "m" (env[0].__jmpbuf[0].__regs[6]));
- asm volatile (REGS " $23, %0" : : "m" (env[0].__jmpbuf[0].__regs[7]));
+ asm volatile ("sw $16, %0" : : "m" (env[0].__jmpbuf[0].__regs[0]));
+ asm volatile ("sw $17, %0" : : "m" (env[0].__jmpbuf[0].__regs[1]));
+ asm volatile ("sw $18, %0" : : "m" (env[0].__jmpbuf[0].__regs[2]));
+ asm volatile ("sw $19, %0" : : "m" (env[0].__jmpbuf[0].__regs[3]));
+ asm volatile ("sw $20, %0" : : "m" (env[0].__jmpbuf[0].__regs[4]));
+ asm volatile ("sw $21, %0" : : "m" (env[0].__jmpbuf[0].__regs[5]));
+ asm volatile ("sw $22, %0" : : "m" (env[0].__jmpbuf[0].__regs[6]));
+ asm volatile ("sw $23, %0" : : "m" (env[0].__jmpbuf[0].__regs[7]));
/* .. and finally get and reconstruct the floating point csr. */
asm ("cfc1 %0, $31" : "=r" (env[0].__jmpbuf[0].__fpc_csr));