From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-8996-listarch-libc-hacker=sources.redhat.com@sourceware.org>
Received: (qmail 23244 invoked by alias); 8 Aug 2006 11:54:00 -0000
Received: (qmail 23227 invoked by uid 22791); 8 Aug 2006 11:53:59 -0000
X-Spam-Check-By: sourceware.org
Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26)
    by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 08 Aug 2006 11:53:56 +0000
Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id k78BrqZo003218;
	Tue, 8 Aug 2006 13:53:52 +0200
Received: (from jj@localhost)
	by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id k78BrqMm003217;
	Tue, 8 Aug 2006 13:53:52 +0200
Date: Tue, 08 Aug 2006 11:54:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Fix stdio-common/bug16.c
Message-ID: <20060808115352.GC4556@sunsite.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
Mailing-List: contact libc-hacker-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sourceware.org>
List-Help: <mailto:libc-hacker-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: libc-hacker-owner@sourceware.org
X-SW-Source: 2006-08/txt/msg00006.txt.bz2

Hi!

This new test fails on ppc{,64}, s390{,x} (and I expect any other IEEE quad
or IBM extended long double arch).  The ISO C99 standard only requires that
before the dot (or P/p letter) is a non-zero hexadecimal digit (unless
subnormal), and as we do assume FLT_RADIX 2, that leaves us with 1, 2, 4 or
8.  On ppc*/s390* indeed snprintf prints 0x2P-1 rather than 0x1P+0.
Tested that this test still fails on x86_64 with broken glibc.

2006-08-08  Jakub Jelinek  <jakub@redhat.com>

	* stdio-common/bug16.c (tests): New array.
	(do_tests): Allow the first hexadecimal digit
	to be 1, 2, 4 or 8.  Do 3 additional tests.

--- libc/stdio-common/bug16.c.jj	2006-08-03 11:24:39.000000000 +0200
+++ libc/stdio-common/bug16.c	2006-08-08 10:38:11.000000000 +0200
@@ -1,19 +1,42 @@
 #include <stdio.h>
 #include <string.h>
 
+struct
+{
+  long double val;
+  const char str[4][7];
+} tests[] =
+{
+  { 0x0.FFFFp+0L, { "0X1P+0", "0X2P-1", "0X4P-2", "0X8P-3" } },
+  { 0x0.FFFFp+1L, { "0X1P+1", "0X2P+0", "0X4P-1", "0X8P-2" } },
+  { 0x0.FFFFp+2L, { "0X1P+2", "0X2P+1", "0X4P+0", "0X8P-1" } },
+  { 0x0.FFFFp+3L, { "0X1P+3", "0X2P+2", "0X4P+1", "0X8P+0" } }
+};
+
 static int
 do_test (void)
 {
   char buf[100];
-  snprintf (buf, sizeof (buf), "%.0LA", 0x0.FFFFp+0L);
+  int ret = 0;
+
+  for (size_t i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
+    {  
+      snprintf (buf, sizeof (buf), "%.0LA", tests[i].val);
+
+      size_t j;
+      for (j = 0; j < 4; ++j)
+	if (strcmp (buf, tests[i].str[j]) == 0)
+	  break;
 
-  if (strcmp (buf, "0X1P+0") != 0)
-    {
-      printf ("got \"%s\", expected \"0X1P+0\"\n", buf);
-      return 1;
+      if (j == 4)
+	{
+	  printf ("%zd: got \"%s\", expected \"%s\" or equivalent\n",
+		  i, buf, tests[i].str[0]);
+	  ret = 1;
+	}
     }
 
-  return 0;
+  return ret;
 }
 
 #define TEST_FUNCTION do_test ()

	Jakub