X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fformatwr.c;h=f8df352ee8523394bffa2cdf87b9a55069b7f42f;hb=6c1e871a96baf4245a04f0135d00fbea59af041c;hp=ed52ea291a9a8698fce5ac81a87293a99bd151fc;hpb=0f244fe7278884ce743f51a3215d299b2f1008b8;p=bertos.git

diff --git a/mware/formatwr.c b/mware/formatwr.c
index ed52ea29..f8df352e 100755
--- a/mware/formatwr.c
+++ b/mware/formatwr.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
@@ -53,6 +53,27 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.19  2006/09/20 13:58:17  marco
+ *#* Added z modifier in string format.
+ *#*
+ *#* Revision 1.18  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.17  2005/11/04 17:43:27  bernie
+ *#* Fix for LP64 architectures; Add some more tests.
+ *#*
+ *#* Revision 1.16  2005/07/19 07:25:46  bernie
+ *#* Use appconfig.h instead of cfg/config.h.
+ *#*
+ *#* Revision 1.15  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.14  2005/03/01 23:26:22  bernie
+ *#* Use shared hextab.
+ *#*
+ *#* Revision 1.13  2005/02/18 12:33:25  bernie
+ *#* Avoid strlen().
+ *#*
  *#* Revision 1.12  2005/02/16 20:28:03  bernie
  *#* Add %S formatter.
  *#*
@@ -70,18 +91,18 @@
  *#*/
 
 #include "formatwr.h"
-#include "pgm.h"
-//#include <compiler.h> /* progmem macros */
-#include <config.h> /* CONFIG_ macros */
-#include <debug.h> /* ASSERT */
+#include <mware/pgm.h>
+#include <mware/hex.h>
+#include <cfg/debug.h> /* ASSERT */
+#include <appconfig.h> /* CONFIG_ macros */
 
 #ifndef CONFIG_PRINTF_N_FORMATTER
-	/*! Disable the arcane %n formatter. */
+	/** Disable the arcane %n formatter. */
 	#define CONFIG_PRINTF_N_FORMATTER 0
 #endif
 
 #ifndef CONFIG_PRINTF_OCTAL_FORMATTER
-	/*! Disable the %o formatter. */
+	/** Disable the %o formatter. */
 	#define CONFIG_PRINTF_OCTAL_FORMATTER 0
 #endif
 
@@ -305,7 +326,7 @@ CLEAN_UP:
 
 #endif /* CONFIG_PRINTF > PRINTF_NOFLOAT */
 
-/*!
+/**
  * This routine forms the core and entry of the formatter.
  *
  * The conversion performed conforms to the ANSI specification for "printf".
@@ -400,7 +421,7 @@ PGM_FUNC(_formatted_write)(const char * PGM_ATTR format,
 		flags.progmem = false;
 #endif
 		ptr = buf_pointer = &buf[0];
-		hex = "0123456789ABCDEF";
+		hex = HEX_tab;
 
 		/* check for leading '-', '+', ' ','#' or '0' flags  */
 		for (;;)
@@ -480,11 +501,12 @@ NEXT_FLAG:
 		flags.l_L_modifier = false;
 		flags.h_modifier = false;
 
-		/* Optional 'l','L' r 'h' modifier? */
+		/* Optional 'l','L','z' or 'h' modifier? */
 		switch (PGM_READ_CHAR(format))
 		{
 			case 'l':
 			case 'L':
+			case 'z':
 				flags.l_L_modifier = true;
 				format++;
 				break;
@@ -572,7 +594,7 @@ NEXT_FLAG:
 					precision++;
 #endif
 			case 'x':
-				hex = "0123456789abcdef";
+				hex = hex_tab;
 			case 'u':
 			case 'p':
 			case 'X':
@@ -580,15 +602,15 @@ NEXT_FLAG:
 #if defined(__AVR__) || defined(__I196__) /* 16bit pointers */
 					ulong = (unsigned long)(unsigned short)va_arg(ap, char *);
 #else /* 32bit pointers */
-				ulong = (unsigned long)va_arg(ap, char *);
+					ulong = (unsigned long)va_arg(ap, char *);
 #endif /* 32bit pointers */
-				else if (sizeof(short) == sizeof(int))
-					ulong = flags.l_L_modifier ?
-						va_arg(ap, unsigned long) : (unsigned long)va_arg(ap, unsigned int);
+				else if (flags.l_L_modifier)
+					ulong = va_arg(ap, unsigned long);
+				else if (flags.h_modifier)
+					ulong = (unsigned long)(unsigned short)va_arg(ap, unsigned int);
 				else
-					ulong = flags.h_modifier ?
-						(unsigned long)(unsigned short) va_arg(ap, int)
-						: (unsigned long)va_arg(ap, int);
+					ulong = va_arg(ap, unsigned int);
+
 				flags.div_factor =
 #if CONFIG_PRINTF_OCTAL_FORMATTER
 					(format_flag == 'o') ? DIV_OCT :
@@ -599,32 +621,18 @@ NEXT_FLAG:
 
 			case 'd':
 			case 'i':
-				if (sizeof(short) == sizeof(long))
-				{
-					if ( (long)(ulong = va_arg(ap, unsigned long)) < 0)
-					{
-						flags.plus_space_flag = PSF_MINUS;
-						ulong = (unsigned long)(-((signed long)ulong));
-					}
-				}
-				else if (sizeof(short) == sizeof(int))
-				{
-					if ( (long)(ulong = flags.l_L_modifier ?
-								va_arg(ap,unsigned long) : (unsigned long)va_arg(ap,int)) < 0)
-					{
-						flags.plus_space_flag = PSF_MINUS;
-						ulong = (unsigned long)(-((signed long)ulong));
-					}
-				}
+				if (flags.l_L_modifier)
+					ulong = (unsigned long)(long)va_arg(ap, long);
 				else
+					ulong = (unsigned long)(long)va_arg(ap, int);
+
+				/* Extract sign */
+				if ((signed long)ulong < 0)
 				{
-					if ( (signed long)(ulong = (unsigned long) (flags.h_modifier ?
-									(short) va_arg(ap, int) : va_arg(ap,int))) < 0)
-					{
-						flags.plus_space_flag = PSF_MINUS;
-						ulong = (unsigned long)(-((signed long)ulong));
-					}
+					flags.plus_space_flag = PSF_MINUS;
+					ulong = (unsigned long)(-((signed long)ulong));
 				}
+
 				flags.div_factor = DIV_DEC;
 
 				/* Now convert to digits */
@@ -738,7 +746,7 @@ FLOATING_CONVERSION:
 			default:
 				/* Undefined conversion! */
 				ptr = buf_pointer = bad_conversion;
-				ptr += strlen(bad_conversion);
+				ptr += sizeof(bad_conversion) - 1;
 				break;
 
 		}
@@ -816,7 +824,7 @@ FLOATING_CONVERSION:
 #else /* PRINTF_REDUCED starts here */
 
 #if CONFIG_PRINTF > PRINTF_NOMODIFIERS
-	char l_modifier, h_modifier;
+	bool l_modifier, h_modifier;
 	unsigned long u_val, div_val;
 #else
 	unsigned int u_val, div_val;
@@ -842,16 +850,16 @@ FLOATING_CONVERSION:
 		/*=================================*/
 		/* Optional 'l' or 'h' modifiers ? */
 		/*=================================*/
-		l_modifier = h_modifier = 0;
+		l_modifier = h_modifier = false;
 		switch (PGM_READ_CHAR(format))
 		{
 			case 'l':
-				l_modifier = 1;
+				l_modifier = true;
 				format++;
 				break;
 
 			case 'h':
-				h_modifier = 1;
+				h_modifier = true;
 				format++;
 				break;
 		}