vfprintf.c - source file for reduced version of printf
Modified for pic16 port, by Vangelis Rokas, 2005 (vrokas@otenet.gr)
-
+ Bug-fixed and feature-enhanced by Mauro Giachero, 2008 (mauro.giachero@gmail.com)
+
Written By - Sandeep Dutta . sandeep.dutta@usa.net (1999)
This library is free software; you can redistribute it and/or modify it
In other words, you are welcome to use, share and improve this program.
You are forbidden to forbid anyone else to use, share and improve
what you give them. Help stamp out software-hoarding!
--------------------------------------------------------------------------*/
-/*
-** $Id$
-*/
+ As a special exception, if you link this library with other files,
+ some of which are compiled with SDCC, to produce an executable,
+ this library does not by itself cause the resulting executable
+ to be covered by the GNU General Public License.
+ This exception does not however invalidate any other reasons why
+ the executable file might be covered by the GNU General Public License.
+-------------------------------------------------------------------------*/
/* following formats are supported :-
format output type argument-type
+ %% - -
+ %u unsigned int
%u* unsigned *
- %b binary
+ %b binary int
+ %lb binary long
+ %hb binary char
%d decimal int
- %ld decimal long
- %hd decimal char
- %x hexadecimal int
- %lxX hexadecimal long
- %hxX hexadecimal char
+ %lu unsigned long
+ %hu unsigned char
+ %l[di] decimal long
+ %lu[di] unsigned long
+ %h[di] decimal char
+ %hu[di] unsigned char
+ %[xX] hexadecimal int
+ %l[xX] hexadecimal long
+ %h[xX] hexadecimal char
%o octal int
%lo octal long
%ho octal char
%c character char
%s character generic pointer
+ Also supported are:
+ - the '0', '-' and ' ' alignment modifiers
+ - the '+' and ' ' modifiers
+ - the width field for integral types
+ - the precision field for strings
*/
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
+/***********************************************************
+ * The following switches enable some "advanced" features. *
+ * With all the switches enabled: *
+ * ; Statistics: *
+ * ; code size: 2062 (0x080e) bytes ( 1.57%) *
+ * ; 1031 (0x0407) words *
+ * ; udata size: 16 (0x0010) bytes ( 1.25%) *
+ * ; access size: 31 (0x001f) bytes *
+ * With all the switches disabled: *
+ * ; Statistics: *
+ * ; code size: 1278 (0x04fe) bytes ( 0.98%) *
+ * ; 639 (0x027f) words *
+ * ; udata size: 16 (0x0010) bytes ( 1.25%) *
+ * ; access size: 25 (0x0019) bytes *
+ ***********************************************************/
+/*
+ * Define this to enable support of the field width, which
+ * allows to specify the minimum number of characters an
+ * integer must use.
+ * Costs ~200 code words and 3 bytes in access RAM.
+ */
+#define FIELD_WIDTH
+/*
+ * Define this to enable support of the precision, which
+ * allows to specify the maximum number of characters a
+ * string can use. Note that this implementation doesn't
+ * use this field for integers (as it should).
+ * Costs ~85 code words and 1 byte in access RAM.
+ */
+#define PRECISION
+/*
+ * Define this to enable support of the '+' and ' ' modifiers,
+ * which specify that a positive signed number must be
+ * preceded respectively with a '+' or a ' ' character.
+ * Costs ~70 code words and 2 words of access RAM
+ */
+#define SIGN_MODIFIERS
+/*
+ * With this macro defined, trying to print a float number
+ * will generate the "<NO FLOAT>" string.
+ * Costs ~25 code words
+ */
+#define FLOAT_PLACEHOLDER
+/*
+ * This macro enables the use of the 'b' binary specifier and
+ * the use of "%b", "%hb" and "%lb"
+ */
+/* #define BINARY_SPECIFIER */
+/*
+ * This macro enables the use of the 'i' integer specifier and
+ * the use of "%u", "%lu", ... in place of "%ud", "%lud", ... .
+ * costs ~10 code words
+ */
+#define EXTRA_INTEGER
+
+#ifdef BINARY_SPECIFIER
+/* "%lb" = "0" - "11111111111111111111111111111111" */
+# define BUF_SIZE 33
+#else
+/* "%lo" = "0" - "37777777777" or "-20000000000" - "17777777777" */
+# define BUF_SIZE 13
+#endif
+
#if _DEBUG
-extern void io_long(unsigned long);
-extern void io_str(char *);
-extern void io_int(unsigned int);
+extern void io_long (unsigned long);
+extern void io_str (char *);
+extern void io_int (unsigned int);
#endif
-unsigned int vfprintf(FILE *stream, char *fmt, va_list ap)
+int
+vfprintf (FILE * stream, const char *fmt, va_list ap)
{
unsigned char radix;
- unsigned char flong, fstr;
- unsigned char fchar, nosign;
+ unsigned char flong;
+ unsigned char fstr;
+ unsigned char fchar;
+#ifdef FLOAT_PLACEHOLDER
+ unsigned char ffloat;
+#endif
+ unsigned char nosign;
unsigned char upcase;
- unsigned int count=0;
- unsigned char *str, *ch;
- data char *str1;
+#ifdef FIELD_WIDTH
+ unsigned char fieldwidth;
+ unsigned char lalign;
+ char padchar;
+ char *str1;
+#endif
+#ifdef PRECISION
+ unsigned char precision;
+#endif
+#ifdef SIGN_MODIFIERS
+ unsigned char printsign;
+ char positivechar;
+#endif
+ int count = 0;
+ char *str, *ch;
long val;
-// static char buffer[16];
- char buffer[16];
-
+ char buffer[BUF_SIZE];
#if _DEBUG
- io_str( "vfprintf: " );
- io_long( (unsigned long)stream );
- io_long( (unsigned long)fmt );
+ io_str ("vfprintf: ");
+ io_long ((unsigned long) stream);
+ io_long ((unsigned long) fmt);
#endif
// va_start(ap,fmt);
- ch = fmt;
-
- while( *ch ) { //for (; *fmt ; fmt++ )
- if (*ch == '%') {
- flong = 0;
- fstr = 0;
- fchar = 0;
- nosign = 0;
- radix = 0;
- upcase = 0;
- ch++;
+ ch = fmt;
- if(*ch == 'u') {
- nosign = 1;
- ch++;
+ while (*ch) //for (; *fmt ; fmt++ )
+ {
+ if (*ch == '%')
+ {
+ flong = 0;
+ fstr = 0;
+ fchar = 0;
+#ifdef FLOAT_PLACEHOLDER
+ ffloat = 0;
+#endif
+ nosign = 0;
+ radix = 10;
+ upcase = 0;
+#ifdef FIELD_WIDTH
+ fieldwidth = 0;
+ lalign = 0;
+ padchar = ' ';
+#endif
+#ifdef PRECISION
+ // precision == -1 is used as an "unlimited" precision marker
+ precision = -1;
+#endif
+#ifdef SIGN_MODIFIERS
+ printsign = 0;
+ positivechar = '+';
+#endif
+ ++ch;
+
+ if (*ch == '%')
+ {
+ __stream_putchar (stream, *ch);
+ ++count;
+ ++ch;
+ continue;
+ }
+
+#ifdef FIELD_WIDTH
+ if (*ch == '0')
+ {
+ padchar = '0';
+ ++ch;
}
-
- if(*ch == 'l') {
+
+ if (*ch == '-')
+ {
+ lalign = 1;
+ ++ch;
+ }
+#endif
+#ifdef SIGN_MODIFIERS
+ if (*ch == ' ')
+ {
+ printsign = 1;
+ positivechar = ' ';
+ ++ch;
+ }
+
+ if (*ch == '+')
+ {
+ printsign = 1;
+ ++ch;
+ }
+#endif
+
+#ifdef FIELD_WIDTH
+ if ((*ch >= '1') && (*ch <= '9'))
+ {
+ while ((*ch >= '0') && (*ch <= '9'))
+ {
+ fieldwidth = 10 * fieldwidth + (*ch) - '0';
+ ++ch;
+ }
+ }
+#endif
+
+#ifdef PRECISION
+ if (*ch == '.')
+ {
+ ++ch;
+ precision = 0;
+ while ((*ch >= '0') && (*ch <= '9'))
+ {
+ precision = 10 * precision + (*ch) - '0';
+ ++ch;
+ }
+ }
+#endif
+
+ if (*ch == 'l')
+ {
flong = 1;
- ch++;
- } else
- if(*ch == 'h') {
+ ++ch;
+ }
+ else if (*ch == 'h')
+ {
fchar = 1;
- ch++;
- }
-
- if(*ch == 's')fstr = 1;
- else if(*ch == 'd')radix = 10;
- else if(*ch == 'x'){ radix = 16; upcase = 0; }
- else if(*ch == 'X'){ radix = 16; upcase = 1; }
- else if(*ch == 'c')radix = 0;
- else if(*ch == 'o')radix = 8;
- else if(*ch == 'b')radix = 2;
-
- if(fstr) {
- str = va_arg(ap, char *);
- while(*str) { __stream_putchar(stream, *str); str++; count++; }
- } else {
+ ++ch;
+ }
+
+ if (*ch == 'u')
+ {
+ nosign = 1;
+ ++ch;
+ }
+
+ if (*ch == 's')
+ {
+ fstr = 1;
+#ifdef FIELD_WIDTH
+ padchar = ' '; /* Strings are always space-padded */
+#endif
+ }
+ else if (*ch == 'x')
+ radix = 16;
+ else if (*ch == 'X')
+ {
+ radix = 16;
+ upcase = 1;
+ }
+ else if (*ch == 'c')
+ radix = 0;
+ else if (*ch == 'o')
+ radix = 8;
+#ifdef BINARX_SPECIFIER
+ else if (*ch == 'b')
+ radix = 2;
+#endif
+#ifdef FLOAT_PLACEHOLDER
+ else if (*ch == 'f')
+ {
+ ffloat = 1;
+# ifdef PRECISION
+ precision = -1;
+# endif
+ }
+#endif
+#ifdef EXTRA_INTEGER
+ else if ((*ch == 'd') || (*ch == 'i')) /* This is the default */
+ ;
+ else if (nosign) /* %u alone is the same as %ud */
+ --ch;
+#else
+ else if (*ch == 'd')
+ ;
+#endif
+ else
+ {
+ __stream_putchar (stream, *ch);
+ ++count;
+ ++ch;
+ continue;
+ }
+
+ if (fstr)
+ {
+ str = va_arg (ap, char *);
+#ifdef FLOAT_PLACEHOLDER
+ }
+ else if (ffloat)
+ {
+ str = "<NO FLOAT>";
+ va_arg (ap, float);
+#endif
+ }
+ else
+ {
+#ifdef PRECISION
+ precision = -1; //FIXME: No support for the precision field on numerals
+#endif
val = 0;
- if(flong) {
- val = va_arg(ap, long);
+ if (flong)
+ {
+ val = va_arg (ap, long);
#if _DEBUG
- io_long(val);
+ io_long (val);
#endif
- }
- else
- if(fchar) {
- val = va_arg(ap, char);
+ }
+ else if (fchar)
+ {
+ val = (char) va_arg (ap, int); // FIXME: SDCC passes 1-byte char varargs as 2-byte ints...
+ if ((radix != 10) || nosign)
+ val = (unsigned char) val; //Avoid unwanted sign extension
#if _DEBUG
- io_long(val);
+ io_long (val);
#endif
- }
- else {
- val = va_arg(ap, int);
+ }
+ else
+ {
+ val = va_arg (ap, int);
+ if ((radix != 10) || nosign)
+ val = (unsigned int) val; //Avoid unwanted sign extension
#if _DEBUG
- io_long(val);
-#endif
- }
-
- if(radix) {
- if(nosign)
- ultoa(val, buffer, radix);
- else
- ltoa (val, buffer, radix);
-
- str1 = buffer;
- while( (*str1) ) {
- radix = *str1;
- if(upcase)
- radix = toupper( radix );
- __stream_putchar(stream, (unsigned char)radix);
- count++;
- str1++;
+ io_long (val);
+#endif
+ }
+
+ str = buffer + 1; //Reserve space for a forced '+'
+ if (radix)
+ {
+ if (nosign)
+ ultoa (val, buffer + 1, radix);
+ else
+ ltoa (val, buffer + 1, radix);
+#ifdef SIGN_MODIFIERS
+ if (printsign && (*str != '-'))
+ {
+ --str;
+ *str = positivechar;
+ }
+#endif
+ }
+ else
+ {
+ *str = (unsigned char) val;
+ *(str + 1) = '\0';
}
- } else {
- __stream_putchar(stream, (unsigned char)val);
- count++;
- }
}
- } else {
- __stream_putchar(stream, *ch);
- count++;
- }
- ch++;
+#ifdef FIELD_WIDTH
+ //Count how many pad chars are required in fieldwidth
+ str1 = str;
+ while (fieldwidth && *str1)
+ {
+ ++str1;
+ --fieldwidth;
+ }
+ //Left padding
+ if (!lalign)
+ {
+ while (fieldwidth)
+ {
+ __stream_putchar (stream, padchar);
+ ++count;
+ --fieldwidth;
+ }
+ }
+#endif
+ while (*str
+#ifdef PRECISION
+ && (!~precision || precision--)
+#endif
+ )
+ {
+ radix = *str;
+ if (upcase)
+ {
+ radix = toupper (radix);
+ }
+ __stream_putchar (stream, radix);
+ ++str;
+ ++count;
+ }
+#ifdef FIELD_WIDTH
+ //Right padding (with spaces)
+ if (lalign)
+ {
+ while (fieldwidth)
+ {
+ __stream_putchar (stream, ' ');
+ ++count;
+ --fieldwidth;
+ }
+ }
+#endif
+ }
+ else
+ {
+ __stream_putchar (stream, *ch);
+ ++count;
+ }
+
+ ++ch;
}
-
- return (count);
+
+ return count;
}
projects / fw / sdcc / blobdiff