From ab1aeb4f801e31043ea1ee9bc7e4515465b1c581 Mon Sep 17 00:00:00 2001 From: johanknol Date: Mon, 4 Jun 2001 14:30:40 +0000 Subject: [PATCH] Was's (was@icb.snz.chel.su) efficiency patch. git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@868 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- device/include/stdio.h | 4 +- device/lib/printfl.c | 242 ++++++++++++++++------------------------- 2 files changed, 97 insertions(+), 149 deletions(-) diff --git a/device/include/stdio.h b/device/include/stdio.h index 4f145a91..8f96752c 100644 --- a/device/include/stdio.h +++ b/device/include/stdio.h @@ -31,8 +31,8 @@ #include #endif -extern printf_small (char *,...) reentrant; -extern printf (const char *,...) reentrant; +extern void printf_small (char *,...) reentrant; +extern int printf (const char *,...) reentrant; extern int vprintf (const char *, va_list); extern int sprintf (const char *, const char *, ...) reentrant; extern int vsprintf (const char *, const char *, va_list); diff --git a/device/lib/printfl.c b/device/lib/printfl.c index 6e1012ec..ba5a3fa6 100644 --- a/device/lib/printfl.c +++ b/device/lib/printfl.c @@ -20,8 +20,11 @@ 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! + + 2001060401: Improved by was@icb.snz.chel.su -------------------------------------------------------------------------*/ + /* following formats are supported :- format output type argument-type %d decimal int @@ -39,7 +42,7 @@ #include #include -extern void putchar(char ); +#include static data volatile char ch; static data char radix ; @@ -50,94 +53,51 @@ static bit sign; static char * data str ; static data long val; -static void pvalhex( long val) +static void pval(void) { - volatile char sp = SP; - unsigned long lval = val; - - if (!long_flag) - lval &= 0x0000ffff; - - if (short_flag) - lval &= 0x000000ff; - - do { - ch = "0123456789ABCDEF"[(unsigned short)lval & 0x0f]; - _asm push _ch _endasm; - lval /= 16; - } while (lval); - - while (sp != SP) { - _asm pop _ch _endasm; - putchar(ch); - } - -} + char sp; + unsigned long lval; + sp = SP; + + if (val < 0 && radix != 16) + { + lval = -val; + sign = 1; + } + else { sign = 0; lval = val;} + + if (!long_flag) { + lval &= 0x0000ffff; + } + if (short_flag) { + lval &= 0x000000ff; + } + + do + { +#if 1 + if(radix != 16) ch = (lval % radix) + '0'; + else ch = "0123456789ABCDEF"[(unsigned short)lval & 0x0f]; + _asm push _ch _endasm; + lval /= radix; +#else + // This only looks more efficient, but isn't. see the .map + ch = (lval % radix) + '0'; + if (ch>'9') ch+=7; + _asm push _ch _endasm; + lval /= radix; +#endif + } + while (lval); -static void pvaloct(long val) -{ - char sp ; - unsigned long lval; - sp = SP; - if (val < 0) { - lval = -val; - sign = 1; - } else { - lval = val; - sign = 0; - } - - if (!long_flag) - lval &= 0x0000ffff; - if (short_flag) - lval &= 0x000000ff; - - do { - ch = (lval % 8) + '0'; - _asm push _ch _endasm; - lval = lval / 8; - } while (lval); - - if (sign) { - ch = '-'; - _asm push _ch _endasm; - } - - - while (sp != SP) { - _asm pop _ch _endasm; - putchar(ch); + if (sign) { + ch = '-'; + _asm push _ch _endasm; } -} -static void pvaldec(long val ) -{ - char sp ; - unsigned long lval; - sp = SP; - if (val < 0) { - lval = -val; - sign = 1; - } else { - lval = val; - sign = 0; - } - - do { - ch = (lval % 10) + '0'; - _asm push _ch _endasm; - lval = lval / 10; - } while (lval); - - if (sign) { - ch = '-'; - _asm push _ch _endasm; - } - - - while (sp != SP) { - _asm pop _ch _endasm; - putchar(ch); + while (sp != SP) { + _asm pop _ch _endasm; + putchar(ch); } } @@ -148,67 +108,55 @@ void printf_small (char * fmt, ... ) reentrant va_start(ap,fmt); for (; *fmt ; fmt++ ) { - if (*fmt == '%') { - long_flag = string_flag = short_flag = 0; - fmt++ ; - switch (*fmt) { - case 'l': - long_flag = 1; - fmt++; - break; - case 'h': - short_flag = 1; - fmt++; - } - - switch (*fmt) { - case 's': - string_flag = 1; - break; - case 'd': - radix = 10; - break; - case 'x': - radix = 16; - break; - case 'c': - radix = 0; - break; - case 'o': - radix = 8; - break; - } - - if (string_flag) { - str = va_arg(ap,char _generic *); - while (*str) putchar(*str++); - continue ; - } - - if (long_flag) - val = va_arg(ap,long); - else - if (short_flag) - val = va_arg(ap,short); - else - val = va_arg(ap,int); - - switch (radix) { - case 10: - pvaldec(val) ; - break; - case 16: - pvalhex (val); - break; - case 0: - putchar((char)val); - break; - case 8: - pvaloct(val) ; - break; - } - - } else - putchar(*fmt); + if (*fmt == '%') { + long_flag = string_flag = short_flag = 0; + fmt++ ; + switch (*fmt) { + case 'l': + long_flag = 1; + fmt++; + break; + case 'h': + short_flag = 1; + fmt++; + } + + switch (*fmt) { + case 's': + string_flag = 1; + break; + case 'd': + radix = 10; + break; + case 'x': + radix = 16; + break; + case 'c': + radix = 0; + break; + case 'o': + radix = 8; + break; + } + + if (string_flag) { + str = va_arg(ap, char _generic *); + while (*str) putchar(*str++); + continue ; + } + + if (long_flag) + val = va_arg(ap,long); + else + if (short_flag) + val = va_arg(ap,short); + else + val = va_arg(ap,int); + + if (radix) pval(); + else putchar((char)val); + + } else + putchar(*fmt); } } -- 2.47.2