9b0584677f
Low level 64 bit division and modulo functions are not available for MIPS platforms, but are required by the printk formatter. Modify the code to avoid 64 bit math when building for MIPS. In case the user does print a value exceeding 2^32, send a few junk characters to the output to indicate a corrupted value printed. [pg: add the printed sequence to the comment, so git grep can find it] BRANCH=none BUG=none TEST=startup code on Urara properly prints CBFS address values which are passed as 64 bit integers. Change-Id: Ie777019cd8d55c53d5e816fbacfe79893c3d64c7 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 8347f914a9cceca017668f8387ba679c2c79e66d Original-Change-Id: I25b8a900b3ba4ec1da3446dcc5f03101d5cdb757 Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/232294 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/9162 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@google.com>
305 lines
6.3 KiB
C
305 lines
6.3 KiB
C
/* vtxprintf.c, from
|
|
* linux/lib/vsprintf.c
|
|
*
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
*/
|
|
|
|
#include <console/console.h>
|
|
#include <console/vtxprintf.h>
|
|
#include <string.h>
|
|
|
|
#define call_tx(x) tx_byte(x, data)
|
|
|
|
#if !CONFIG_ARCH_MIPS
|
|
#define SUPPORT_64BIT_INTS
|
|
#endif
|
|
|
|
/* haha, don't need ctype.c */
|
|
#define isdigit(c) ((c) >= '0' && (c) <= '9')
|
|
#define is_digit isdigit
|
|
#define isxdigit(c) (((c) >= '0' && (c) <= '9') || ((c) >= 'a' && (c) <= 'f') || ((c) >= 'A' && (c) <= 'F'))
|
|
|
|
static int skip_atoi(const char **s)
|
|
{
|
|
int i=0;
|
|
|
|
while (is_digit(**s))
|
|
i = i*10 + *((*s)++) - '0';
|
|
return i;
|
|
}
|
|
|
|
#define ZEROPAD 1 /* pad with zero */
|
|
#define SIGN 2 /* unsigned/signed long */
|
|
#define PLUS 4 /* show plus */
|
|
#define SPACE 8 /* space if plus */
|
|
#define LEFT 16 /* left justified */
|
|
#define SPECIAL 32 /* 0x */
|
|
#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
|
|
|
|
static int number(void (*tx_byte)(unsigned char byte, void *data),
|
|
unsigned long long inum, int base, int size, int precision, int type,
|
|
void *data)
|
|
{
|
|
char c,sign,tmp[66];
|
|
const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
|
|
int i;
|
|
int count = 0;
|
|
#ifdef SUPPORT_64BIT_INTS
|
|
unsigned long long num = inum;
|
|
#else
|
|
unsigned long num = (long)inum;
|
|
|
|
if (num != inum) {
|
|
/* Alert user to an incorrect result by printing #^!. */
|
|
call_tx('#');
|
|
call_tx('^');
|
|
call_tx('!');
|
|
}
|
|
#endif
|
|
|
|
if (type & LARGE)
|
|
digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
|
if (type & LEFT)
|
|
type &= ~ZEROPAD;
|
|
if (base < 2 || base > 36)
|
|
return 0;
|
|
c = (type & ZEROPAD) ? '0' : ' ';
|
|
sign = 0;
|
|
if (type & SIGN) {
|
|
if ((signed long long)num < 0) {
|
|
sign = '-';
|
|
num = -num;
|
|
size--;
|
|
} else if (type & PLUS) {
|
|
sign = '+';
|
|
size--;
|
|
} else if (type & SPACE) {
|
|
sign = ' ';
|
|
size--;
|
|
}
|
|
}
|
|
if (type & SPECIAL) {
|
|
if (base == 16)
|
|
size -= 2;
|
|
else if (base == 8)
|
|
size--;
|
|
}
|
|
i = 0;
|
|
if (num == 0)
|
|
tmp[i++]='0';
|
|
else while (num != 0){
|
|
tmp[i++] = digits[num % base];
|
|
num /= base;
|
|
}
|
|
if (i > precision)
|
|
precision = i;
|
|
size -= precision;
|
|
if (!(type&(ZEROPAD+LEFT)))
|
|
while(size-->0)
|
|
call_tx(' '), count++;
|
|
if (sign)
|
|
call_tx(sign), count++;
|
|
if (type & SPECIAL) {
|
|
if (base==8)
|
|
call_tx('0'), count++;
|
|
else if (base==16) {
|
|
call_tx('0'), count++;
|
|
call_tx(digits[33]), count++;
|
|
}
|
|
}
|
|
if (!(type & LEFT))
|
|
while (size-- > 0)
|
|
call_tx(c), count++;
|
|
while (i < precision--)
|
|
call_tx('0'), count++;
|
|
while (i-- > 0)
|
|
call_tx(tmp[i]), count++;
|
|
while (size-- > 0)
|
|
call_tx(' '), count++;
|
|
return count;
|
|
}
|
|
|
|
|
|
int vtxprintf(void (*tx_byte)(unsigned char byte, void *data),
|
|
const char *fmt, va_list args, void *data)
|
|
{
|
|
int len;
|
|
unsigned long long num;
|
|
int i, base;
|
|
const char *s;
|
|
|
|
int flags; /* flags to number() */
|
|
|
|
int field_width; /* width of output field */
|
|
int precision; /* min. # of digits for integers; max
|
|
number of chars for from string */
|
|
int qualifier; /* 'h', 'H', 'l', or 'L' for integer fields */
|
|
|
|
int count;
|
|
|
|
for (count=0; *fmt ; ++fmt) {
|
|
if (*fmt != '%') {
|
|
call_tx(*fmt), count++;
|
|
continue;
|
|
}
|
|
|
|
/* process flags */
|
|
flags = 0;
|
|
repeat:
|
|
++fmt; /* this also skips first '%' */
|
|
switch (*fmt) {
|
|
case '-': flags |= LEFT; goto repeat;
|
|
case '+': flags |= PLUS; goto repeat;
|
|
case ' ': flags |= SPACE; goto repeat;
|
|
case '#': flags |= SPECIAL; goto repeat;
|
|
case '0': flags |= ZEROPAD; goto repeat;
|
|
}
|
|
|
|
/* get field width */
|
|
field_width = -1;
|
|
if (is_digit(*fmt))
|
|
field_width = skip_atoi(&fmt);
|
|
else if (*fmt == '*') {
|
|
++fmt;
|
|
/* it's the next argument */
|
|
field_width = va_arg(args, int);
|
|
if (field_width < 0) {
|
|
field_width = -field_width;
|
|
flags |= LEFT;
|
|
}
|
|
}
|
|
|
|
/* get the precision */
|
|
precision = -1;
|
|
if (*fmt == '.') {
|
|
++fmt;
|
|
if (is_digit(*fmt))
|
|
precision = skip_atoi(&fmt);
|
|
else if (*fmt == '*') {
|
|
++fmt;
|
|
/* it's the next argument */
|
|
precision = va_arg(args, int);
|
|
}
|
|
if (precision < 0)
|
|
precision = 0;
|
|
}
|
|
|
|
/* get the conversion qualifier */
|
|
qualifier = -1;
|
|
if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'z') {
|
|
qualifier = *fmt;
|
|
++fmt;
|
|
if (*fmt == 'l') {
|
|
qualifier = 'L';
|
|
++fmt;
|
|
}
|
|
if (*fmt == 'h') {
|
|
qualifier = 'H';
|
|
++fmt;
|
|
}
|
|
}
|
|
|
|
/* default base */
|
|
base = 10;
|
|
|
|
switch (*fmt) {
|
|
case 'c':
|
|
if (!(flags & LEFT))
|
|
while (--field_width > 0)
|
|
call_tx(' '), count++;
|
|
call_tx((unsigned char) va_arg(args, int)), count++;
|
|
while (--field_width > 0)
|
|
call_tx(' '), count++;
|
|
continue;
|
|
|
|
case 's':
|
|
s = va_arg(args, char *);
|
|
if (!s)
|
|
s = "<NULL>";
|
|
|
|
len = strnlen(s, precision);
|
|
|
|
if (!(flags & LEFT))
|
|
while (len < field_width--)
|
|
call_tx(' '), count++;
|
|
for (i = 0; i < len; ++i)
|
|
call_tx(*s++), count++;
|
|
while (len < field_width--)
|
|
call_tx(' '), count++;
|
|
continue;
|
|
|
|
case 'p':
|
|
if (field_width == -1) {
|
|
field_width = 2*sizeof(void *);
|
|
flags |= ZEROPAD;
|
|
}
|
|
count += number(tx_byte,
|
|
(unsigned long) va_arg(args, void *), 16,
|
|
field_width, precision, flags, data);
|
|
continue;
|
|
|
|
case 'n':
|
|
if (qualifier == 'L') {
|
|
long long *ip = va_arg(args, long long *);
|
|
*ip = count;
|
|
} else if (qualifier == 'l') {
|
|
long * ip = va_arg(args, long *);
|
|
*ip = count;
|
|
} else {
|
|
int * ip = va_arg(args, int *);
|
|
*ip = count;
|
|
}
|
|
continue;
|
|
|
|
case '%':
|
|
call_tx('%'), count++;
|
|
continue;
|
|
|
|
/* integer number formats - set up the flags and "break" */
|
|
case 'o':
|
|
base = 8;
|
|
break;
|
|
|
|
case 'X':
|
|
flags |= LARGE;
|
|
case 'x':
|
|
base = 16;
|
|
break;
|
|
|
|
case 'd':
|
|
case 'i':
|
|
flags |= SIGN;
|
|
case 'u':
|
|
break;
|
|
|
|
default:
|
|
call_tx('%'), count++;
|
|
if (*fmt)
|
|
call_tx(*fmt), count++;
|
|
else
|
|
--fmt;
|
|
continue;
|
|
}
|
|
if (qualifier == 'L') {
|
|
num = va_arg(args, unsigned long long);
|
|
} else if (qualifier == 'l') {
|
|
num = va_arg(args, unsigned long);
|
|
} else if (qualifier == 'z') {
|
|
num = va_arg(args, size_t);
|
|
} else if (qualifier == 'h') {
|
|
num = (unsigned short) va_arg(args, int);
|
|
if (flags & SIGN)
|
|
num = (short) num;
|
|
} else if (qualifier == 'H') {
|
|
num = (unsigned char) va_arg(args, int);
|
|
if (flags & SIGN)
|
|
num = (signed char) num;
|
|
} else if (flags & SIGN) {
|
|
num = va_arg(args, int);
|
|
} else {
|
|
num = va_arg(args, unsigned int);
|
|
}
|
|
count += number(tx_byte, num, base, field_width, precision, flags, data);
|
|
}
|
|
return count;
|
|
}
|