diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-28 00:54:02 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-02-28 00:54:02 +0000 |
| commit | 5eb1fae2a97ffc88d136502ace050662e57ef34a (patch) | |
| tree | df1087921ff9a88aa8a47ddfd55dc15a793fec56 /libc/sysdeps/linux/arm/setjmp.S | |
| parent | dc0e95c67d350ca9e950abb5f75a63833380af9f (diff) | |
| download | uClibc-alpine-5eb1fae2a97ffc88d136502ace050662e57ef34a.tar.bz2 uClibc-alpine-5eb1fae2a97ffc88d136502ace050662e57ef34a.tar.xz | |
Merge from trunk.
Diffstat (limited to 'libc/sysdeps/linux/arm/setjmp.S')
| -rw-r--r-- | libc/sysdeps/linux/arm/setjmp.S | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/libc/sysdeps/linux/arm/setjmp.S b/libc/sysdeps/linux/arm/setjmp.S index 4048d7934..dea6f5675 100644 --- a/libc/sysdeps/linux/arm/setjmp.S +++ b/libc/sysdeps/linux/arm/setjmp.S @@ -24,41 +24,38 @@ .global __sigsetjmp .type __sigsetjmp,%function -.align 4 +.align 2 __sigsetjmp: + mov ip, r0 + /* Save registers */ + stmia ip!, {v1-v6, sl, fp, sp, lr} #if defined __UCLIBC_HAS_FLOATS__ && ! defined __UCLIBC_HAS_SOFT_FLOAT__ -# ifdef __MAVERICK__ - cfstrd mvd4, [r0], #8 ; nop - cfstrd mvd5, [r0], #8 ; nop - cfstrd mvd6, [r0], #8 ; nop - cfstrd mvd7, [r0], #8 ; nop - cfstrd mvd8, [r0], #8 ; nop - cfstrd mvd9, [r0], #8 ; nop - cfstrd mvd10, [r0], #8 ; nop - cfstrd mvd11, [r0], #8 ; nop - cfstrd mvd12, [r0], #8 ; nop - cfstrd mvd13, [r0], #8 ; nop - cfstrd mvd14, [r0], #8 ; nop - cfstrd mvd15, [r0], #8 -# else - sfmea f4, 4, [r0]! -# endif -#else -# ifdef __MAVERICK__ - add r0, r0, #96 /* skip the FP registers */ +# ifdef __VFP_FP__ + /* Store the VFP registers. */ + /* Following instruction is fstmiax ip!, {d8-d15}. */ + stc p11, cr8, [r12], #68 + /* Store the floating-point status register. */ + /* Following instruction is fmrx r2, fpscr. */ + mrc p10, 7, r2, cr1, cr0, 0 + str r2, [ip], #4 +# elif defined __MAVERICK__ + cfstrd mvd4, [ip], #8 ; nop + cfstrd mvd5, [ip], #8 ; nop + cfstrd mvd6, [ip], #8 ; nop + cfstrd mvd7, [ip], #8 ; nop + cfstrd mvd8, [ip], #8 ; nop + cfstrd mvd9, [ip], #8 ; nop + cfstrd mvd10, [ip], #8 ; nop + cfstrd mvd11, [ip], #8 ; nop + cfstrd mvd12, [ip], #8 ; nop + cfstrd mvd13, [ip], #8 ; nop + cfstrd mvd14, [ip], #8 ; nop + cfstrd mvd15, [ip], #8 # else - add r0, r0, #48 /* skip the FP registers */ + sfmea f4, 4, [ip]! # endif #endif - stmia r0, {v1-v6, sl, fp, sp, lr} - - /* Restore pointer to jmp_buf */ -#ifdef __MAVERICK__ - sub r0, r0, #96 -#else - sub r0, r0, #48 -#endif /* Make a tail call to __sigjmp_save; it takes the same args. */ #ifdef __PIC__ |