mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
a5ecdd08fd
With this patch now, the tiny printf() function also supports numbers bigger than 0xffff. Additionally the code is simplified a bit and some static variables are moved to function parameters. Also the upper case hex variable output support is removed, as its not really needed in this simple printf version. And removing it reduces the complexity and the code size again a bit. Here the new numbers, again on the db-mv784mp-gp (Armada XP): Without this patch: 56542 18536 1956 77034 12cea ./spl/u-boot-spl With this patch: 56446 18536 1936 76918 12c76 ./spl/u-boot-spl Signed-off-by: Stefan Roese <sr@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Hans de Goede <hdegoede@redhat.com> Cc: Tom Rini <trini@konsulko.com> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
123 lines
1.8 KiB
C
123 lines
1.8 KiB
C
/*
|
|
* Tiny printf version for SPL
|
|
*
|
|
* Copied from:
|
|
* http://www.sparetimelabs.com/printfrevisited/printfrevisited.php
|
|
*
|
|
* Copyright (C) 2004,2008 Kustaa Nyholm
|
|
*
|
|
* SPDX-License-Identifier: LGPL-2.1+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <stdarg.h>
|
|
#include <serial.h>
|
|
|
|
static char *bf;
|
|
static char zs;
|
|
|
|
static void out(char c)
|
|
{
|
|
*bf++ = c;
|
|
}
|
|
|
|
static void out_dgt(char dgt)
|
|
{
|
|
out(dgt + (dgt < 10 ? '0' : 'a' - 10));
|
|
zs = 1;
|
|
}
|
|
|
|
static void div_out(unsigned int *num, unsigned int div)
|
|
{
|
|
unsigned char dgt = 0;
|
|
|
|
while (*num >= div) {
|
|
*num -= div;
|
|
dgt++;
|
|
}
|
|
|
|
if (zs || dgt > 0)
|
|
out_dgt(dgt);
|
|
}
|
|
|
|
int printf(const char *fmt, ...)
|
|
{
|
|
va_list va;
|
|
char ch;
|
|
char *p;
|
|
unsigned int num;
|
|
char buf[12];
|
|
unsigned int div;
|
|
|
|
va_start(va, fmt);
|
|
|
|
while ((ch = *(fmt++))) {
|
|
if (ch != '%') {
|
|
putc(ch);
|
|
} else {
|
|
char lz = 0;
|
|
char w = 0;
|
|
|
|
ch = *(fmt++);
|
|
if (ch == '0') {
|
|
ch = *(fmt++);
|
|
lz = 1;
|
|
}
|
|
|
|
if (ch >= '0' && ch <= '9') {
|
|
w = 0;
|
|
while (ch >= '0' && ch <= '9') {
|
|
w = (w * 10) + ch - '0';
|
|
ch = *fmt++;
|
|
}
|
|
}
|
|
bf = buf;
|
|
p = bf;
|
|
zs = 0;
|
|
|
|
switch (ch) {
|
|
case 0:
|
|
goto abort;
|
|
case 'u':
|
|
case 'd':
|
|
num = va_arg(va, unsigned int);
|
|
if (ch == 'd' && (int)num < 0) {
|
|
num = -(int)num;
|
|
out('-');
|
|
}
|
|
for (div = 1000000000; div; div /= 10)
|
|
div_out(&num, div);
|
|
break;
|
|
case 'x':
|
|
num = va_arg(va, unsigned int);
|
|
for (div = 0x10000000; div; div /= 0x10)
|
|
div_out(&num, div);
|
|
break;
|
|
case 'c':
|
|
out((char)(va_arg(va, int)));
|
|
break;
|
|
case 's':
|
|
p = va_arg(va, char*);
|
|
break;
|
|
case '%':
|
|
out('%');
|
|
default:
|
|
break;
|
|
}
|
|
|
|
*bf = 0;
|
|
bf = p;
|
|
while (*bf++ && w > 0)
|
|
w--;
|
|
while (w-- > 0)
|
|
putc(lz ? '0' : ' ');
|
|
while ((ch = *p++))
|
|
putc(ch);
|
|
}
|
|
}
|
|
|
|
abort:
|
|
va_end(va);
|
|
return 0;
|
|
}
|