Skip to content

Commit

Permalink
Pull up following revision(s) (requested by riastradh in ticket #506):
Browse files Browse the repository at this point in the history
	lib/libc/gdtoa/Makefile.inc: revision 1.11
	lib/libc/gdtoa/gdtoa_fltrnds.h: revision 1.2
	lib/libc/gdtoa/gdtoaimp.h: revision 1.15
	lib/libc/gdtoa/gdtoaimp.h: revision 1.17

Honour the floating-point rounding mode in floating-point formatting.

C99, Sec. 7.19.6.1 `The fprintf function', paragraph 13, p. 281:
   (Recommended practice)
   For e, E, f, F, g, and G conversions, if the number of significant
   decimal digits is at most DECIMAL_DIG, then the result should be
   correctly rounded.  If the number of significant decimal digits is
   more than DECIMAL_DIG but the source value is exactly
   representable with DECIMAL_DIG digits, then the result should be
   an exact representation with trailing zeros.  Otherwise, the
   source value is bounded by two adjacent decimal strings L < U,
   both having DECIMAL_DIG significant idgits; the value of the
   resultant decimal string D should satisfy L <= D <= U, _with the
   extra stipulation that the error should have a correct sign for
   the current rounding direction_.  [emphasis added]

The gdtoa code base already supports respecting the floating-point
rounding mode, as long as we compile it with Honor_FLT_ROUNDS
defined.  However, for this to work, fegetround must be available in
libc, which it is not currently -- the fenv logic is in libm.

Fortunately, we don't have to move all of fenv from libm to libc --
programs that do not link against libm don't have fesetround, so the
rounding mode is always the default (barring asm shenanigans that
bypass the API -- tough).  So use a weak reference to fegetround; by
default, assume FE_TONEAREST if it is not defined.

Mark the libc fegetround weak reference unused.
Not all .c files that include gdtoaimp.h use it, which makes clang
unhappy.
  • Loading branch information
MartinHusemann committed Dec 8, 2019
1 parent ac449fc commit 87f7bda
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
6 changes: 5 additions & 1 deletion lib/libc/gdtoa/Makefile.inc
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# $NetBSD: Makefile.inc,v 1.10 2014/01/16 20:31:42 christos Exp $
# $NetBSD: Makefile.inc,v 1.10.28.1 2019/12/08 13:35:51 martin Exp $

# gdtoa sources
.PATH: ${.CURDIR}/gdtoa
CPPFLAGS+=-I${.CURDIR}/gdtoa -I${.CURDIR}/locale

.if ${MACHINE_ARCH} == "vax"
CPPFLAGS+=-DNO_FENV_H
.else
CPPFLAGS+=-DHonor_FLT_ROUNDS
.endif

# machine-dependent directory must provide the following:
# arith.h gd_qnan.h
Expand Down
3 changes: 2 additions & 1 deletion lib/libc/gdtoa/gdtoa_fltrnds.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FPI *fpi, fpi1;
CONST FPI *fpi;
FPI fpi1;
int Rounding;
#ifdef Trust_FLT_ROUNDS /*{{ only define this if FLT_ROUNDS really works! */
Rounding = Flt_Rounds;
Expand Down
6 changes: 5 additions & 1 deletion lib/libc/gdtoa/gdtoaimp.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $NetBSD: gdtoaimp.h,v 1.14 2013/04/19 10:41:53 joerg Exp $ */
/* $NetBSD: gdtoaimp.h,v 1.14.30.1 2019/12/08 13:35:51 martin Exp $ */

/****************************************************************
Expand Down Expand Up @@ -200,6 +200,10 @@ THIS SOFTWARE.
#include "gd_qnan.h"
#ifdef Honor_FLT_ROUNDS
#include <fenv.h>
__unused __weakref_visible int __libc_fegetround_ref(void)
__weak_reference(fegetround);
#define fegetround() \
(__libc_fegetround_ref ? __libc_fegetround_ref() : FE_TONEAREST)
#endif

#ifdef DEBUG
Expand Down

0 comments on commit 87f7bda

Please sign in to comment.