# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1384455832 0
# Node ID 4d629b6bbcfdeb859228a0efe85a7f21e5ca5b18
# Parent  7e45ada9c3656710071c6f7e052425e9430c614d
gsm-fw/sprintf: %f implemented, debug output looks correct

diff -r 7e45ada9c365 -r 4d629b6bbcfd gsm-fw/sprintf/Makefile
--- a/gsm-fw/sprintf/Makefile	Thu Nov 14 17:51:33 2013 +0000
+++ b/gsm-fw/sprintf/Makefile	Thu Nov 14 19:03:52 2013 +0000
@@ -3,7 +3,7 @@
 AR=	arm-elf-ar
 RANLIB=	arm-elf-ranlib
 
-OBJS=	integer.o sprintf.o vspcore.o
+OBJS=	float.o integer.o sprintf.o vspcore.o
 
 all:	libsprintf.a
 
diff -r 7e45ada9c365 -r 4d629b6bbcfd gsm-fw/sprintf/float.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gsm-fw/sprintf/float.c	Thu Nov 14 19:03:52 2013 +0000
@@ -0,0 +1,103 @@
+/*
+ * Embedded [v]sprintf() implementation by Michael Spacefalcon,
+ * loosely based on the 4.3BSD-Tahoe version.
+ *
+ * This module contains the floating point conversion functions.
+ */
+
+#include <sys/types.h>
+#include <ctype.h>
+#include "defs.h"
+
+extern double modf();
+
+extern u_char * _sprintf_field(u_char *op, int width, int flags, int sign,
+			u_char *body, int size, int dprec, int fpprec);
+
+#define	MAX_INT_DIGITS	10	/* 2^32-1 in decimal */
+#define	MAXFRACT	16	/* max sensible for 64-bit double */
+#define	DEFPREC		6
+
+static char *
+emit_integer_portion(unsigned number, char *endp)
+{
+	char *t = endp;
+
+	do {
+		*--t = tochar(number % 10);
+		number /= 10;
+	} while (number);
+	return (t);
+}
+
+static int
+f_round(double fract, char *start, char *end, int sign)
+{
+	double tmp;
+
+	(void)modf(fract * 10, &tmp);
+	if (tmp > 4)
+		for (;; --end) {
+			if (*end == '.')
+				--end;
+			if (++*end <= '9')
+				break;
+			*end = '0';
+		}
+	/* ``"%.3f", (double)-0.0004'' gives you a negative 0. */
+	else if (sign == '-')
+		for (;; --end) {
+			if (*end == '.')
+				--end;
+			if (*end != '0')
+				break;
+			if (end == start)
+				return(1);	/* clear the -ve */
+		}
+	return(0);
+}
+
+u_char *
+_sprintf_percent_f(u_char *op, int width, int flags, int sign,
+		double number, int prec)
+{
+	char buf[MAX_INT_DIGITS + 1 + MAXFRACT];
+	int extra_prec = 0;
+	int origsign = sign;
+	double fract, tmp;
+	char *start, *t;
+
+	if (number < 0) {
+		sign = '-';
+		number = -number;
+	}
+	fract = modf(number, &tmp);
+	if (tmp > (double) 0xFFFFFFFF)
+		return _sprintf_field(op, width, flags, sign, "Toobig", 6,
+					0, 0);
+	start = emit_integer_portion((unsigned) tmp, buf + MAX_INT_DIGITS);
+	if (prec > MAXFRACT) {
+		extra_prec = prec - MAXFRACT;
+		prec = MAXFRACT;
+	} else if (prec == -1)
+		prec = DEFPREC;
+	t = buf + MAX_INT_DIGITS;
+	/*
+	 * if precision required or alternate flag set, add in a
+	 * decimal point.
+	 */
+	if (prec || flags&ALT)
+		*t++ = '.';
+	/* if requires more precision and some fraction left */
+	if (fract) {
+		if (prec)
+			do {
+				fract = modf(fract * 10, &tmp);
+				*t++ = tochar((int)tmp);
+			} while (--prec && fract);
+		if (fract && f_round(fract, start, t - 1, sign))
+			sign = origsign;
+	}
+	return _sprintf_field(op, width, flags, sign, start, t - start,
+				0, prec + extra_prec);
+}
diff -r 7e45ada9c365 -r 4d629b6bbcfd gsm-fw/sprintf/vspcore.c
--- a/gsm-fw/sprintf/vspcore.c	Thu Nov 14 17:51:33 2013 +0000
+++ b/gsm-fw/sprintf/vspcore.c	Thu Nov 14 19:03:52 2013 +0000
@@ -202,12 +202,10 @@
 			op = _sprintf_integer(op, width, flags, sign, un, 10,
 						prec);
 			break;
-#if 0	// not yet implemented
 		case 'f':
 			op = _sprintf_percent_f(op, width, flags, sign,
 						va_arg(argp, double), prec);
 			break;
-#endif
 		case 'n':
 			n = op - buf0;
 			if (flags & LONGINT)