Usermode/libc - ftoa() fixes, current test set passes
[tpg/acess2.git] / Usermode / Libraries / libc.so_src / printf.c
index e820718..bd67e00 100644 (file)
@@ -9,13 +9,30 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <acess/sys.h> // debug!
+#include <ctype.h>     // toupper
+#include <assert.h>    // assert() 
+
+// Quick booleans
+typedef char   BOOL;
+#define TRUE   1
+#define FALSE  0
 
 // === TYPES ===
 typedef void   (*printf_putch_t)(void *h, char ch);
+enum eFPN {
+       FPN_STD,
+       FPN_SCI,
+       FPN_SHORTEST,
+};
 
 // === PROTOTYPES ===
 void   itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned);
+size_t _printf_itoa(printf_putch_t putch_cb, void *putch_h, uint64_t num,
+       size_t base, int bUpper,
+       int bSigned, char SignChar, int Precision,
+       int PadLength, char PadChar, int bPadRight);
+size_t _printf_ftoa_hex(printf_putch_t putch_cb, void *putch_h, long double num, int Precision, int bForcePoint, int bForceSign, int bCapitals);
+size_t _printf_ftoa(printf_putch_t putch_cb, void *putch_h, long double num, size_t Base, enum eFPN Notation, int Precision, int bForcePoint, int bForceSign, int bCapitals);
 
 // === CODE ===
 /**
@@ -31,11 +48,11 @@ EXPORT int _vcprintf_int(printf_putch_t putch_cb, void *putch_h, const char *for
         int    c, minSize, precision, len;
        size_t  pos = 0;
        char    *p;
-       char    pad;
        uint64_t        arg;
-        int    bLongLong, bPadLeft;
-
-       _SysDebug("format=%s", format);
+       long double     arg_f;
+//     char    cPositiveChar;
+       BOOL    bLongLong, bLong, bJustifyLeft, bAltForm;
+       char    cNumPad, cPlus;
 
        #define _addchar(ch) do { \
                putch_cb(putch_h, ch); \
@@ -59,33 +76,57 @@ EXPORT int _vcprintf_int(printf_putch_t putch_cb, void *putch_h, const char *for
                        continue;
                }
                
-               bPadLeft = 0;
+               bAltForm = 0;
+               cNumPad = ' ';
+               bJustifyLeft = 0;
+               cPlus = '\0';
+               bLong = 0;
                bLongLong = 0;
                minSize = 0;
                precision = -1;
-               pad = ' ';
                
-               // Padding Character
-               if(c == '0') {
-                       pad = '0';
-                       c = *format++;
+               // - Flags
+               do
+               {
+                       // Alternate form (0<oct>, 0x<hex>, 123.)
+                       if(c == '#') {
+                               bAltForm = 1;
+                       }
+                       // Padding with '0'
+                       else if(c == '0') {
+                               cNumPad = '0';
+                       }
+                       // Pad on left
+                       else if(c == '-') {
+                               bJustifyLeft = 1;
+                       }
+                       // Include space for positive sign
+                       else if(c == ' ') {
+                               cPlus = ' ';
+                       }
+                       // Always include sign
+                       else if(c == '+') {
+                               cPlus = '+';
+                       }
+                       else
+                               break;
                }
+               while( (c = *format++) );
+               
                // Padding length
                if( c == '*' ) {
                        // Variable length
                        minSize = va_arg(args, size_t);
                        c = *format++;
                }
-               else {
-                       if('1' <= c && c <= '9')
+               else if('1' <= c && c <= '9')
+               {
+                       minSize = 0;
+                       while('0' <= c && c <= '9')
                        {
-                               minSize = 0;
-                               while('0' <= c && c <= '9')
-                               {
-                                       minSize *= 10;
-                                       minSize += c - '0';
-                                       c = *format++;
-                               }
+                               minSize *= 10;
+                               minSize += c - '0';
+                               c = *format++;
                        }
                }
 
@@ -109,12 +150,13 @@ EXPORT int _vcprintf_int(printf_putch_t putch_cb, void *putch_h, const char *for
                }
        
                // Check for long long
-               bLongLong = 0;
                if(c == 'l')
                {
+                       bLong = 1;
                        c = *format++;
                        if(c == 'l') {
                                bLongLong = 1;
+                               c = *format++;
                        }
                }
                
@@ -125,22 +167,22 @@ EXPORT int _vcprintf_int(printf_putch_t putch_cb, void *putch_h, const char *for
                switch( c )
                {
                // Signed Integer
-               case 'd':       case 'i':
+               case 'd':
+               case 'i':
                        // Get Argument
-                       if(bLongLong)   arg = va_arg(args, int64_t);
-                       else                    arg = va_arg(args, int32_t);
-                       itoa(tmp, arg, 10, minSize, pad, 1);
-                       precision = -1;
-                       goto sprintf_puts;
+                       arg = bLongLong ? va_arg(args, int64_t) : va_arg(args, int32_t);
+                       if( arg == 0 && precision == 0 )
+                               break;
+                       pos += _printf_itoa(putch_cb, putch_h, arg, 10, FALSE,
+                               TRUE, cPlus, precision, minSize, cNumPad, bJustifyLeft);
+                       break;
                
                // Unsigned Integer
                case 'u':
-                       // Get Argument
-                       if(bLongLong)   arg = va_arg(args, uint64_t);
-                       else                    arg = va_arg(args, uint32_t);
-                       itoa(tmp, arg, 10, minSize, pad, 0);
-                       precision = -1;
-                       goto sprintf_puts;
+                       arg = bLongLong ? va_arg(args, int64_t) : va_arg(args, int32_t);
+                       pos += _printf_itoa(putch_cb, putch_h, arg, 10, FALSE,
+                               FALSE, '\0', precision, minSize, cNumPad, bJustifyLeft);
+                       break;
                
                // Pointer
                case 'p':
@@ -148,50 +190,88 @@ EXPORT int _vcprintf_int(printf_putch_t putch_cb, void *putch_h, const char *for
                        _addchar('0');
                        _addchar('x');
                        arg = va_arg(args, intptr_t);
-                       itoa(tmp, arg, 16, minSize, pad, 0);
-                       precision = -1;
-                       goto sprintf_puts;
+                       pos += _printf_itoa(putch_cb, putch_h, arg, 16, FALSE,
+                               FALSE, '\0', sizeof(intptr_t)*2, 0,'\0',FALSE);
+                       break;
                // Unsigned Hexadecimal
+               case 'X':
                case 'x':
-                       if(bLongLong)   arg = va_arg(args, uint64_t);
-                       else                    arg = va_arg(args, uint32_t);
-                       itoa(tmp, arg, 16, minSize, pad, 0);
-                       precision = -1;
-                       goto sprintf_puts;
+                       if(bAltForm) {
+                               _addchar('0');
+                               _addchar(c);
+                       }
+                       arg = bLongLong ? va_arg(args, int64_t) : va_arg(args, int32_t);
+                       pos += _printf_itoa(putch_cb, putch_h, arg, 16, c=='X',
+                               FALSE, '\0', precision, minSize,cNumPad,bJustifyLeft);
+                       break;
                
                // Unsigned Octal
                case 'o':
-                       if(bLongLong)   arg = va_arg(args, uint64_t);
-                       else                    arg = va_arg(args, uint32_t);
-                       itoa(tmp, arg, 8, minSize, pad, 0);
-                       precision = -1;
-                       goto sprintf_puts;
+                       if(bAltForm) {
+                               _addchar('0');
+                       }
+                       arg = bLongLong ? va_arg(args, int64_t) : va_arg(args, int32_t);
+                       pos += _printf_itoa(putch_cb, putch_h, arg, 8, FALSE,
+                               FALSE, '\0', precision, minSize,cNumPad,bJustifyLeft);
+                       break;
                
                // Unsigned binary
                case 'b':
-                       if(bLongLong)   arg = va_arg(args, uint64_t);
-                       else                    arg = va_arg(args, uint32_t);
-                       itoa(tmp, arg, 2, minSize, pad, 0);
-                       precision = -1;
-                       goto sprintf_puts;
+                       if(bAltForm) {
+                               _addchar('0');
+                               _addchar('b');
+                       }
+                       arg = bLongLong ? va_arg(args, int64_t) : va_arg(args, int32_t);
+                       pos += _printf_itoa(putch_cb, putch_h, arg, 2, FALSE,
+                               FALSE, '\0', precision, minSize,cNumPad,bJustifyLeft);
+                       break;
+
+               // Standard float
+               case 'f':
+               case 'F':
+                       arg_f = bLong ? va_arg(args, long double) : va_arg(args, double);
+                       pos += _printf_ftoa(putch_cb, putch_h, arg_f, 10, FPN_STD,
+                               precision, 0, bJustifyLeft, c == 'F');
+                       break;
+               // Scientific Float
+               case 'e':
+               case 'E':
+                       arg_f = bLong ? va_arg(args, long double) : va_arg(args, double);
+                       pos += _printf_ftoa(putch_cb, putch_h, arg_f, 10, FPN_SCI,
+                               precision, 0, bJustifyLeft, c == 'E');
+                       break;
+               // Scientific Float
+               case 'g':
+               case 'G':
+                       arg_f = bLong ? va_arg(args, long double) : va_arg(args, double);
+                       pos += _printf_ftoa(putch_cb, putch_h, arg_f, 10, FPN_SHORTEST,
+                               precision, 0, bJustifyLeft, c == 'G');
+                       break;
+               // Hexadecimal Scientific
+               case 'a':
+               case 'A':
+                       arg_f = bLong ? va_arg(args, long double) : va_arg(args, double);
+                       pos += _printf_ftoa_hex(putch_cb, putch_h, arg_f, precision, 0, bJustifyLeft, c == 'A');
+                       break;
 
                // String
                case 's':
                        p = va_arg(args, char*);
-               sprintf_puts:
                        if(!p)  p = "(null)";
                        //_SysDebug("vsnprintf: p = '%s'", p);
                        if(precision >= 0)
                                len = strnlen(p, precision);
                        else
                                len = strlen(p);
-                       if(bPadLeft)    while(minSize > len++)  _addchar(pad);
+                       if(!bJustifyLeft)
+                               while(minSize > len++)  _addchar(' ');
                        while( *p ) {
                                if(precision >= 0 && precision -- == 0)
                                        break;
                                _addchar(*p++);
                        }
-                       if(!bPadLeft)   while(minSize > len++)  _addchar(pad);
+                       if(bJustifyLeft)
+                               while(minSize > len++)  _addchar(' ');
                        break;
 
                // Unknown, just treat it as a character
@@ -295,7 +375,16 @@ EXPORT int printf(const char *format, ...)
        return ret;
 }
 
-const char cUCDIGITS[] = "0123456789ABCDEF";
+void itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned)
+{
+       struct s_sprintf_info   info = {buf, 0, 1024};
+       if(!buf)        return;
+       _printf_itoa(_vsnprintf_putch, &info, num, base, FALSE, bSigned, '\0', 0, minLength, pad, FALSE);
+       buf[info.ofs] = '\0';
+}
+
+const char cDIGITS[] = "0123456789abcdef";
+const char cUDIGITS[] = "0123456789ABCDEF";
 /**
  * \brief Convert an integer into a character string
  * \param buf  Destination Buffer
@@ -305,36 +394,345 @@ const char cUCDIGITS[] = "0123456789ABCDEF";
  * \param pad  Padding used to ensure minLength
  * \param bSigned      Signed number output?
  */
-EXPORT void itoa(char *buf, uint64_t num, size_t base, int minLength, char pad, int bSigned)
+size_t _printf_itoa(printf_putch_t putch_cb, void *putch_h, uint64_t num,
+       size_t base, int bUpper,
+       int bSigned, char SignChar, int Precision,
+       int PadLength, char PadChar, int bPadRight)
 {
        char    tmpBuf[64];
-        int    pos=0, i;
+        int    pos = 0;
+       size_t  ret = 0;
+        int    sign_is_neg = 0;
+       const char *map = bUpper ? cUDIGITS : cDIGITS;
 
-       if(!buf)        return;
        if(base > 16 || base < 2) {
-               buf[0] = 0;
-               return;
+               return 0;
        }
        
        if(bSigned && (int64_t)num < 0)
        {
-               num = -num;
-               bSigned = 1;
-       } else
-               bSigned = 0;
+               num = -(int64_t)num;
+               sign_is_neg = 1;
+       }
        
        // Encode into reversed string
        while(num > base-1) {
-               tmpBuf[pos++] = cUCDIGITS[ num % base ];
+               tmpBuf[pos++] = map[ num % base ];
                num = (uint64_t) num / (uint64_t)base;          // Shift {number} right 1 digit
        }
 
-       tmpBuf[pos++] = cUCDIGITS[ num % base ];                // Last digit of {number}
-       if(bSigned)     tmpBuf[pos++] = '-';    // Append sign symbol if needed
+       tmpBuf[pos++] = map[ num % base ];              // Last digit of {number}
        
-       i = 0;
-       minLength -= pos;
-       while(minLength-- > 0)  buf[i++] = pad;
-       while(pos-- > 0)                buf[i++] = tmpBuf[pos]; // Reverse the order of characters
-       buf[i] = 0;
+       // length of number, minus the sign character
+       PadLength -= pos + (sign_is_neg || SignChar != '\0');
+       Precision -= pos + (sign_is_neg || SignChar != '\0');
+       if( !bPadRight )
+       {
+               while(PadLength-- > 0)
+                       putch_cb(putch_h, PadChar), ret ++;
+       }
+       
+       if(sign_is_neg)
+               putch_cb(putch_h, '-'), ret++;  // Negative sign character
+       else if(SignChar)
+               putch_cb(putch_h, SignChar), ret++;     // positive sign character
+       else {
+       }
+       
+       while( Precision-- > 0 )
+               putch_cb(putch_h, '0'), ret++;
+       while(pos--)
+               putch_cb(putch_h, tmpBuf[pos]), ret++;  // Reverse the order of characters
+
+       if( bPadRight )
+       {
+               while(PadLength-- > 0)
+                       putch_cb(putch_h, PadChar), ret ++;
+       }
+       
+       return ret;
+}
+
+int expand_double(double num, uint64_t *Significand, int16_t *Exponent, int *SignIsNeg)
+{
+       // IEEE 754 binary64
+       #if 0
+       {
+               uint64_t test_exp = 0xC000000000000000;
+               double test_value = -2.0f;
+               assert( *((uint64_t*)&test_value) == test_exp );
+       }
+       #endif
+       
+       const uint64_t  *bit_rep = (void*)&num;
+       
+       *SignIsNeg = *bit_rep >> 63;
+       *Exponent = ((*bit_rep >> 52) & 0x7FF) - 1023;
+       *Significand = (*bit_rep & ((1ULL << 52)-1)) << (64-52);
+
+//     printf("%llx %i %i %llx\n", *bit_rep, (int)*SignIsNeg, (int)*Exponent, *Significand);
+
+       // Subnormals
+       if( *Exponent == -1023 && *Significand != 0 )
+               return 1;
+       // Infinity
+       if( *Exponent == 0x800 && *Significand == 0)
+               return 2;
+       // NaNs
+       if( *Exponent == 0x800 && *Significand != 0)
+               return 3;
+
+       return 0;
+}
+
+/**
+ * Internal function
+ * \return Remainder
+ */
+double _longdiv(double num, double den, int *quot)
+{
+       assert(num >= 0);
+       assert(den > 0);
+//     printf("%llu / %llu\n", (long long int)num, (long long int)den);
+       
+       *quot = 0;
+       assert(num < den*10);
+       while(num >= den)
+       {
+               num -= den;
+               (*quot) ++;
+               assert( *quot < 10 );
+       }
+//     printf(" %i\n", *quot);
+       return num;
+}
+
+size_t _printf_ftoa_hex(printf_putch_t putch_cb, void *putch_h, long double num, int Precision, int bForcePoint, int bForceSign, int bCapitals)
+{
+       uint64_t        significand;
+       int16_t exponent;
+        int    signisneg;
+        int    rv;
+       size_t  ret = 0;
+
+       #define _putch(_ch) do{\
+               if(bCapitals)\
+                       putch_cb(putch_h, toupper(_ch));\
+               else\
+                       putch_cb(putch_h, _ch);\
+               ret ++;\
+       }while(0)
+
+       if( Precision == -1 )
+               Precision = (64-4)/4;
+
+       rv = expand_double(num, &significand, &exponent, &signisneg);
+       switch(rv)
+       {
+       // 0: No errors, nothing special
+       case 0:
+               break;
+       // 1: Subnormals
+       case 1:
+               // TODO: Subnormal = 0?
+               break;
+       // 2: Infinity
+       case 2:
+               _putch('i');
+               _putch('n');
+               _putch('f');
+               return 3;
+       case 3:
+               _putch('N');
+               _putch('a');
+               _putch('N');
+               return 3;
+       }
+       
+       // int  exp_ofs = exponent % 4;
+       // int  exp_16 = exponent - exp_ofs;
+       //uint8_t       whole = (1 << exp_ofs) | ((significand >> (64-3)) >> exp_ofs);
+       //significand <<= 3 - exp_ofs;
+       uint8_t whole = (rv != 1) ? 1 : 0;
+       
+       if( signisneg )
+               _putch('-');
+       else if( bForceSign )
+               _putch('+');
+       else {
+       }
+       _putch('0');
+       _putch('x');
+       _putch(cDIGITS[whole]);
+       if( significand || bForcePoint )
+               _putch('.');
+       // Fractional
+       while( significand && Precision -- )
+       {
+               uint8_t val = significand >> (64-4);
+               _putch(cDIGITS[val]);
+               significand <<= 4;
+       }
+       _putch('p');
+       //ret += _printf_itoa(putch_cb, putch_h, exp_16, 16, bCapitals, TRUE, '+', 0, 0, '\0', 0);
+       ret += _printf_itoa(putch_cb, putch_h, exponent, 10, bCapitals, TRUE, '+', 0, 0, '\0', 0);
+       
+       #undef _putch
+       return ret;
+}
+
+size_t _printf_ftoa(printf_putch_t putch_cb, void *putch_h, long double num, size_t Base, enum eFPN Notation, int Precision, int bForcePoint, int bForceSign, int bCapitals)
+{
+       uint64_t        significand;
+       int16_t exponent;
+        int    signisneg;
+        int    rv;
+       size_t  ret = 0;
+
+       #define _putch(_ch) do{\
+               if(bCapitals)\
+                       putch_cb(putch_h, toupper(_ch));\
+               else\
+                       putch_cb(putch_h, _ch);\
+               ret ++;\
+       }while(0)
+
+       if( Base <= 1 || Base > 16 )
+               return 0;
+
+       rv = expand_double(num, &significand, &exponent, &signisneg);
+       switch(rv)
+       {
+       // 0: No errors, nothing special
+       case 0:
+               break;
+       // 1: Subnormals
+       case 1:
+               // TODO: Subnormal = 0?
+               break;
+       // 2: Infinity
+       case 2:
+               _putch('i');
+               _putch('n');
+               _putch('f');
+               return 3;
+       case 3:
+               _putch('N');
+               _putch('a');
+               _putch('N');
+               return 3;
+       }
+
+       // - Used as 0/1 bools in arithmatic later on
+       bForcePoint = !!bForcePoint;
+       bForceSign = !!bForceSign;
+
+       // Apply default to precision
+       if( Precision == -1 )
+               Precision = 6;
+
+       if( num < 0 )
+               num = -num;
+
+       // Select optimum type
+       if( Notation == FPN_SHORTEST )
+       {
+               //TODO:
+               //int   first_set_sig = BSL(significand);
+               // bSign+log10(num)+1+precision vs. bSign+1+1+precision+1+1+log10(exponent)
+                int    log10_num = exponent * 301 / 1000;      // log_10(2) = 0.30102999566...
+                int    log10_exp10 = 2;
+                int    sci_len = (signisneg || bForceSign) + 2 + (Precision-1) + 2 + log10_exp10;
+                int    std_whole_len = (log10_num > 0 ? log10_num : 1);
+                int    std_len = (signisneg || bForceSign) + std_whole_len + 1 + (Precision-std_whole_len);
+               if( sci_len > std_len ) {
+                       Precision -= std_whole_len;
+                       Notation = FPN_STD;
+               }
+               else {
+                       Precision -= 1;
+                       Notation = FPN_SCI;
+               }
+       }
+
+       double precision_max = 1;
+       for(int i = Precision; i--; )
+               precision_max /= Base;
+
+       // Determine scientific's exponent and starting denominator
+       double den = 1;
+        int    sci_exponent = 0;
+       if( Notation == FPN_SCI )
+       {
+               if( num < 1 )
+               {
+                       while(num < 1)
+                       {
+                               num *= Base;
+                               sci_exponent ++;
+                       }
+               }
+               else if( num >= Base )
+               {
+                       while(num >= Base)
+                       {
+                               num /= Base;
+                               sci_exponent ++;
+                       }
+               }
+               else
+               {
+                       // no exponent
+               }
+               den = 1;
+       }
+       else
+       {
+               while( den <= num )
+                       den *= Base;
+               den /= Base;
+       }
+
+       // Leading sign
+       if( signisneg )
+               _putch('-');
+       else if( bForceSign )
+               _putch('+');
+       else {
+       }
+       
+       num += precision_max/10 * 5;
+
+        int    value;
+       // Whole section
+       do
+       {
+               num = _longdiv(num, den, &value);
+               _putch(cDIGITS[value]);
+               den /= Base;
+       } while( den >= 1 );
+
+       // Decimal point (if needed/forced)     
+       if( Precision > 0 || bForcePoint )
+               _putch('.');
+       // Decimal section
+       for(int i = Precision; i--; )
+       {
+               num = _longdiv(num, den, &value);
+               _putch(cDIGITS[value]);
+               den /= Base;
+       }
+
+       if( Notation == FPN_SCI )
+       {
+               if( Base == 16 )
+                       _putch('p');
+               else
+                       _putch('e');
+               ret += _printf_itoa(putch_cb, putch_h, sci_exponent, Base, FALSE, TRUE, '+', 3, 0, '\0', FALSE);
+       }       
+
+       #undef _putch
+
+       return ret;
 }

UCC git Repository :: git.ucc.asn.au