tinystdio: Support 32-bit double/64-bit long double configurations

Deal with using double or long double for the 64-bit datatype.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

newlib/libc/include/stdlib.h

@@ -267,6 +267,15 @@ int	fcvtf_r (float, int, int*, int*, char *, size_t);
 #else
 char *	fcvtfbuf (float, int, int*, int*, char *);
 #endif
+
+#if defined(_HAVE_LONG_DOUBLE) && defined(TINY_STDIO)
+char *  ecvtl(long double, int, int*, int*);
+int     ecvtl_r(long double, int, int*, int*, char *, size_t);
+char *  fcvtl(long double, int, int*, int*);
+int     fcvtl_r(long double, int, int*, int*, char *, size_t);
+char *	gcvtl(long double, int, char *);
+#endif
+
 #endif
 char *	__itoa (int, char *, int);
 char *	__utoa (unsigned, char *, int);

newlib/libc/tinystdio/CMakeLists.txt

@@ -37,17 +37,20 @@ picolibc_sources(
   bufio.c
   clearerr.c
   compare_exchange.c
+  dtox_engine.c
   ecvt_r.c
   ecvt.c
   ecvtf_r.c
   ecvtf.c
+  ecvtl_r.c
+  ecvtl.c
   exchange.c
   fcvt.c
   fcvt_r.c
   fcvtf.c
   fcvtf_r.c
-  gcvt.c
-  gcvtf.c
+  fcvtl.c
+  fcvtl_r.c
   fclose.c
   fdevopen.c
   feof.c
@@ -75,15 +78,21 @@ picolibc_sources(
   fseeko.c
   ftell.c
   ftello.c
+  ftox_engine.c
   fwide.c
   fwrite.c
   fwprintf.c
   fwscanf.c
+  gcvt.c
+  gcvtf.c
+  gcvtl.c
   getchar.c
   getdelim.c
   getline.c
   gets.c
   getwchar.c
+  ldtoa_engine.c
+  ldtox_engine.c
   matchcaseprefix.c
   mktemp.c
   perror.c

newlib/libc/tinystdio/atod_engine.c

@@ -30,11 +30,13 @@
   POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define _WANT_IO_DOUBLE
+#include "stdio_private.h"
 
-typedef double FLOAT;
+#ifdef FLOAT64
 
-#include "dtoa_engine.h"
+#define _NEED_IO_DOUBLE
+
+#include "dtoa.h"
 
 #if __GNUC__ == 12 && __GNUC_MINOR__ == 2 && __GNUC_PATCHLEVEL__ == 1 && __OPTIMIZE_SIZE__
 /*
@@ -45,10 +47,10 @@ typedef double FLOAT;
 #pragma GCC optimize("O2")
 #endif
 
-double
+FLOAT64
 __atod_engine(uint64_t u64, int exp)
 {
-    double flt = u64;
+    FLOAT64 flt = u64;
 
     while (exp < 0) {
         flt *= 1e-1;
@@ -60,3 +62,5 @@ __atod_engine(uint64_t u64, int exp)
     }
     return flt;
 }
+
+#endif

newlib/libc/tinystdio/atod_ryu.c

@@ -29,6 +29,14 @@
 #include "ryu/common.h"
 #include "ryu/d2s_intrinsics.h"
 
+#if __SIZEOF_DOUBLE__ == 8
+#define FLOAT64 double
+#elif __SIZEOF_LONG_DOUBLE__ == 8
+#define FLOAT64 long double
+#endif
+
+#ifdef FLOAT64
+
 #define DOUBLE_MANTISSA_BITS 52
 #define DOUBLE_EXPONENT_BITS 11
 #define DOUBLE_EXPONENT_BIAS 1023
@@ -54,13 +62,13 @@ static inline int32_t max32(int32_t a, int32_t b) {
   return a < b ? b : a;
 }
 
-static inline double int64Bits2Double(uint64_t bits) {
-  double f;
-  memcpy(&f, &bits, sizeof(double));
+static inline FLOAT64 int64Bits2Double(uint64_t bits) {
+  FLOAT64 f;
+  memcpy(&f, &bits, sizeof(FLOAT64));
   return f;
 }
 
-double
+FLOAT64
 __atod_engine(uint64_t m10, int e10)
 {
 #ifdef RYU_DEBUG
@@ -159,3 +167,4 @@ __atod_engine(uint64_t m10, int e10)
     return int64Bits2Double(ieee);
 }
 
+#endif /* FLOAT64 */

newlib/libc/tinystdio/atof_engine.c

@@ -30,11 +30,9 @@
   POSSIBILITY OF SUCH DAMAGE.
 */
 
-#define _WANT_IO_FLOAT
+#define _NEED_IO_FLOAT
 
-typedef float FLOAT;
-
-#include "dtoa_engine.h"
+#include "dtoa.h"
 
 #if __GNUC__ == 12 && __GNUC_MINOR__ == 2 && __GNUC_PATCHLEVEL__ == 1 && __OPTIMIZE_SIZE__
 /*
@@ -51,11 +49,11 @@ __atof_engine(uint32_t u32, int exp)
     float flt = u32;
 
     while (exp < 0) {
-        flt *= 1e-1f;
+        flt *= (float) 1e-1f;
         exp++;
     }
     while (exp > 0) {
-        flt *= 1e1f;
+        flt *= (float) 1e1f;
         exp--;
     }
     return flt;

newlib/libc/tinystdio/atof_ryu.c

@@ -20,6 +20,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "stdio_private.h"
+
 #ifdef RYU_DEBUG
 #include <inttypes.h>
 #include <stdio.h>
@@ -69,9 +71,9 @@ float
 __atof_engine(uint32_t m10, int e10)
 {
 #ifdef RYU_DEBUG
-	printf("m10digits = %d\n", m10);
+	printf("m10digits = %ld\n", m10);
 	printf("e10digits = %d\n", e10);
-	printf("m10 * 10^e10 = %u * 10^%d\n", m10, e10);
+	printf("m10 * 10^e10 = %lu * 10^%d\n", m10, e10);
 #endif
 
 	// Convert to binary float m2 * 2^e2, while retaining information about whether the conversion
@@ -124,7 +126,7 @@ __atof_engine(uint32_t m10, int e10)
 	}
 
 #ifdef RYU_DEBUG
-	printf("m2 * 2^e2 = %u * 2^%d\n", m2, e2);
+	printf("m2 * 2^e2 = %lu * 2^%ld\n", m2, e2);
 #endif
 
 	// Compute the final IEEE exponent.
@@ -142,8 +144,8 @@ __atof_engine(uint32_t m10, int e10)
 	int32_t shift = (ieee_e2 == 0 ? 1 : ieee_e2) - e2 - FLOAT_EXPONENT_BIAS - FLOAT_MANTISSA_BITS;
 	assert(shift >= 0);
 #ifdef RYU_DEBUG
-	printf("ieee_e2 = %d\n", ieee_e2);
-	printf("shift = %d\n", shift);
+	printf("ieee_e2 = %ld\n", ieee_e2);
+	printf("shift = %ld\n", shift);
 #endif
 
 	// We need to round up if the exact value is more than 0.5 above the value we computed. That's
@@ -157,7 +159,7 @@ __atof_engine(uint32_t m10, int e10)
 
 #ifdef RYU_DEBUG
 	printf("roundUp = %d\n", roundUp);
-	printf("ieee_m2 = %u\n", (m2 >> shift) + roundUp);
+	printf("ieee_m2 = %lu\n", (m2 >> shift) + roundUp);
 #endif
 	uint32_t ieee_m2 = (m2 >> shift) + roundUp;
         assert(ieee_m2 <= (1u << (FLOAT_MANTISSA_BITS + 1)));