projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gettimeofday: port recent C++ fix to Emacs
[gnulib.git]
/
tests
/
test-trunc2.c
diff --git
a/tests/test-trunc2.c
b/tests/test-trunc2.c
index
c9f0d8f
..
923be41
100644
(file)
--- a/
tests/test-trunc2.c
+++ b/
tests/test-trunc2.c
@@
-1,5
+1,5
@@
/* Test of rounding towards zero.
/* Test of rounding towards zero.
- Copyright (C) 2007-201
0
Free Software Foundation, Inc.
+ Copyright (C) 2007-201
3
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-29,8
+29,15
@@
#include <stdio.h>
#include "isnand-nolibm.h"
#include <stdio.h>
#include "isnand-nolibm.h"
+#include "minus-zero.h"
#include "macros.h"
#include "macros.h"
+/* MSVC with option -fp:strict refuses to compile constant initializers that
+ contain floating-point operations. Pacify this compiler. */
+#ifdef _MSC_VER
+# pragma fenv_access (off)
+#endif
+
/* The reference implementation, taken from lib/trunc.c. */
/* The reference implementation, taken from lib/trunc.c. */
@@
-38,6
+45,9
@@
#define MANT_DIG DBL_MANT_DIG
#define L_(literal) literal
#define MANT_DIG DBL_MANT_DIG
#define L_(literal) literal
+/* -0.0. See minus-zero.h. */
+#define MINUS_ZERO minus_zerod
+
/* 2^(MANT_DIG-1). */
static const DOUBLE TWO_MANT_DIG =
/* Assume MANT_DIG <= 5 * 31.
/* 2^(MANT_DIG-1). */
static const DOUBLE TWO_MANT_DIG =
/* Assume MANT_DIG <= 5 * 31.
@@
-63,8
+73,12
@@
trunc_reference (DOUBLE x)
if (z > L_(0.0))
{
if (z > L_(0.0))
{
+ /* For 0 < x < 1, return +0.0 even if the current rounding mode is
+ FE_DOWNWARD. */
+ if (z < L_(1.0))
+ z = L_(0.0);
/* Avoid rounding errors for values near 2^k, where k >= MANT_DIG-1. */
/* Avoid rounding errors for values near 2^k, where k >= MANT_DIG-1. */
- if (z < TWO_MANT_DIG)
+
else
if (z < TWO_MANT_DIG)
{
/* Round to the next integer (nearest or up or down, doesn't matter). */
z += TWO_MANT_DIG;
{
/* Round to the next integer (nearest or up or down, doesn't matter). */
z += TWO_MANT_DIG;
@@
-76,8
+90,12
@@
trunc_reference (DOUBLE x)
}
else if (z < L_(0.0))
{
}
else if (z < L_(0.0))
{
+ /* For -1 < x < 0, return -0.0 regardless of the current rounding
+ mode. */
+ if (z > L_(-1.0))
+ z = MINUS_ZERO;
/* Avoid rounding errors for values near -2^k, where k >= MANT_DIG-1. */
/* Avoid rounding errors for values near -2^k, where k >= MANT_DIG-1. */
- if (z > - TWO_MANT_DIG)
+
else
if (z > - TWO_MANT_DIG)
{
/* Round to the next integer (nearest or up or down, doesn't matter). */
z -= TWO_MANT_DIG;
{
/* Round to the next integer (nearest or up or down, doesn't matter). */
z -= TWO_MANT_DIG;