powerpc/math-emu: Use kernel generic math-emu code
PATCH v2 1/1 powerpc/math-emu: Use kernel generic math-emu code
The math emulation code is centered around a set of generic macros that provide the core of the emulation that are shared by the various architectures and other projects (like glibc). Each arch implements its own sfp-machine.h to specific various arch specific details.
For historic reasons that are now lost the powerpc math-emu code had its own version of the common headers. This moves us to using the kernel generic version and thus getting fixes when those are updated.
Also cleaned up exception/error reporting from the FP emulation functions.
---
With a better commit message, no code changes.
- k
.../{math-emu => include/asm}/sfp-machine.h | 114 ++--
arch/powerpc/math-emu/Makefile | 7 +-
arch/powerpc/math-emu/double.h | 129 ----
arch/powerpc/math-emu/fadd.c | 17 +-
arch/powerpc/math-emu/fadds.c | 20 +-
arch/powerpc/math-emu/fcmpo.c | 10 +-
arch/powerpc/math-emu/fcmpu.c | 10 +-
arch/powerpc/math-emu/fctiw.c | 8 +-
arch/powerpc/math-emu/fctiwz.c | 8 +-
arch/powerpc/math-emu/fdiv.c | 14 +-
arch/powerpc/math-emu/fdivs.c | 16 +-
arch/powerpc/math-emu/fmadd.c | 16 +-
arch/powerpc/math-emu/fmadds.c | 18 +-
arch/powerpc/math-emu/fmsub.c | 16 +-
arch/powerpc/math-emu/fmsubs.c | 18 +-
arch/powerpc/math-emu/fmul.c | 14 +-
arch/powerpc/math-emu/fmuls.c | 16 +-
arch/powerpc/math-emu/fnmadd.c | 16 +-
arch/powerpc/math-emu/fnmadds.c | 18 +-
arch/powerpc/math-emu/fnmsub.c | 16 +-
arch/powerpc/math-emu/fnmsubs.c | 18 +-
arch/powerpc/math-emu/frsp.c | 14 +-
arch/powerpc/math-emu/fsel.c | 8 +-
arch/powerpc/math-emu/fsqrt.c | 12 +-
arch/powerpc/math-emu/fsqrts.c | 14 +-
arch/powerpc/math-emu/fsub.c | 14 +-
arch/powerpc/math-emu/fsubs.c | 16 +-
arch/powerpc/math-emu/lfd.c | 4 +-
arch/powerpc/math-emu/lfs.c | 19 +-
arch/powerpc/math-emu/math.c | 8 +-
arch/powerpc/math-emu/mcrfs.c | 3 +-
arch/powerpc/math-emu/mffs.c | 3 +-
arch/powerpc/math-emu/mtfsb0.c | 3 +-
arch/powerpc/math-emu/mtfsb1.c | 3 +-
arch/powerpc/math-emu/mtfsf.c | 20 +-
arch/powerpc/math-emu/mtfsfi.c | 3 +-
arch/powerpc/math-emu/op-1.h | 245 -------
arch/powerpc/math-emu/op-2.h | 434 ------------
arch/powerpc/math-emu/op-4.h | 317 ---------
arch/powerpc/math-emu/op-common.h | 688 --------------------
arch/powerpc/math-emu/single.h | 66 --
arch/powerpc/math-emu/soft-fp.h | 104 ---
arch/powerpc/math-emu/stfs.c | 19 +-
arch/powerpc/math-emu/types.c | 51 --
arch/powerpc/math-emu/udivmodti4.c | 2 +-
45 files changed, 323 insertions(+), 2266 deletions(-)
rename arch/powerpc/{math-emu => include/asm}/sfp-machine.h (83%)
delete mode 100644 arch/powerpc/math-emu/double.h
delete mode 100644 arch/powerpc/math-emu/op-1.h
delete mode 100644 arch/powerpc/math-emu/op-2.h
delete mode 100644 arch/powerpc/math-emu/op-4.h
delete mode 100644 arch/powerpc/math-emu/op-common.h
delete mode 100644 arch/powerpc/math-emu/single.h
delete mode 100644 arch/powerpc/math-emu/soft-fp.h
delete mode 100644 arch/powerpc/math-emu/types.carch/powerpc/include/asm/sfp-machine.h renamed from arch/powerpc/math-emu/sfp-machine.h +45 -69
@@ -79,27 +79,44 @@* #define _FP_DIV_MEAT_D(R,X,Y) _FP_DIV_MEAT_2_udiv_64(D,R,X,Y) */ -#define _FP_MUL_MEAT_S (R ,X ,Y ) _FP_MUL_MEAT_1_wide(S,R,X,Y,umul_ppmm) -#define _FP_MUL_MEAT_D (R ,X ,Y ) _FP_MUL_MEAT_2_wide(D,R,X,Y,umul_ppmm) +#define _FP_MUL_MEAT_S (R ,X ,Y ) _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm) +#define _FP_MUL_MEAT_D (R ,X ,Y ) _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm) -#define _FP_DIV_MEAT_S (R ,X ,Y ) _FP_DIV_MEAT_1_udiv(S,R,X,Y) -#define _FP_DIV_MEAT_D (R ,X ,Y ) _FP_DIV_MEAT_2_udiv_64(D,R,X,Y) +#define _FP_DIV_MEAT_S (R ,X ,Y ) _FP_DIV_MEAT_1_udiv(S,R,X,Y) +#define _FP_DIV_MEAT_D (R ,X ,Y ) _FP_DIV_MEAT_2_udiv(D,R,X,Y)/* These macros define what NaN looks like. They're supposed to expand to * a comma-separated set of 32bit unsigned ints that encode NaN. */ -#define _FP_NANFRAC_S _FP_QNANBIT_S -#define _FP_NANFRAC_D _FP_QNANBIT_D, 0 -#define _FP_NANFRAC_Q _FP_QNANBIT_Q, 0, 0, 0 +#define _FP_NANFRAC_S ((_FP_QNANBIT_S << 1) - 1) +#define _FP_NANFRAC_D ((_FP_QNANBIT_D << 1) - 1), -1 +#define _FP_NANFRAC_Q ((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1 +#define _FP_NANSIGN_S 0 +#define _FP_NANSIGN_D 0 +#define _FP_NANSIGN_Q 0#define _FP_KEEPNANFRACP 1 +/* Exception flags. We use the bit positions of the appropriate bits +in the FPSCR, which also correspond to the FE_* bits. This makes +everything easier ;-). */ +#define FP_EX_INVALID (1 << (31 - 2)) +#define FP_EX_INVALID_SNAN EFLAG_VXSNAN +#define FP_EX_INVALID_ISI EFLAG_VXISI +#define FP_EX_INVALID_IDI EFLAG_VXIDI +#define FP_EX_INVALID_ZDZ EFLAG_VXZDZ +#define FP_EX_INVALID_IMZ EFLAG_VXIMZ +#define FP_EX_OVERFLOW (1 << (31 - 3)) +#define FP_EX_UNDERFLOW (1 << (31 - 4)) +#define FP_EX_DIVZERO (1 << (31 - 5)) +#define FP_EX_INEXACT (1 << (31 - 6)) +/* This macro appears to be called when both X and Y are NaNs, and * has to choose one and copy it to R. i386 goes for the larger of the * two, sparc64 just picks Y. I don't understand this at all so I'll * go with sparc64 because it's shorter :-> -- PMM */ -#define _FP_CHOOSENAN (fs, wc,R ,X ,Y ) \ +#define _FP_CHOOSENAN (fs, wc,R ,X ,Y ,OP ) \ do { \ R##_s = Y##_s; \ _FP_FRAC_COPY_##wc(R,Y); \
@@ -107,62 +124,6 @@ } while (0) -extern void fp_unpack_d(long *, unsigned long *, unsigned long *, -long *,long *,void *); -extern int fp_pack_d (void *,long ,unsigned long ,unsigned long ,long ,long ); -extern int fp_pack_ds (void *,long ,unsigned long ,unsigned long ,long ,long ); - -#define __FP_UNPACK_RAW_1 (fs,X , val) \ - do { \ - union _FP_UNION_##fs *_flo = \ - (union _FP_UNION_##fs *)val; \ - \ - X##_f = _flo->bits.frac; \ - X##_e = _flo->bits.exp; \ - X##_s = _flo->bits.sign; \ - } while (0) - -#define __FP_UNPACK_RAW_2 (fs,X , val) \ - do { \ - union _FP_UNION_##fs *_flo = \ - (union _FP_UNION_##fs *)val; \ - \ - X##_f0 = _flo->bits.frac0; \ - X##_f1 = _flo->bits.frac1; \ - X##_e = _flo->bits.exp; \ - X##_s = _flo->bits.sign; \ - } while (0) - -#define __FP_UNPACK_S (X ,val) \ - do { \ - __FP_UNPACK_RAW_1(S,X,val); \ - _FP_UNPACK_CANONICAL(S,1,X); \ - } while (0) - -#define __FP_UNPACK_D (X ,val) \ - fp_unpack_d(&X##_s, &X##_f1, &X##_f0, &X##_e, &X##_c, val) - -#define __FP_PACK_RAW_1 (fs, val,X ) \ - do { \ - union _FP_UNION_##fs *_flo = \ - (union _FP_UNION_##fs *)val; \ - \ - _flo->bits.frac = X##_f; \ - _flo->bits.exp = X##_e; \ - _flo->bits.sign = X##_s; \ - } while (0) - -#define __FP_PACK_RAW_2 (fs, val,X ) \ - do { \ - union _FP_UNION_##fs *_flo = \ - (union _FP_UNION_##fs *)val; \ - \ - _flo->bits.frac0 = X##_f0; \ - _flo->bits.frac1 = X##_f1; \ - _flo->bits.exp = X##_e; \ - _flo->bits.sign = X##_s; \ - } while (0) -#include <linux/kernel.h> #include <linux/sched.h>
@@ -182,15 +143,30 @@ extern int fp_pack_ds(void *, long, unsigned long, unsigned long, long, long);#define __FP_PACK_S (val,X ) \ ({ int __exc = _FP_PACK_CANONICAL(S,1,X); \ if(!__exc || !__FPU_TRAP_P(__exc)) \ - __FP_PACK_RAW_1(S,val,X); \ + _FP_PACK_RAW_1_P(S,val,X); \ __exc; \ })#define __FP_PACK_D (val,X ) \ - fp_pack_d(val, X##_s, X##_f1, X##_f0, X##_e, X##_c) - -#define __FP_PACK_DS (val,X ) \ - fp_pack_ds(val, X##_s, X##_f1, X##_f0, X##_e, X##_c) + do { \ + _FP_PACK_CANONICAL(D, 2, X); \ + if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS)) \ + _FP_PACK_RAW_2_P(D, val, X); \ + } while (0) + +#define __FP_PACK_DS (val,X ) \ + do { \ + FP_DECL_S(__X); \ + FP_CONV(S, D, 1, 2, __X, X); \ + _FP_PACK_CANONICAL(S, 1, __X); \ + if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS)) { \ + _FP_UNPACK_CANONICAL(S, 1, __X); \ + FP_CONV(D, S, 2, 1, X, __X); \ + _FP_PACK_CANONICAL(D, 2, X); \ + if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS)) \ + _FP_PACK_RAW_2_P(D, val, X); \ + } \ + } while (0)/* Obtain the current rounding mode. */ #define FP_ROUNDMODE \
arch/powerpc/math-emu/Makefile +4 -3
@@ -4,13 +4,14 @@ obj-y := math.o fmr.o lfd.o stfd.o obj-$(CONFIG_MATH_EMULATION) += fabs.o fadd.o fadds.o fcmpo.o fcmpu.o \ fctiw.o fctiwz.o fdiv.o fdivs.o \ fmadd.o fmadds.o fmsub.o fmsubs.o \ - fmul.o fmuls.o fnabs.o fneg.o types.o \ + fmul.o fmuls.o fnabs.o fneg.o \ fnmadd.o fnmadds.o fnmsub.o fnmsubs.o \ fres.o frsp.o frsqrte.o fsel.o lfs.o \ fsqrt.o fsqrts.o fsub.o fsubs.o \ mcrfs.o mffs.o mtfsb0.o mtfsb1.o \ - mtfsf.o mtfsfi.o stfiwx.o stfs.o \ - udivmodti4.o + mtfsf.o mtfsfi.o stfiwx.o stfs.o CFLAGS_fabs.o = -fno-builtin-fabs CFLAGS_math.o = -fno-builtin-fabs + +EXTRA_CFLAGS = -I. -Iinclude/math-emu -w
arch/powerpc/math-emu/double.h deleted +0 -129
129 lines not on this page · raw message
arch/powerpc/math-emu/fadd.c +9 -8
@@ -2,8 +2,9 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fadd (void *frD,void *frA,void *frB)
@@ -11,28 +12,28 @@ fadd(void *frD, void *frA, void *frB)FP_DECL_D (A );FP_DECL_D (B );FP_DECL_D (R ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p\n" , __func__, frD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);printk ("B: %ld %lu %lu %ld (%ld)\n" , B_s, B_f1, B_f0, B_e, B_c);#endif -if (A_s != B_s && A_c ==FP_CLS_INF && B_c ==FP_CLS_INF ) - ret |=EFLAG_VXISI ; -FP_ADD_D (R ,A ,B );#ifdef DEBUG printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_D (frD,R )); +__FP_PACK_D (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fadds.c +10 -10
@@ -2,9 +2,10 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int fadds (void *frD,void *frA,void *frB)
@@ -12,28 +13,27 @@ fadds(void *frD, void *frA, void *frB)FP_DECL_D (A );FP_DECL_D (B );FP_DECL_D (R ); -int ret =0 ; +FP_DECL_EX ;#ifdef DEBUG printk ("%s: %p %p %p\n" , __func__, frD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);printk ("B: %ld %lu %lu %ld (%ld)\n" , B_s, B_f1, B_f0, B_e, B_c);#endif -if (A_s != B_s && A_c ==FP_CLS_INF && B_c ==FP_CLS_INF ) - ret |=EFLAG_VXISI ; -FP_ADD_D (R ,A ,B );#ifdef DEBUG printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_DS (frD,R )); +__FP_PACK_DS (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fcmpo.c +6 -4
@@ -2,14 +2,16 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fcmpo (u32 *ccr,int crfD,void *frA,void *frB) {FP_DECL_D (A );FP_DECL_D (B ); +FP_DECL_EX ;int code[4 ] = { (1 <<3 ), (1 <<1 ), (1 <<2 ), (1 <<0 ) };long cmp;int ret =0 ;
@@ -18,8 +20,8 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB)printk ("%s: %p (%08x) %d %p %p\n" , __func__, ccr, *ccr, crfD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
arch/powerpc/math-emu/fcmpu.c +6 -4
@@ -2,14 +2,16 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fcmpu (u32 *ccr,int crfD,void *frA,void *frB) {FP_DECL_D (A );FP_DECL_D (B ); +FP_DECL_EX ;int code[4 ] = { (1 <<3 ), (1 <<1 ), (1 <<2 ), (1 <<0 ) };long cmp;
@@ -17,8 +19,8 @@ fcmpu(u32 *ccr, int crfD, void *frA, void *frB)printk ("%s: %p (%08x) %d %p %p\n" , __func__, ccr, *ccr, crfD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
arch/powerpc/math-emu/fctiw.c +5 -3
@@ -2,16 +2,18 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fctiw (u32 *frD,void *frB) {FP_DECL_D (B ); +FP_DECL_EX ;unsigned int r; -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (B , frB);FP_TO_INT_D (r,B ,32 ,1 ); frD[1 ] = r;
arch/powerpc/math-emu/fctiwz.c +5 -3
@@ -2,13 +2,15 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fctiwz (u32 *frD,void *frB) {FP_DECL_D (B ); +FP_DECL_EX ;u32 fpscr;unsigned int r;
@@ -16,7 +18,7 @@ fctiwz(u32 *frD, void *frB) __FPU_FPSCR &= ~(3 ); __FPU_FPSCR |=FP_RND_ZERO ; -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (B , frB);FP_TO_INT_D (r,B ,32 ,1 ); frD[1 ] = r;
arch/powerpc/math-emu/fdiv.c +9 -5
@@ -2,8 +2,9 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fdiv (void *frD,void *frA,void *frB)
@@ -11,14 +12,15 @@ fdiv(void *frD, void *frA, void *frB)FP_DECL_D (A );FP_DECL_D (B );FP_DECL_D (R ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p\n" , __func__, frD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -49,5 +51,7 @@ fdiv(void *frD, void *frA, void *frB)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_D (frD,R )); +__FP_PACK_D (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fdivs.c +10 -6
@@ -2,9 +2,10 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int fdivs (void *frD,void *frA,void *frB)
@@ -12,14 +13,15 @@ fdivs(void *frD, void *frA, void *frB)FP_DECL_D (A );FP_DECL_D (B );FP_DECL_D (R ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p\n" , __func__, frD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -51,5 +53,7 @@ fdivs(void *frD, void *frA, void *frB)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_DS (frD,R )); +__FP_PACK_DS (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fmadd.c +10 -6
@@ -2,8 +2,9 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fmadd (void *frD,void *frA,void *frB,void *frC)
@@ -13,15 +14,16 @@ fmadd(void *frD, void *frA, void *frB, void *frC)FP_DECL_D (B );FP_DECL_D (C );FP_DECL_D (T ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frA, frB, frC);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); -__FP_UNPACK_D (C , frC); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB); +FP_UNPACK_DP (C , frC);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -44,5 +46,7 @@ fmadd(void *frD, void *frA, void *frB, void *frC)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_D (frD,R )); +__FP_PACK_D (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fmadds.c +11 -7
@@ -2,9 +2,10 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int fmadds (void *frD,void *frA,void *frB,void *frC)
@@ -14,15 +15,16 @@ fmadds(void *frD, void *frA, void *frB, void *frC)FP_DECL_D (B );FP_DECL_D (C );FP_DECL_D (T ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frA, frB, frC);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); -__FP_UNPACK_D (C , frC); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB); +FP_UNPACK_DP (C , frC);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -45,5 +47,7 @@ fmadds(void *frD, void *frA, void *frB, void *frC)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_DS (frD,R )); +__FP_PACK_DS (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fmsub.c +10 -6
@@ -2,8 +2,9 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fmsub (void *frD,void *frA,void *frB,void *frC)
@@ -13,15 +14,16 @@ fmsub(void *frD, void *frA, void *frB, void *frC)FP_DECL_D (B );FP_DECL_D (C );FP_DECL_D (T ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frA, frB, frC);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); -__FP_UNPACK_D (C , frC); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB); +FP_UNPACK_DP (C , frC);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -47,5 +49,7 @@ fmsub(void *frD, void *frA, void *frB, void *frC)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_D (frD,R )); +__FP_PACK_D (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fmsubs.c +11 -7
@@ -2,9 +2,10 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int fmsubs (void *frD,void *frA,void *frB,void *frC)
@@ -14,15 +15,16 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)FP_DECL_D (B );FP_DECL_D (C );FP_DECL_D (T ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frA, frB, frC);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); -__FP_UNPACK_D (C , frC); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB); +FP_UNPACK_DP (C , frC);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -48,5 +50,7 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_DS (frD,R )); +__FP_PACK_DS (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fmul.c +9 -5
@@ -2,8 +2,9 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fmul (void *frD,void *frA,void *frB)
@@ -11,14 +12,15 @@ fmul(void *frD, void *frA, void *frB)FP_DECL_D (A );FP_DECL_D (B );FP_DECL_D (R ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p\n" , __func__, frD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
@@ -38,5 +40,7 @@ fmul(void *frD, void *frA, void *frB) R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);#endif -return (ret |__FP_PACK_D (frD,R )); +__FP_PACK_D (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fmuls.c +10 -6
@@ -2,9 +2,10 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int fmuls (void *frD,void *frA,void *frB)
@@ -12,14 +13,15 @@ fmuls(void *frD, void *frA, void *frB)FP_DECL_D (A );FP_DECL_D (B );FP_DECL_D (R ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p\n" , __func__, frD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
@@ -39,5 +41,7 @@ fmuls(void *frD, void *frA, void *frB) R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);#endif -return (ret |__FP_PACK_DS (frD,R )); +__FP_PACK_DS (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fnmadd.c +10 -6
@@ -2,8 +2,9 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fnmadd (void *frD,void *frA,void *frB,void *frC)
@@ -13,15 +14,16 @@ fnmadd(void *frD, void *frA, void *frB, void *frC)FP_DECL_D (B );FP_DECL_D (C );FP_DECL_D (T ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frA, frB, frC);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); -__FP_UNPACK_D (C , frC); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB); +FP_UNPACK_DP (C , frC);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -47,5 +49,7 @@ fnmadd(void *frD, void *frA, void *frB, void *frC)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_D (frD,R )); +__FP_PACK_D (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fnmadds.c +11 -7
@@ -2,9 +2,10 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int fnmadds (void *frD,void *frA,void *frB,void *frC)
@@ -14,15 +15,16 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)FP_DECL_D (B );FP_DECL_D (C );FP_DECL_D (T ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frA, frB, frC);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); -__FP_UNPACK_D (C , frC); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB); +FP_UNPACK_DP (C , frC);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -48,5 +50,7 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_DS (frD,R )); +__FP_PACK_DS (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fnmsub.c +10 -6
@@ -2,8 +2,9 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fnmsub (void *frD,void *frA,void *frB,void *frC)
@@ -13,15 +14,16 @@ fnmsub(void *frD, void *frA, void *frB, void *frC)FP_DECL_D (B );FP_DECL_D (C );FP_DECL_D (T ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frA, frB, frC);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); -__FP_UNPACK_D (C , frC); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB); +FP_UNPACK_DP (C , frC);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -50,5 +52,7 @@ fnmsub(void *frD, void *frA, void *frB, void *frC)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_D (frD,R )); +__FP_PACK_D (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fnmsubs.c +11 -7
@@ -2,9 +2,10 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int fnmsubs (void *frD,void *frA,void *frB,void *frC)
@@ -14,15 +15,16 @@ fnmsubs(void *frD, void *frA, void *frB, void *frC)FP_DECL_D (B );FP_DECL_D (C );FP_DECL_D (T ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frA, frB, frC);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); -__FP_UNPACK_D (C , frC); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB); +FP_UNPACK_DP (C , frC);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -51,5 +53,7 @@ fnmsubs(void *frD, void *frA, void *frB, void *frC)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_DS (frD,R )); +__FP_PACK_DS (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/frsp.c +9 -5
@@ -2,24 +2,28 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int frsp (void *frD,void *frB) {FP_DECL_D (B ); +FP_DECL_EX ;#ifdef DEBUG printk ("%s: D %p, B %p\n" , __func__, frD, frB);#endif -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("B: %ld %lu %lu %ld (%ld)\n" , B_s, B_f1, B_f0, B_e, B_c);#endif -return __FP_PACK_DS (frD,B ); +__FP_PACK_DS (frD,B ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fsel.c +5 -3
@@ -2,19 +2,21 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fsel (u32 *frD,void *frA,u32 *frB,u32 *frC) {FP_DECL_D (A ); +FP_DECL_EX ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frA, frB, frC);#endif -__FP_UNPACK_D (A , frA); +FP_UNPACK_DP (A , frA);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
arch/powerpc/math-emu/fsqrt.c +8 -4
@@ -2,21 +2,23 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fsqrt (void *frD,void *frB) {FP_DECL_D (B );FP_DECL_D (R ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frB);#endif -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("B: %ld %lu %lu %ld (%ld)\n" , B_s, B_f1, B_f0, B_e, B_c);
@@ -33,5 +35,7 @@ fsqrt(void *frD, void *frB)printk ("R: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_D (frD,R )); +__FP_PACK_D (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fsqrts.c +9 -5
@@ -2,22 +2,24 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int fsqrts (void *frD,void *frB) {FP_DECL_D (B );FP_DECL_D (R ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p %p\n" , __func__, frD, frB);#endif -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("B: %ld %lu %lu %ld (%ld)\n" , B_s, B_f1, B_f0, B_e, B_c);
@@ -34,5 +36,7 @@ fsqrts(void *frD, void *frB)printk ("R: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_DS (frD,R )); +__FP_PACK_DS (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fsub.c +9 -5
@@ -2,8 +2,9 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> int fsub (void *frD,void *frA,void *frB)
@@ -11,14 +12,15 @@ fsub(void *frD, void *frA, void *frB)FP_DECL_D (A );FP_DECL_D (B );FP_DECL_D (R ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p\n" , __func__, frD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -37,5 +39,7 @@ fsub(void *frD, void *frA, void *frB)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_D (frD,R )); +__FP_PACK_D (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/fsubs.c +10 -6
@@ -2,9 +2,10 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int fsubs (void *frD,void *frA,void *frB)
@@ -12,14 +13,15 @@ fsubs(void *frD, void *frA, void *frB)FP_DECL_D (A );FP_DECL_D (B );FP_DECL_D (R ); +FP_DECL_EX ;int ret =0 ;#ifdef DEBUG printk ("%s: %p %p %p\n" , __func__, frD, frA, frB);#endif -__FP_UNPACK_D (A , frA); -__FP_UNPACK_D (B , frB); +FP_UNPACK_DP (A , frA); +FP_UNPACK_DP (B , frB);#ifdef DEBUG printk ("A: %ld %lu %lu %ld (%ld)\n" , A_s, A_f1, A_f0, A_e, A_c);
@@ -38,5 +40,7 @@ fsubs(void *frD, void *frA, void *frB)printk ("D: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return (ret |__FP_PACK_DS (frD,R )); +__FP_PACK_DS (frD,R ); + +return FP_CUR_EXCEPTIONS ; }
arch/powerpc/math-emu/lfd.c +2 -2
@@ -2,8 +2,8 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "sfp-machine.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/double.h> int lfd (void *frD,void *ea)
arch/powerpc/math-emu/lfs.c +14 -5
@@ -2,15 +2,17 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" -#include "double.h" -#include "single.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> +#include <math-emu/double.h> +#include <math-emu/single.h> int lfs (void *frD,void *ea) {FP_DECL_D (R );FP_DECL_S (A ); +FP_DECL_EX ;float f;#ifdef DEBUG
@@ -20,7 +22,7 @@ lfs(void *frD, void *ea)if (copy_from_user (&f, ea,sizeof (float )))return -EFAULT ; -__FP_UNPACK_S (A , &f); +FP_UNPACK_S (A , f);#ifdef DEBUG printk("A: %ld %lu %ld (%ld) [%08lx]\n", A_s, A_f, A_e, A_c,
@@ -33,5 +35,12 @@ lfs(void *frD, void *ea)printk ("R: %ld %lu %lu %ld (%ld)\n" , R_s, R_f1, R_f0, R_e, R_c);#endif -return __FP_PACK_D (frD,R ); +if (R_c ==FP_CLS_NAN ) { + R_e = _FP_EXPMAX_D; +_FP_PACK_RAW_2_P (D , frD,R ); + }else { +__FP_PACK_D (frD,R ); + } + +return 0 ; }
arch/powerpc/math-emu/math.c +5 -3
@@ -8,8 +8,8 @@#include <asm/uaccess.h> #include <asm/reg.h> -#include "sfp-machine.h" -#include "double.h" +#include <asm/sfp-machine.h> +#include <math-emu/double.h> #define FLOATFUNC (x) extern int x(void *, void *, void *, void *)
@@ -168,6 +168,8 @@ record_exception(struct pt_regs *regs, int eflag) fpscr |=FPSCR_ZX ;if (eflag &EFLAG_INEXACT ) fpscr |=FPSCR_XX ; +if (eflag &EFLAG_INVALID ) + fpscr |=FPSCR_VX ;if (eflag &EFLAG_VXSNAN ) fpscr |=FPSCR_VXSNAN ;if (eflag &EFLAG_VXISI )
@@ -188,7 +190,7 @@ record_exception(struct pt_regs *regs, int eflag) fpscr |=FPSCR_VXCVI ; } - fpscr &= ~(FPSCR_VX ); +// fpscr &= ~(FPSCR_VX); if (fpscr & (FPSCR_VXSNAN |FPSCR_VXISI |FPSCR_VXIDI |FPSCR_VXZDZ |FPSCR_VXIMZ |FPSCR_VXVC |FPSCR_VXSOFT |FPSCR_VXSQRT |FPSCR_VXCVI ))
arch/powerpc/math-emu/mcrfs.c +2 -1
@@ -2,7 +2,8 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> int mcrfs (u32 *ccr,u32 crfD,u32 crfS)
arch/powerpc/math-emu/mffs.c +2 -1
@@ -2,7 +2,8 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> int mffs (u32 *frD)
arch/powerpc/math-emu/mtfsb0.c +2 -1
@@ -2,7 +2,8 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> int mtfsb0 (int crbD)
arch/powerpc/math-emu/mtfsb1.c +2 -1
@@ -2,7 +2,8 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> int mtfsb1 (int crbD)
arch/powerpc/math-emu/mtfsf.c +19 -1
@@ -2,12 +2,14 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> int mtfsf (unsigned int FM ,u32 *frB) {u32 mask; +u32 fpscr;if (FM ==0 )return 0 ;
@@ -37,6 +39,22 @@ mtfsf(unsigned int FM, u32 *frB) __FPU_FPSCR &= ~(mask); __FPU_FPSCR |= (frB[1 ] & mask); + __FPU_FPSCR &= ~(FPSCR_VX ); +if (__FPU_FPSCR & (FPSCR_VXSNAN |FPSCR_VXISI |FPSCR_VXIDI | +FPSCR_VXZDZ |FPSCR_VXIMZ |FPSCR_VXVC | +FPSCR_VXSOFT |FPSCR_VXSQRT |FPSCR_VXCVI )) + __FPU_FPSCR |=FPSCR_VX ; + + fpscr = __FPU_FPSCR; + fpscr &= ~(FPSCR_FEX ); +if (((fpscr &FPSCR_VX ) && (fpscr &FPSCR_VE )) || + ((fpscr &FPSCR_OX ) && (fpscr &FPSCR_OE )) || + ((fpscr &FPSCR_UX ) && (fpscr &FPSCR_UE )) || + ((fpscr &FPSCR_ZX ) && (fpscr &FPSCR_ZE )) || + ((fpscr &FPSCR_XX ) && (fpscr &FPSCR_XE ))) + fpscr |=FPSCR_FEX ; + __FPU_FPSCR = fpscr; +#ifdef DEBUG printk ("%s: %02x %p: %08lx\n" , __func__,FM , frB, __FPU_FPSCR);#endif
arch/powerpc/math-emu/mtfsfi.c +2 -1
@@ -2,7 +2,8 @@#include <linux/errno.h> #include <asm/uaccess.h> -#include "soft-fp.h" +#include <asm/sfp-machine.h> +#include <math-emu/soft-fp.h> int mtfsfi (unsigned int crfD,unsigned int IMM )
arch/powerpc/math-emu/op-1.h deleted +0 -245
245 lines not on this page · raw message
arch/powerpc/math-emu/op-2.h deleted +0 -434
434 lines not on this page · raw message
arch/powerpc/math-emu/op-4.h deleted +0 -317
317 lines not on this page · raw message
arch/powerpc/math-emu/op-common.h deleted +0 -688
688 lines not on this page · raw message
arch/powerpc/math-emu/single.h deleted +0 -66
7 lines not on this page · raw message
arch/powerpc/math-emu/soft-fp.h deleted +0 -104
104 lines not on this page · raw message
arch/powerpc/math-emu/types.c deleted +0 -51
51 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.5.5.1
Part of the diff is not shown here. View the raw message.
Quoted 9 lines · Kumar Gala
The math emulation code is centered around a set of generic macros that provide the core of the emulation that are shared by the various architectures and other projects (like glibc). Each arch implements its own
sfp-machine.hto specific various arch specific details.For historic reasons that are now lost the powerpc math-emu code had its own version of the common headers. This moves us to using the kernel generic version and thus getting fixes when those are updated.
Quoted 8 lines
Also cleaned up exception/error reporting from the FP emulation functions.
Signed-off-by Kumar Gala <[email protected]>---
With a better commit message, no code changes.
- k
since no one seems to have any comments on this I'm going to put it into my powerpc-next tree.
- k