From: Joseph Myers Date: Tue, 2 Jul 2013 19:51:19 +0000 (+0000) Subject: Make soft-float ARM use soft-fp fma/fmaf. X-Git-Tag: upstream/2.20~1872 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bed143eb4bd42be907d143cca456d527e25efec;p=platform%2Fupstream%2Flinaro-glibc.git Make soft-float ARM use soft-fp fma/fmaf. --- diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 2674d0e..c7e98af 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,12 @@ +2013-07-02 Joseph Myers + + [BZ #13304] + * sysdeps/arm/s_fma.c: New file. + * sysdeps/arm/s_fmaf.c: New file. + * sysdeps/arm/soft-fp/sfp-machine.h: New file. Based on powerpc + version. + * sysdeps/arm/Implies: Add arm/soft-fp. + 2013-07-02 Will Newton * sysdeps/arm/dl-machine.h (elf_machine_rela): Pass dl_hwcap diff --git a/ports/sysdeps/arm/Implies b/ports/sysdeps/arm/Implies index 780c4e2..10bd93a 100644 --- a/ports/sysdeps/arm/Implies +++ b/ports/sysdeps/arm/Implies @@ -1,3 +1,4 @@ +arm/soft-fp wordsize-32 ieee754/flt-32 ieee754/dbl-64 diff --git a/ports/sysdeps/arm/s_fma.c b/ports/sysdeps/arm/s_fma.c new file mode 100644 index 0000000..dc4e27b --- /dev/null +++ b/ports/sysdeps/arm/s_fma.c @@ -0,0 +1,5 @@ +#ifdef __SOFTFP__ +# include +#else +# include +#endif diff --git a/ports/sysdeps/arm/s_fmaf.c b/ports/sysdeps/arm/s_fmaf.c new file mode 100644 index 0000000..550d8b8 --- /dev/null +++ b/ports/sysdeps/arm/s_fmaf.c @@ -0,0 +1,5 @@ +#ifdef __SOFTFP__ +# include +#else +# include +#endif diff --git a/ports/sysdeps/arm/soft-fp/sfp-machine.h b/ports/sysdeps/arm/soft-fp/sfp-machine.h new file mode 100644 index 0000000..eba6e35 --- /dev/null +++ b/ports/sysdeps/arm/soft-fp/sfp-machine.h @@ -0,0 +1,49 @@ +#define _FP_W_TYPE_SIZE 32 +#define _FP_W_TYPE unsigned long +#define _FP_WS_TYPE signed long +#define _FP_I_TYPE long + +#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_MUL_MEAT_Q(R,X,Y) \ + _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) + +#define _FP_MUL_MEAT_DW_S(R,X,Y) \ + _FP_MUL_MEAT_DW_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm) +#define _FP_MUL_MEAT_DW_D(R,X,Y) \ + _FP_MUL_MEAT_DW_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm) +#define _FP_MUL_MEAT_DW_Q(R,X,Y) \ + _FP_MUL_MEAT_DW_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm) + +#define _FP_DIV_MEAT_S(R,X,Y) _FP_DIV_MEAT_1_loop(S,R,X,Y) +#define _FP_DIV_MEAT_D(R,X,Y) _FP_DIV_MEAT_2_udiv(D,R,X,Y) +#define _FP_DIV_MEAT_Q(R,X,Y) _FP_DIV_MEAT_4_udiv(Q,R,X,Y) + +#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 +#define _FP_QNANNEGATEDP 0 + +/* Someone please check this. */ +#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP) \ + do { \ + if ((_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs) \ + && !(_FP_FRAC_HIGH_RAW_##fs(Y) & _FP_QNANBIT_##fs)) \ + { \ + R##_s = Y##_s; \ + _FP_FRAC_COPY_##wc(R,Y); \ + } \ + else \ + { \ + R##_s = X##_s; \ + _FP_FRAC_COPY_##wc(R,X); \ + } \ + R##_c = FP_CLS_NAN; \ + } while (0)