From: MaartenBrock <MaartenBrock@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 8 Jan 2007 22:18:40 +0000 (+0000)
Subject: * device/lib/printf_large.c (output_float): removed recursion,
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=fb3bb0afff1463435cd598c66e107394f5bf5f44;p=fw%2Fsdcc

* device/lib/printf_large.c (output_float): removed recursion,
  use smaller buffer on stack for mcs51,
  fixed bug printing 1.96
* support/regression/tests/snprintf.c: added test

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4565 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index 91e7a09b..7c5536f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-08 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* device/lib/printf_large.c (output_float): removed recursion,
+	  use smaller buffer on stack for mcs51,
+	  fixed bug printing 1.96
+	* support/regression/tests/snprintf.c: added test
+
 2007-01-07 Borut Razem <borut.razem AT siol.net>
 
 	* use dynamic memory buffers instead temporary files
diff --git a/device/lib/printf_large.c b/device/lib/printf_large.c
index 7d42abc2..cb469b61 100644
--- a/device/lib/printf_large.c
+++ b/device/lib/printf_large.c
@@ -211,7 +211,11 @@ output_float (float f, unsigned char reqWidth,
               pfn_outputchar output_char, void* p)
 {
   unsigned char charsOutputted = 0;
+ #if defined (SDCC_mcs51)
+  char fpBuffer[16];      //mcs51 has only a small stack
+ #else
   char fpBuffer[128];
+ #endif
 #else
 #define OUTPUT_FLOAT(F, W, D, L, Z, S, P)	output_float(F, W, D, L, Z, S, P)
 static void
@@ -223,9 +227,11 @@ output_float (float f, unsigned char reqWidth,
 #endif //SDCC_STACK_AUTO
   BOOL negative = 0;
   unsigned long integerPart;
+  float rounding;
   float decimalPart;
   char fpBI=0, fpBD;
   unsigned char minWidth, i;
+  signed char exp = -128;
 
   // save the sign
   if (f<0) {
@@ -235,7 +241,6 @@ output_float (float f, unsigned char reqWidth,
 
   if (f>0x00ffffff) {
     // this part is from Frank van der Hulst
-    signed char exp;
 
     for (exp = 0; f >= 10.0; exp++) f /=10.0;
     for (       ; f < 1.0;   exp--) f *=10.0;
@@ -247,28 +252,27 @@ output_float (float f, unsigned char reqWidth,
         OUTPUT_CHAR ('+', p);
       }
     }
-#ifdef SDCC_STACK_AUTO
-    charsOutputted += OUTPUT_FLOAT(f, 0, reqDecimals, 0, 0, 0, 0);
-#else
-    OUTPUT_FLOAT(f, 0, reqDecimals, 0, 0, 0, 0);
-#endif
-    OUTPUT_CHAR ('e', p);
-    if (exp<0) {
-      OUTPUT_CHAR ('-', p);
-      exp = -exp;
-    }
-    OUTPUT_CHAR ('0'+exp/10, p);
-    OUTPUT_CHAR ('0'+exp%10, p);
-#ifdef SDCC_STACK_AUTO
-    return charsOutputted;
-#else
-    return;
-#endif //SDCC_STACK_AUTO
+    reqWidth = 0;
+    left = 0;
+    zero = 0;
+    sign = 0;
+    space = 0;
   }
 
+  // display some decimals as default
+  if (reqDecimals==-1)
+    reqDecimals=DEFAULT_FLOAT_PRECISION;
+
+  // round the float
+  rounding = 0.5;
+  for (i=reqDecimals; i>0; i--) {
+      rounding /= 10.0;
+  }
+  f += rounding;
+
   // split the float
-  integerPart=f;
-  decimalPart=f-integerPart;
+  integerPart = f;
+  decimalPart = f - integerPart;
 
   // fill the buffer with the integerPart (in reversed order!)
   while (integerPart) {
@@ -280,25 +284,15 @@ output_float (float f, unsigned char reqWidth,
     fpBuffer[fpBI++]='0';
   }
 
-  // display some decimals as default
-  if (reqDecimals==-1)
-    reqDecimals=DEFAULT_FLOAT_PRECISION;
-
   // fill buffer with the decimalPart (in normal order)
   fpBD=fpBI;
 
-  for (i=reqDecimals; i>1; i--) {
+  for (i=reqDecimals; i>0; i--) {
       decimalPart *= 10.0;
       // truncate the float
-      integerPart=decimalPart;
-      fpBuffer[fpBD++]='0' + integerPart;
-      decimalPart-=integerPart;
-  }
-  if (i) {
-    decimalPart *= 10.0;
-    // truncate the float
-    integerPart = decimalPart + 0.5;
-    fpBuffer[fpBD++] = '0' + integerPart;
+      integerPart = decimalPart;
+      fpBuffer[fpBD++] = '0' + integerPart;
+      decimalPart -= integerPart;
   }
 
   minWidth=fpBI; // we need at least these
@@ -379,6 +373,16 @@ output_float (float f, unsigned char reqWidth,
       OUTPUT_CHAR(' ', p);
     }
   }
+
+  if (exp != -128) {
+    OUTPUT_CHAR ('e', p);
+    if (exp<0) {
+      OUTPUT_CHAR ('-', p);
+      exp = -exp;
+    }
+    OUTPUT_CHAR ('0'+exp/10, p);
+    OUTPUT_CHAR ('0'+exp%10, p);
+  }
 #ifdef SDCC_STACK_AUTO
   return charsOutputted;
 #else
diff --git a/support/regression/tests/snprintf.c b/support/regression/tests/snprintf.c
index 82272041..8579e878 100644
--- a/support/regression/tests/snprintf.c
+++ b/support/regression/tests/snprintf.c
@@ -102,6 +102,7 @@
 		{1.0,	"%f",	"<NO FLOAT>"},
 		#else
 		{1.0,	"%f",	"1.000000"},
+		{1.96,	"%3.1f",	"2.0"},
 		#endif
 	};