diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-07-02 19:51:19 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-07-02 19:51:19 +0000 |
| commit | 6bed143eb4bd42be907d143cca456d527e25efec (patch) | |
| tree | 0ce247c507e5ee8d1f08bc101828af64ad52991b | |
| parent | c87156e5e913532f6c470baadd7ca636678d7c8b (diff) | |
| download | glibc-6bed143eb4bd42be907d143cca456d527e25efec.tar.gz glibc-6bed143eb4bd42be907d143cca456d527e25efec.tar.xz glibc-6bed143eb4bd42be907d143cca456d527e25efec.zip | |
Make soft-float ARM use soft-fp fma/fmaf.
| -rw-r--r-- | ports/ChangeLog.arm | 9 | ||||
| -rw-r--r-- | ports/sysdeps/arm/Implies | 1 | ||||
| -rw-r--r-- | ports/sysdeps/arm/s_fma.c | 5 | ||||
| -rw-r--r-- | ports/sysdeps/arm/s_fmaf.c | 5 | ||||
| -rw-r--r-- | ports/sysdeps/arm/soft-fp/sfp-machine.h | 49 |
5 files changed, 69 insertions, 0 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 2674d0ee0a..c7e98af36d 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,12 @@ +2013-07-02 Joseph Myers <joseph@codesourcery.com> + + [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 <will.newton@linaro.org> * sysdeps/arm/dl-machine.h (elf_machine_rela): Pass dl_hwcap diff --git a/ports/sysdeps/arm/Implies b/ports/sysdeps/arm/Implies index 780c4e2467..10bd93a160 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 0000000000..dc4e27bfc1 --- /dev/null +++ b/ports/sysdeps/arm/s_fma.c @@ -0,0 +1,5 @@ +#ifdef __SOFTFP__ +# include <soft-fp/fmadf4.c> +#else +# include <sysdeps/ieee754/dbl-64/s_fma.c> +#endif diff --git a/ports/sysdeps/arm/s_fmaf.c b/ports/sysdeps/arm/s_fmaf.c new file mode 100644 index 0000000000..550d8b85d3 --- /dev/null +++ b/ports/sysdeps/arm/s_fmaf.c @@ -0,0 +1,5 @@ +#ifdef __SOFTFP__ +# include <soft-fp/fmasf4.c> +#else +# include <sysdeps/ieee754/dbl-64/s_fmaf.c> +#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 0000000000..eba6e35ced --- /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) |