From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23927 invoked by alias); 2 Jul 2013 19:52:22 -0000 Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org Received: (qmail 23915 invoked by uid 89); 2 Jul 2013 19:52:21 -0000 X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_50,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_SF autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Tue, 02 Jul 2013 19:52:21 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Uu6cd-0000yy-MP from joseph_myers@mentor.com for libc-ports@sourceware.org; Tue, 02 Jul 2013 12:52:19 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 2 Jul 2013 12:52:19 -0700 Received: from digraph.polyomino.org.uk (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.2.247.3; Tue, 2 Jul 2013 20:52:18 +0100 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.76) (envelope-from ) id 1Uu6ca-0003cf-OH for libc-ports@sourceware.org; Tue, 02 Jul 2013 19:52:16 +0000 Date: Tue, 02 Jul 2013 19:52:00 -0000 From: "Joseph S. Myers" To: Subject: Make soft-float ARM use soft-fp fma/fmaf Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-SW-Source: 2013-07/txt/msg00005.txt.bz2 I've committed this patch to make soft-float ARM glibc use the soft-fp versions of fma/fmaf, instead of the versions that rely on rounding modes and exceptions that aren't supported for ARM soft-float and so produce inaccurate results (even in round-to-nearest, the only rounding mode that otherwise works properly for ARM soft-float). (The sfp-machine.h doesn't attempt any run-time integration with hardware exceptions and rounding modes if present, as there doesn't seem to be much point without a proper fix for bug 10064 to make libgcc __aeabi_* functions respect rounding modes and exceptions via STT_GNU_IFUNC if VFP hardware is present.) 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. 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) -- Joseph S. Myers joseph@codesourcery.com