Refactor tst-strtod-round.c for type-generic-ness

Reduce much of the redundancy in this file, and attempt
to coral the type specific stuff to ease adding an new type.

5 files changed, 3638 insertions, 4360 deletions

diff --git a/ChangeLog b/ChangeLog
index 89c2a9c0f5..2a4cf83228 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,45 @@
+2016-05-25  Paul E. Murphy  <murphyp@linux.vnet.ibm.com>
+
+	* stdlib/gen-tst-strtod-round.c: Add backslash to
+	compile command in comment.
+	(printfp): Remove the literal suffix, and define an infinite
+	value as INF to avoid expansion clash with INFINITY.
+	(round_str): Remove the literal suffix.
+	(round_for_all): Likewise, remove the now duplicate ldbl-64
+	entry, and remove some magic constants.
+
+	* stdlib/tst-strtod-round.c: (TEST): Redefine to reduce
+	duplication.  Remove duplicate dbl-64 and ldbl-64 entries.
+	(ROUNDING_TESTS_long_double): Define as 0 for ibm128.
+	(_CONCAT): New macro.
+	(CONCAT): Likewise.
+	(CHOOSE_ld): Likewise.
+	(CHOOSE_f): Likewise.
+	(CHOOSE_d): Likewise.
+	(FTYPE_MEMBER): Likewise.
+	(BOOL_MEMBER): Likewise.
+	(STRUCT_FOREACH_FLOAT_FTYPE): Likewise.
+	(STRUCT_FOREACH_FLOAT_BOOL): Likewise.
+	(_XNTRY): Likewise.
+	(XNTRY): Likewise.
+	(_ENTRY): Likewise.
+	(ENTRY): Likewise.
+	(test_exactness): Generate members via macro.
+	(test_results): Likewise.
+	(test): Update members.
+	(TEST): Redefine using new macros.
+	(INF): New macro.
+	(fetestmodes): New structure.
+	(do_test): Refactor to be type generic.
+	(test_in_one_mode): Refactor duplicate code into
+	(GEN_ONE_TEST): New macro.
+
+	* stdlib/tst-strtod-round-data.h: Regenerate.
+
+	* stdlib/tst-strtod.h (GEN_TEST_STRTOD_FOREACH):
+	Extend to pass additional arbitrary parameters to
+	generators.
+
 2016-05-25  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #15479]
diff --git a/stdlib/gen-tst-strtod-round.c b/stdlib/gen-tst-strtod-round.c
index fa5562ee00..1c2823f5be 100644
--- a/stdlib/gen-tst-strtod-round.c
+++ b/stdlib/gen-tst-strtod-round.c
@@ -19,7 +19,7 @@
 
 /* Compile this program as:
 
-   gcc -std=gnu11 -O2 -Wall -Wextra gen-tst-strtod-round.c -lmpfr
+   gcc -std=gnu11 -O2 -Wall -Wextra gen-tst-strtod-round.c -lmpfr \
      -o gen-tst-strtod-round
 
    (use of current MPFR version recommended) and run it as:
@@ -60,19 +60,18 @@ string_to_fp (mpfr_t f, const char *s, mpfr_rnd_t rnd)
 #endif
 }
 
-static void
-print_fp (FILE *fout, mpfr_t f, const char *suffix, const char *suffix2)
+void
+print_fp (FILE *fout, mpfr_t f, const char *suffix)
 {
   if (mpfr_inf_p (f))
-    mpfr_fprintf (fout, "\t%sINFINITY%s", mpfr_signbit (f) ? "-" : "",
-		  suffix2);
+    mpfr_fprintf (fout, "\t%sINF%s", mpfr_signbit (f) ? "-" : "", suffix);
   else
-    mpfr_fprintf (fout, "\t%Ra%s%s", f, suffix, suffix2);
+    mpfr_fprintf (fout, "\t%Ra%s", f, suffix);
 }
 
 static void
-round_str (FILE *fout, const char *s, const char *suffix,
-	   int prec, int emin, int emax, bool ibm_ld)
+round_str (FILE *fout, const char *s, int prec, int emin, int emax,
+	   bool ibm_ld)
 {
   mpfr_t f;
   mpfr_set_default_prec (prec);
@@ -94,13 +93,13 @@ round_str (FILE *fout, const char *s, const char *suffix,
       mpfr_clear (max_value);
     }
   mpfr_fprintf (fout, "\t%s,\n", r ? "false" : "true");
-  print_fp (fout, f, suffix, ",\n");
+  print_fp (fout, f, ",\n");
   string_to_fp (f, s, MPFR_RNDN);
-  print_fp (fout, f, suffix, ",\n");
+  print_fp (fout, f, ",\n");
   string_to_fp (f, s, MPFR_RNDZ);
-  print_fp (fout, f, suffix, ",\n");
+  print_fp (fout, f, ",\n");
   string_to_fp (f, s, MPFR_RNDU);
-  print_fp (fout, f, suffix, "");
+  print_fp (fout, f, "");
   mpfr_clear (f);
 }
 
@@ -108,21 +107,19 @@ static void
 round_for_all (FILE *fout, const char *s)
 {
   static const struct fmt {
-    const char *suffix;
     int prec;
     int emin;
     int emax;
     bool ibm_ld;
-  } formats[7] = {
-    { "f", 24, -148, 128, false },
-    { "", 53, -1073, 1024, false },
-    { "L", 53, -1073, 1024, false },
+  } formats[] = {
+    { 24, -148, 128, false },
+    { 53, -1073, 1024, false },
     /* This is the Intel extended float format.  */
-    { "L", 64, -16444, 16384, false },
+    { 64, -16444, 16384, false },
     /* This is the Motorola extended float format.  */
-    { "L", 64, -16445, 16384, false },
-    { "L", 106, -1073, 1024, true },
-    { "L", 113, -16493, 16384, false },
+    { 64, -16445, 16384, false },
+    { 106, -1073, 1024, true },
+    { 113, -16493, 16384, false },
   };
   mpfr_fprintf (fout, "  TEST (\"");
   const char *p;
@@ -134,11 +131,12 @@ round_for_all (FILE *fout, const char *s)
     }
   mpfr_fprintf (fout, "\",\n");
   int i;
-  for (i = 0; i < 7; i++)
+  int n_formats = sizeof (formats) / sizeof (formats[0]);
+  for (i = 0; i < n_formats; i++)
     {
-      round_str (fout, s, formats[i].suffix, formats[i].prec,
-		 formats[i].emin, formats[i].emax, formats[i].ibm_ld);
-      if (i < 6)
+      round_str (fout, s, formats[i].prec, formats[i].emin,
+		 formats[i].emax, formats[i].ibm_ld);
+      if (i < n_formats - 1)
 	mpfr_fprintf (fout, ",\n");
     }
   mpfr_fprintf (fout, "),\n");
diff --git a/stdlib/tst-strtod-round-data.h b/stdlib/tst-strtod-round-data.h
index 352d785fc2..1fd3aa87e1 100644
--- a/stdlib/tst-strtod-round-data.h
+++ b/stdlib/tst-strtod-round-data.h
@@ -2,2147 +2,1852 @@
 static const struct test tests[] = {
   TEST ("3.518437208883201171875E+013",
 	false,
-	0x2p+44f,
-	0x2p+44f,
-	0x2p+44f,
-	0x2.000004p+44f,
+	0x2p+44,
+	0x2p+44,
+	0x2p+44,
+	0x2.000004p+44,
 	false,
 	0x2.0000000000002p+44,
 	0x2.0000000000004p+44,
 	0x2.0000000000002p+44,
 	0x2.0000000000004p+44,
-	false,
-	0x2.0000000000002p+44L,
-	0x2.0000000000004p+44L,
-	0x2.0000000000002p+44L,
-	0x2.0000000000004p+44L,
-	true,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	true,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	true,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	true,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L,
-	0x2.0000000000003p+44L),
+	true,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	true,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	true,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	true,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44,
+	0x2.0000000000003p+44),
   TEST ("1.00000005960464477550",
 	false,
-	0x1p+0f,
-	0x1.000002p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1.000002p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.0000010000001p+0,
 	false,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.0000010000001p+0L,
-	false,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000004p+0L,
-	false,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000004p+0L,
-	false,
-	0x1.0000010000000002048242f2ffp+0L,
-	0x1.0000010000000002048242f2ff8p+0L,
-	0x1.0000010000000002048242f2ffp+0L,
-	0x1.0000010000000002048242f2ff8p+0L,
-	false,
-	0x1.0000010000000002048242f2ff66p+0L,
-	0x1.0000010000000002048242f2ff67p+0L,
-	0x1.0000010000000002048242f2ff66p+0L,
-	0x1.0000010000000002048242f2ff67p+0L),
+	0x1.0000010000000002p+0,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000004p+0,
+	false,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000004p+0,
+	false,
+	0x1.0000010000000002048242f2ffp+0,
+	0x1.0000010000000002048242f2ff8p+0,
+	0x1.0000010000000002048242f2ffp+0,
+	0x1.0000010000000002048242f2ff8p+0,
+	false,
+	0x1.0000010000000002048242f2ff66p+0,
+	0x1.0000010000000002048242f2ff67p+0,
+	0x1.0000010000000002048242f2ff66p+0,
+	0x1.0000010000000002048242f2ff67p+0),
   TEST ("1.0000000596046447755",
 	false,
-	0x1p+0f,
-	0x1.000002p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1.000002p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.0000010000001p+0,
 	false,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.0000010000001p+0L,
-	false,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000004p+0L,
-	false,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000002p+0L,
-	0x1.0000010000000004p+0L,
-	false,
-	0x1.0000010000000002048242f2ffp+0L,
-	0x1.0000010000000002048242f2ff8p+0L,
-	0x1.0000010000000002048242f2ffp+0L,
-	0x1.0000010000000002048242f2ff8p+0L,
-	false,
-	0x1.0000010000000002048242f2ff66p+0L,
-	0x1.0000010000000002048242f2ff67p+0L,
-	0x1.0000010000000002048242f2ff66p+0L,
-	0x1.0000010000000002048242f2ff67p+0L),
+	0x1.0000010000000002p+0,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000004p+0,
+	false,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000002p+0,
+	0x1.0000010000000004p+0,
+	false,
+	0x1.0000010000000002048242f2ffp+0,
+	0x1.0000010000000002048242f2ff8p+0,
+	0x1.0000010000000002048242f2ffp+0,
+	0x1.0000010000000002048242f2ff8p+0,
+	false,
+	0x1.0000010000000002048242f2ff66p+0,
+	0x1.0000010000000002048242f2ff67p+0,
+	0x1.0000010000000002048242f2ff66p+0,
+	0x1.0000010000000002048242f2ff67p+0),
   TEST ("1.000000059604644776",
 	false,
-	0x1p+0f,
-	0x1.000002p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1.000002p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.0000010000001p+0,
 	false,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.0000010000001p+0L,
-	false,
-	0x1.000001000000000ap+0L,
-	0x1.000001000000000cp+0L,
-	0x1.000001000000000ap+0L,
-	0x1.000001000000000cp+0L,
-	false,
-	0x1.000001000000000ap+0L,
-	0x1.000001000000000cp+0L,
-	0x1.000001000000000ap+0L,
-	0x1.000001000000000cp+0L,
-	false,
-	0x1.000001000000000b3db12bdc21p+0L,
-	0x1.000001000000000b3db12bdc21p+0L,
-	0x1.000001000000000b3db12bdc21p+0L,
-	0x1.000001000000000b3db12bdc218p+0L,
-	false,
-	0x1.000001000000000b3db12bdc213cp+0L,
-	0x1.000001000000000b3db12bdc213dp+0L,
-	0x1.000001000000000b3db12bdc213cp+0L,
-	0x1.000001000000000b3db12bdc213dp+0L),
+	0x1.000001000000000ap+0,
+	0x1.000001000000000cp+0,
+	0x1.000001000000000ap+0,
+	0x1.000001000000000cp+0,
+	false,
+	0x1.000001000000000ap+0,
+	0x1.000001000000000cp+0,
+	0x1.000001000000000ap+0,
+	0x1.000001000000000cp+0,
+	false,
+	0x1.000001000000000b3db12bdc21p+0,
+	0x1.000001000000000b3db12bdc21p+0,
+	0x1.000001000000000b3db12bdc21p+0,
+	0x1.000001000000000b3db12bdc218p+0,
+	false,
+	0x1.000001000000000b3db12bdc213cp+0,
+	0x1.000001000000000b3db12bdc213dp+0,
+	0x1.000001000000000b3db12bdc213cp+0,
+	0x1.000001000000000b3db12bdc213dp+0),
   TEST ("1.000000059604644775",
 	false,
-	0x1p+0f,
-	0x1p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.000000fffffffp+0,
 	0x1.000001p+0,
 	0x1.000000fffffffp+0,
 	0x1.000001p+0,
 	false,
-	0x1.000000fffffffp+0L,
-	0x1.000001p+0L,
-	0x1.000000fffffffp+0L,
-	0x1.000001p+0L,
-	false,
-	0x1.000000fffffffff8p+0L,
-	0x1.000000fffffffff8p+0L,
-	0x1.000000fffffffff8p+0L,
-	0x1.000000fffffffffap+0L,
-	false,
-	0x1.000000fffffffff8p+0L,
-	0x1.000000fffffffff8p+0L,
-	0x1.000000fffffffff8p+0L,
-	0x1.000000fffffffffap+0L,
-	false,
-	0x1.000000fffffffff8cb535a09dd8p+0L,
-	0x1.000000fffffffff8cb535a09dd8p+0L,
-	0x1.000000fffffffff8cb535a09dd8p+0L,
-	0x1.000000fffffffff8cb535a09dep+0L,
-	false,
-	0x1.000000fffffffff8cb535a09dd9p+0L,
-	0x1.000000fffffffff8cb535a09dd91p+0L,
-	0x1.000000fffffffff8cb535a09dd9p+0L,
-	0x1.000000fffffffff8cb535a09dd91p+0L),
+	0x1.000000fffffffff8p+0,
+	0x1.000000fffffffff8p+0,
+	0x1.000000fffffffff8p+0,
+	0x1.000000fffffffffap+0,
+	false,
+	0x1.000000fffffffff8p+0,
+	0x1.000000fffffffff8p+0,
+	0x1.000000fffffffff8p+0,
+	0x1.000000fffffffffap+0,
+	false,
+	0x1.000000fffffffff8cb535a09dd8p+0,
+	0x1.000000fffffffff8cb535a09dd8p+0,
+	0x1.000000fffffffff8cb535a09dd8p+0,
+	0x1.000000fffffffff8cb535a09dep+0,
+	false,
+	0x1.000000fffffffff8cb535a09dd9p+0,
+	0x1.000000fffffffff8cb535a09dd91p+0,
+	0x1.000000fffffffff8cb535a09dd9p+0,
+	0x1.000000fffffffff8cb535a09dd91p+0),
   TEST ("1.00000005960464478",
 	false,
-	0x1p+0f,
-	0x1.000002p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1.000002p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.0000010000001p+0,
 	false,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.0000010000001p+0L,
-	false,
-	0x1.0000010000000054p+0L,
-	0x1.0000010000000056p+0L,
-	0x1.0000010000000054p+0L,
-	0x1.0000010000000056p+0L,
-	false,
-	0x1.0000010000000054p+0L,
-	0x1.0000010000000056p+0L,
-	0x1.0000010000000054p+0L,
-	0x1.0000010000000056p+0L,
-	false,
-	0x1.0000010000000055072873252f8p+0L,
-	0x1.0000010000000055072873253p+0L,
-	0x1.0000010000000055072873252f8p+0L,
-	0x1.0000010000000055072873253p+0L,
-	false,
-	0x1.0000010000000055072873252febp+0L,
-	0x1.0000010000000055072873252febp+0L,
-	0x1.0000010000000055072873252febp+0L,
-	0x1.0000010000000055072873252fecp+0L),
+	0x1.0000010000000054p+0,
+	0x1.0000010000000056p+0,
+	0x1.0000010000000054p+0,
+	0x1.0000010000000056p+0,
+	false,
+	0x1.0000010000000054p+0,
+	0x1.0000010000000056p+0,
+	0x1.0000010000000054p+0,
+	0x1.0000010000000056p+0,
+	false,
+	0x1.0000010000000055072873252f8p+0,
+	0x1.0000010000000055072873253p+0,
+	0x1.0000010000000055072873252f8p+0,
+	0x1.0000010000000055072873253p+0,
+	false,
+	0x1.0000010000000055072873252febp+0,
+	0x1.0000010000000055072873252febp+0,
+	0x1.0000010000000055072873252febp+0,
+	0x1.0000010000000055072873252fecp+0),
   TEST ("1.0000000596046448",
 	false,
-	0x1p+0f,
-	0x1.000002p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1.000002p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.000001p+0,
 	0x1.0000010000001p+0,
 	false,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.000001p+0L,
-	0x1.0000010000001p+0L,
-	false,
-	0x1.00000100000001c4p+0L,
-	0x1.00000100000001c6p+0L,
-	0x1.00000100000001c4p+0L,
-	0x1.00000100000001c6p+0L,
-	false,
-	0x1.00000100000001c4p+0L,
-	0x1.00000100000001c6p+0L,
-	0x1.00000100000001c4p+0L,
-	0x1.00000100000001c6p+0L,
-	false,
-	0x1.00000100000001c5f67cd79279p+0L,
-	0x1.00000100000001c5f67cd792798p+0L,
-	0x1.00000100000001c5f67cd79279p+0L,
-	0x1.00000100000001c5f67cd792798p+0L,
-	false,
-	0x1.00000100000001c5f67cd7927953p+0L,
-	0x1.00000100000001c5f67cd7927954p+0L,
-	0x1.00000100000001c5f67cd7927953p+0L,
-	0x1.00000100000001c5f67cd7927954p+0L),
+	0x1.00000100000001c4p+0,
+	0x1.00000100000001c6p+0,
+	0x1.00000100000001c4p+0,
+	0x1.00000100000001c6p+0,
+	false,
+	0x1.00000100000001c4p+0,
+	0x1.00000100000001c6p+0,
+	0x1.00000100000001c4p+0,
+	0x1.00000100000001c6p+0,
+	false,
+	0x1.00000100000001c5f67cd79279p+0,
+	0x1.00000100000001c5f67cd792798p+0,
+	0x1.00000100000001c5f67cd79279p+0,
+	0x1.00000100000001c5f67cd792798p+0,
+	false,
+	0x1.00000100000001c5f67cd7927953p+0,
+	0x1.00000100000001c5f67cd7927954p+0,
+	0x1.00000100000001c5f67cd7927953p+0,
+	0x1.00000100000001c5f67cd7927954p+0),
   TEST ("1.000000059604645",
 	false,
-	0x1p+0f,
-	0x1.000002p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1.000002p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.0000010000001p+0,
 	0x1.0000010000001p+0,
 	0x1.0000010000001p+0,
 	0x1.0000010000002p+0,
 	false,
-	0x1.0000010000001p+0L,
-	0x1.0000010000001p+0L,
-	0x1.0000010000001p+0L,
-	0x1.0000010000002p+0L,
-	false,
-	0x1.000001000000102ep+0L,
-	0x1.000001000000103p+0L,
-	0x1.000001000000102ep+0L,
-	0x1.000001000000103p+0L,
-	false,
-	0x1.000001000000102ep+0L,
-	0x1.000001000000103p+0L,
-	0x1.000001000000102ep+0L,
-	0x1.000001000000103p+0L,
-	false,
-	0x1.000001000000102f4fc8c3d757p+0L,
-	0x1.000001000000102f4fc8c3d7578p+0L,
-	0x1.000001000000102f4fc8c3d757p+0L,
-	0x1.000001000000102f4fc8c3d7578p+0L,
-	false,
-	0x1.000001000000102f4fc8c3d75769p+0L,
-	0x1.000001000000102f4fc8c3d75769p+0L,
-	0x1.000001000000102f4fc8c3d75769p+0L,
-	0x1.000001000000102f4fc8c3d7576ap+0L),
+	0x1.000001000000102ep+0,
+	0x1.000001000000103p+0,
+	0x1.000001000000102ep+0,
+	0x1.000001000000103p+0,
+	false,
+	0x1.000001000000102ep+0,
+	0x1.000001000000103p+0,
+	0x1.000001000000102ep+0,
+	0x1.000001000000103p+0,
+	false,
+	0x1.000001000000102f4fc8c3d757p+0,
+	0x1.000001000000102f4fc8c3d7578p+0,
+	0x1.000001000000102f4fc8c3d757p+0,
+	0x1.000001000000102f4fc8c3d7578p+0,
+	false,
+	0x1.000001000000102f4fc8c3d75769p+0,
+	0x1.000001000000102f4fc8c3d75769p+0,
+	0x1.000001000000102f4fc8c3d75769p+0,
+	0x1.000001000000102f4fc8c3d7576ap+0),
   TEST ("1.00000005960464",
 	false,
-	0x1p+0f,
-	0x1p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.000000fffffeap+0,
 	0x1.000000fffffeap+0,
 	0x1.000000fffffeap+0,
 	0x1.000000fffffebp+0,
 	false,
-	0x1.000000fffffeap+0L,
-	0x1.000000fffffeap+0L,
-	0x1.000000fffffeap+0L,
-	0x1.000000fffffebp+0L,
-	false,
-	0x1.000000fffffea7e4p+0L,
-	0x1.000000fffffea7e6p+0L,
-	0x1.000000fffffea7e4p+0L,
-	0x1.000000fffffea7e6p+0L,
-	false,
-	0x1.000000fffffea7e4p+0L,
-	0x1.000000fffffea7e6p+0L,
-	0x1.000000fffffea7e4p+0L,
-	0x1.000000fffffea7e6p+0L,
-	false,
-	0x1.000000fffffea7e5975eb11da7p+0L,
-	0x1.000000fffffea7e5975eb11da78p+0L,
-	0x1.000000fffffea7e5975eb11da7p+0L,
-	0x1.000000fffffea7e5975eb11da78p+0L,
-	false,
-	0x1.000000fffffea7e5975eb11da74ap+0L,
-	0x1.000000fffffea7e5975eb11da74bp+0L,
-	0x1.000000fffffea7e5975eb11da74ap+0L,
-	0x1.000000fffffea7e5975eb11da74bp+0L),
+	0x1.000000fffffea7e4p+0,
+	0x1.000000fffffea7e6p+0,
+	0x1.000000fffffea7e4p+0,
+	0x1.000000fffffea7e6p+0,
+	false,
+	0x1.000000fffffea7e4p+0,
+	0x1.000000fffffea7e6p+0,
+	0x1.000000fffffea7e4p+0,
+	0x1.000000fffffea7e6p+0,
+	false,
+	0x1.000000fffffea7e5975eb11da7p+0,
+	0x1.000000fffffea7e5975eb11da78p+0,
+	0x1.000000fffffea7e5975eb11da7p+0,
+	0x1.000000fffffea7e5975eb11da78p+0,
+	false,
+	0x1.000000fffffea7e5975eb11da74ap+0,
+	0x1.000000fffffea7e5975eb11da74bp+0,
+	0x1.000000fffffea7e5975eb11da74ap+0,
+	0x1.000000fffffea7e5975eb11da74bp+0),
   TEST ("1.0000000596046",
 	false,
-	0x1p+0f,
-	0x1p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.000000fffff36p+0,
 	0x1.000000fffff36p+0,
 	0x1.000000fffff36p+0,
 	0x1.000000fffff37p+0,
 	false,
-	0x1.000000fffff36p+0L,
-	0x1.000000fffff36p+0L,
-	0x1.000000fffff36p+0L,
-	0x1.000000fffff37p+0L,
-	false,
-	0x1.000000fffff36596p+0L,
-	0x1.000000fffff36598p+0L,
-	0x1.000000fffff36596p+0L,
-	0x1.000000fffff36598p+0L,
-	false,
-	0x1.000000fffff36596p+0L,
-	0x1.000000fffff36598p+0L,
-	0x1.000000fffff36596p+0L,
-	0x1.000000fffff36598p+0L,
-	false,
-	0x1.000000fffff36597d40e1b5026p+0L,
-	0x1.000000fffff36597d40e1b50268p+0L,
-	0x1.000000fffff36597d40e1b5026p+0L,
-	0x1.000000fffff36597d40e1b50268p+0L,
-	false,
-	0x1.000000fffff36597d40e1b502655p+0L,
-	0x1.000000fffff36597d40e1b502656p+0L,
-	0x1.000000fffff36597d40e1b502655p+0L,
-	0x1.000000fffff36597d40e1b502656p+0L),
+	0x1.000000fffff36596p+0,
+	0x1.000000fffff36598p+0,
+	0x1.000000fffff36596p+0,
+	0x1.000000fffff36598p+0,
+	false,
+	0x1.000000fffff36596p+0,
+	0x1.000000fffff36598p+0,
+	0x1.000000fffff36596p+0,
+	0x1.000000fffff36598p+0,
+	false,
+	0x1.000000fffff36597d40e1b5026p+0,
+	0x1.000000fffff36597d40e1b50268p+0,
+	0x1.000000fffff36597d40e1b5026p+0,
+	0x1.000000fffff36597d40e1b50268p+0,
+	false,
+	0x1.000000fffff36597d40e1b502655p+0,
+	0x1.000000fffff36597d40e1b502656p+0,
+	0x1.000000fffff36597d40e1b502655p+0,
+	0x1.000000fffff36597d40e1b502656p+0),
   TEST ("1.000000059605",
 	false,
-	0x1p+0f,
-	0x1.000002p+0f,
-	0x1p+0f,
-	0x1.000002p+0f,
+	0x1p+0,
+	0x1.000002p+0,
+	0x1p+0,
+	0x1.000002p+0,
 	false,
 	0x1.000001000063fp+0,
 	0x1.000001000064p+0,
 	0x1.000001000063fp+0,
 	0x1.000001000064p+0,
 	false,
-	0x1.000001000063fp+0L,
-	0x1.000001000064p+0L,
-	0x1.000001000063fp+0L,
-	0x1.000001000064p+0L,
-	false,
-	0x1.000001000063fcap+0L,
-	0x1.000001000063fca2p+0L,
-	0x1.000001000063fcap+0L,
-	0x1.000001000063fca2p+0L,
-	false,
-	0x1.000001000063fcap+0L,
-	0x1.000001000063fca2p+0L,
-	0x1.000001000063fcap+0L,
-	0x1.000001000063fca2p+0L,
-	false,
-	0x1.000001000063fca17533f557