#define FALSE 0
// === TYPES ===
-typedef void (*printf_putch_t)(void *h, char ch);
+typedef void (*printf_puts_t)(void *h, const char *s, size_t len);
enum eFPN {
FPN_STD,
FPN_SCI,
// === 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 _printf_itoa(printf_puts_t puts_cb, void *puts_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);
+size_t _printf_ftoa_hex(printf_puts_t puts_cb, void *puts_h, long double num, int Precision, int bForcePoint, int bForceSign, int bCapitals);
+size_t _printf_ftoa(printf_puts_t puts_cb, void *puts_h, long double num, size_t Base, enum eFPN Notation, int Precision, int bForcePoint, int bForceSign, int bCapitals);
// === CODE ===
/**
* \param format String - Format String
* \param args VarArgs List - Arguments
*/
-EXPORT int _vcprintf_int(printf_putch_t putch_cb, void *putch_h, const char *format, va_list args)
+EXPORT int _vcprintf_int(printf_puts_t puts_cb, void *puts_h, const char *format, va_list args)
{
- char tmp[65];
int c, minSize, precision, len;
size_t pos = 0;
char *p;
char cNumPad, cPlus;
#define _addchar(ch) do { \
- putch_cb(putch_h, ch); \
+ char _ch = ch; \
+ puts_cb(puts_h, &_ch, 1); \
pos ++; \
} while(0)
- tmp[32] = '\0';
-
while((c = *format++) != 0)
{
// Non-control character
if (c != '%') {
- _addchar(c);
+ const char *start = format-1;
+ while( (c = *format) != 0 && c != '%' )
+ format ++;
+ puts_cb(puts_h, start, format - start);
+ pos += format - start;
continue;
}
else
break;
}
- while( c = *format++ );
+ while( (c = *format++) );
// Padding length
if( c == '*' ) {
}
}
- // Just help things along later
- p = tmp;
-
// Get Type
switch( c )
{
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,
+ pos += _printf_itoa(puts_cb, puts_h, arg, 10, FALSE,
TRUE, cPlus, precision, minSize, cNumPad, bJustifyLeft);
break;
// Unsigned Integer
case 'u':
arg = bLongLong ? va_arg(args, int64_t) : va_arg(args, int32_t);
- pos += _printf_itoa(putch_cb, putch_h, arg, 10, FALSE,
+ pos += _printf_itoa(puts_cb, puts_h, arg, 10, FALSE,
FALSE, '\0', precision, minSize, cNumPad, bJustifyLeft);
break;
_addchar('0');
_addchar('x');
arg = va_arg(args, intptr_t);
- pos += _printf_itoa(putch_cb, putch_h, arg, 16, FALSE,
+ pos += _printf_itoa(puts_cb, puts_h, arg, 16, FALSE,
FALSE, '\0', sizeof(intptr_t)*2, 0,'\0',FALSE);
break;
// Unsigned Hexadecimal
_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',
+ arg = bLongLong ? va_arg(args, uint64_t) : va_arg(args, uint32_t);
+ pos += _printf_itoa(puts_cb, puts_h, arg, 16, c=='X',
FALSE, '\0', precision, minSize,cNumPad,bJustifyLeft);
break;
_addchar('0');
}
arg = bLongLong ? va_arg(args, int64_t) : va_arg(args, int32_t);
- pos += _printf_itoa(putch_cb, putch_h, arg, 8, FALSE,
+ pos += _printf_itoa(puts_cb, puts_h, arg, 8, FALSE,
FALSE, '\0', precision, minSize,cNumPad,bJustifyLeft);
break;
_addchar('b');
}
arg = bLongLong ? va_arg(args, int64_t) : va_arg(args, int32_t);
- pos += _printf_itoa(putch_cb, putch_h, arg, 2, FALSE,
+ pos += _printf_itoa(puts_cb, puts_h, arg, 2, FALSE,
FALSE, '\0', precision, minSize,cNumPad,bJustifyLeft);
break;
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,
+ pos += _printf_ftoa(puts_cb, puts_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,
+ pos += _printf_ftoa(puts_cb, puts_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(puts_cb, puts_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');
+ pos += _printf_ftoa_hex(puts_cb, puts_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)
else
len = strlen(p);
if(!bJustifyLeft)
- while(minSize > len++) _addchar(' ');
- while( *p ) {
- if(precision >= 0 && precision -- == 0)
- break;
- _addchar(*p++);
- }
+ while(minSize-- > len) _addchar(' ');
+ puts_cb(puts_h, p, len); pos += len;
if(bJustifyLeft)
- while(minSize > len++) _addchar(' ');
+ while(minSize-- > len) _addchar(' ');
break;
// Unknown, just treat it as a character
size_t maxlen;
};
-void _vsnprintf_putch(void *h, char ch)
+void _vsnprintf_puts(void *h, const char *str, size_t len)
{
struct s_sprintf_info *info = h;
- if(info->ofs < info->maxlen)
- info->dest[info->ofs++] = ch;
+ while( info->ofs < info->maxlen && len -- )
+ info->dest[info->ofs++] = *str++;
}
EXPORT int vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list __args)
{
struct s_sprintf_info info = {__s, 0, __maxlen};
int ret;
- ret = _vcprintf_int(_vsnprintf_putch, &info, __format, __args);
- _vsnprintf_putch(&info, '\0');
+ ret = _vcprintf_int(_vsnprintf_puts, &info, __format, __args);
+ _vsnprintf_puts(&info, "", 1);
return ret;
}
return ret;
}
-void _vfprintf_putch(void *h, char ch)
+void _vfprintf_puts(void *h, const char *str, size_t len)
{
- fputc(ch, h);
+ fwrite(str, len, 1, h);
}
EXPORT int vfprintf(FILE *__fp, const char *__format, va_list __args)
{
- return _vcprintf_int(_vfprintf_putch, __fp, __format, __args);
+ return _vcprintf_int(_vfprintf_puts, __fp, __format, __args);
}
EXPORT int fprintf(FILE *fp, const char *format, ...)
{
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);
+ _printf_itoa(_vsnprintf_puts, &info, num, base, FALSE, bSigned, '\0', 0, minLength, pad, FALSE);
buf[info.ofs] = '\0';
}
* \param pad Padding used to ensure minLength
* \param bSigned Signed number output?
*/
-size_t _printf_itoa(printf_putch_t putch_cb, void *putch_h, uint64_t num,
+size_t _printf_itoa(printf_puts_t puts_cb, void *puts_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;
+ char tmpBuf[64+1];
+ int pos = sizeof(tmpBuf);
size_t ret = 0;
int sign_is_neg = 0;
const char *map = bUpper ? cUDIGITS : cDIGITS;
sign_is_neg = 1;
}
- // Encode into reversed string
+ // Encode into string
while(num > base-1) {
- tmpBuf[pos++] = map[ num % base ];
+ tmpBuf[--pos] = map[ num % base ];
num = (uint64_t) num / (uint64_t)base; // Shift {number} right 1 digit
}
+ tmpBuf[--pos] = map[ num % base ]; // Most significant digit of {number}
+
+ // TODO: This assertion may not be valid
+ assert(Precision <= (int)sizeof(tmpBuf));
+ Precision -= sizeof(tmpBuf)-pos + (sign_is_neg || SignChar != '\0');
+ while( Precision-- > 0 )
+ tmpBuf[--pos] = '0';
- tmpBuf[pos++] = map[ num % base ]; // Last digit of {number}
+ // Sign
+ if(sign_is_neg)
+ tmpBuf[--pos] = '-'; // Negative sign character
+ else if(SignChar)
+ tmpBuf[--pos] = SignChar; // positive sign character
+ else {
+ }
// length of number, minus the sign character
- PadLength -= pos - sign_is_neg - (SignChar != '\0');
+ size_t len = sizeof(tmpBuf)-pos;
+ PadLength -= len;
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 {
+ puts_cb(puts_h, &PadChar, 1), ret ++;
}
- while( Precision-- > 0 )
- putch_cb(putch_h, '0'), ret++;
- while(pos--)
- putch_cb(putch_h, tmpBuf[pos]), ret++; // Reverse the order of characters
+ puts_cb(puts_h, tmpBuf+pos, len);
+ ret += len;
if( bPadRight )
{
while(PadLength-- > 0)
- putch_cb(putch_h, PadChar), ret ++;
+ puts_cb(puts_h, &PadChar, 1), ret ++;
}
return ret;
// printf("%llx %i %i %llx\n", *bit_rep, (int)*SignIsNeg, (int)*Exponent, *Significand);
// Subnormals
- if( *Exponent == -1023 && *Significand != 0 )
+ if( *Exponent == -0x3FF && *Significand != 0 )
return 1;
// Infinity
- if( *Exponent == 0x800 && *Significand == 0)
+ if( *Exponent == 0x400 && *Significand == 0)
return 2;
// NaNs
- if( *Exponent == 0x800 && *Significand != 0)
+ if( *Exponent == 0x400 && *Significand != 0)
return 3;
return 0;
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)
+size_t _printf_ftoa_hex(printf_puts_t puts_cb, void *puts_h, long double num, int Precision, int bForcePoint, int bForceSign, int bCapitals)
{
uint64_t significand;
int16_t exponent;
size_t ret = 0;
#define _putch(_ch) do{\
- if(bCapitals)\
- putch_cb(putch_h, toupper(_ch));\
- else\
- putch_cb(putch_h, _ch);\
+ char __ch = (bCapitals ? toupper(_ch) : _ch);\
+ puts_cb(puts_h, &__ch, 1); \
ret ++;\
}while(0)
break;
// 2: Infinity
case 2:
- _putch('i');
- _putch('n');
- _putch('f');
+ puts_cb(puts_h, "inf", 3);
return 3;
case 3:
- _putch('N');
- _putch('a');
- _putch('N');
+ puts_cb(puts_h, "NaN", 3);
return 3;
}
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);
+ //ret += _printf_itoa(puts_cb, puts_h, exp_16, 16, bCapitals, TRUE, '+', 0, 0, '\0', 0);
+ ret += _printf_itoa(puts_cb, puts_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)
+#if 0
+size_t _printf_itoa_fixed(printf_putch_t putch_cb, void *putch_h, uint64_t num, size_t Base)
+{
+ uint64_t den;
+ size_t ret = 0;
+
+ den = 1ULL << (64-1);
+
+ while( den )
+ {
+ putch_cb(putch_h, cDIGITS[num / den]);
+ ret ++;
+ num %= den;
+ den /= Base;
+ }
+
+ return ret;
+}
+
+size_t _printf_ftoa_dec(printf_putch_t putch_cb, void *putch_h, long double num, enum eFPN Notation, int Precision, int bForcePoint, int bForceSign, int bCapitals)
+{
+ size_t ret = 0;
+ int i;
+
+ #define _putch(_ch) do{\
+ putch_cb(putch_h, bCapitals ? toupper(_ch) : _ch), ret++;\
+ }while(0)
+
+ uint64_t significand;
+ int16_t exponent;
+ int signisneg;
+ int 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;
+ }
+
+ uint64_t whole, part;
+ int pre_zeros, post_zeros;
+
+ #define XXX 0
+ if( Notation == FPN_SCI )
+ {
+ }
+ else if( exponent < 0 )
+ {
+ whole = 0;
+ part = XXX;
+ pre_zeros = 0;
+ post_zeros = XXX;
+ }
+ else if( exponent >= 64 )
+ {
+ part = 0;
+ whole = XXX;
+ pre_zeros = XXX;
+ post_zeros = 0;
+ }
+ else
+ {
+ // Split into fixed point
+ whole = (1 << exponent) | (significand >> (64-exponent));
+ part = significand << exponent;
+ pre_zeros = 0;
+ post_zeros = 0;
+ }
+
+
+ // Whole portion
+ ret += _printf_itoa(putch_cb, putch_h, whole, 10, FALSE, FALSE, '\0', 0, 0, '\0', FALSE);
+ for(i = pre_zeros; i --; ) _putch('0');
+ // TODO: Conditional point
+ _putch('-');
+ for(i = post_zeros; i--; ) _putch('0');
+ ret += _printf_itoa_fixed(putch_cb, putch_h, part, 10);
+
+ #undef _putch
+
+ return 0;
+}
+#endif
+
+size_t _printf_ftoa(printf_puts_t puts_cb, void *puts_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;
+ int rv, i;
size_t ret = 0;
#define _putch(_ch) do{\
- if(bCapitals)\
- putch_cb(putch_h, toupper(_ch));\
- else\
- putch_cb(putch_h, _ch);\
+ char __ch = (bCapitals ? toupper(_ch) : _ch);\
+ puts_cb(puts_h, &__ch, 1); \
ret ++;\
}while(0)
{
//TODO:
//int first_set_sig = BSL(significand);
- // TODO: if( num > pos(Base, 2+Precision+2+log_base(exponent) )
- Notation = FPN_SCI;
+ // 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;
- while(Precision--)
+ for(i = Precision; i--; )
precision_max /= Base;
// Determine scientific's exponent and starting denominator
}
den = 1;
}
- else
+ else if( num != 0.0 )
{
- while( den < num )
+ while( den <= num )
den *= Base;
den /= Base;
}
_putch('+');
else {
}
+
+ num += precision_max/10 * 4.999;
int value;
// Whole section
} while( den >= 1 );
// Decimal point (if needed/forced)
- if( den >= precision_max || bForcePoint )
+ if( Precision > 0 || bForcePoint )
_putch('.');
// Decimal section
- while( den >= precision_max )
+ for(i = Precision; i--; )
{
num = _longdiv(num, den, &value);
_putch(cDIGITS[value]);
_putch('p');
else
_putch('e');
- ret += _printf_itoa(putch_cb, putch_h, sci_exponent, Base, FALSE, TRUE, '+', 0, 0, '\0', FALSE);
+ ret += _printf_itoa(puts_cb, puts_h, sci_exponent, Base, FALSE, TRUE, '+', 3, 0, '\0', FALSE);
}
#undef _putch
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au