[coreboot-gerrit] New patch to review for coreboot: c752639 vtxprintf: Introduce vtxdprintf for the ease of closures
Vladimir Serbinenko (phcoder@gmail.com)
gerrit at coreboot.org
Tue Nov 26 21:56:48 CET 2013
Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4287
-gerrit
commit c752639c3c556791cf56171bf335678b537bc8bb
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date: Tue Nov 26 21:43:05 2013 +0100
vtxprintf: Introduce vtxdprintf for the ease of closures
It was suggested to eliminate the lock for sprintf. One way to do it is
to make the fake tx_byte into a closure. This patch allows it.
It's a bit tricky since we need to preserve compatibility with romcc.
Change-Id: I877ef0cef54dcbb0589fe858c485f76f3dd27ece
Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
src/console/vtxprintf.c | 77 ++++++++++++++++++++++++++++-------------
src/include/console/vtxprintf.h | 4 +++
2 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/src/console/vtxprintf.c b/src/console/vtxprintf.c
index 4fc6f35..df62897 100644
--- a/src/console/vtxprintf.c
+++ b/src/console/vtxprintf.c
@@ -8,6 +8,16 @@
#include <console/console.h>
#include <console/vtxprintf.h>
+#ifndef __ROMCC__
+#define DATA_ARG , data
+#define DATA_ARG_DECL , void *data
+#else
+#define DATA_ARG
+#define DATA_ARG_DECL
+#endif
+
+#define call_tx(x) tx_byte(x DATA_ARG)
+
/* haha, don't need ctype.c */
#define isdigit(c) ((c) >= '0' && (c) <= '9')
#define is_digit isdigit
@@ -30,8 +40,9 @@ static int skip_atoi(const char **s)
#define SPECIAL 32 /* 0x */
#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
-static int number(void (*tx_byte)(unsigned char byte),
- unsigned long long num, int base, int size, int precision, int type)
+static int number(void (*tx_byte)(unsigned char byte DATA_ARG_DECL),
+ unsigned long long num, int base, int size, int precision, int type
+ DATA_ARG_DECL)
{
char c,sign,tmp[66];
const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
@@ -77,31 +88,36 @@ static int number(void (*tx_byte)(unsigned char byte),
size -= precision;
if (!(type&(ZEROPAD+LEFT)))
while(size-->0)
- tx_byte(' '), count++;
+ call_tx(' '), count++;
if (sign)
- tx_byte(sign), count++;
+ call_tx(sign), count++;
if (type & SPECIAL) {
if (base==8)
- tx_byte('0'), count++;
+ call_tx('0'), count++;
else if (base==16) {
- tx_byte('0'), count++;
- tx_byte(digits[33]), count++;
+ call_tx('0'), count++;
+ call_tx(digits[33]), count++;
}
}
if (!(type & LEFT))
while (size-- > 0)
- tx_byte(c), count++;
+ call_tx(c), count++;
while (i < precision--)
- tx_byte('0'), count++;
+ call_tx('0'), count++;
while (i-- > 0)
- tx_byte(tmp[i]), count++;
+ call_tx(tmp[i]), count++;
while (size-- > 0)
- tx_byte(' '), count++;
+ call_tx(' '), count++;
return count;
}
-int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args)
+#ifndef __ROMCC__
+int vtxdprintf(void (*tx_byte)(unsigned char byte, void *data),
+ const char *fmt, va_list args, void *data)
+#else
+int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args);
+#endif
{
int len;
unsigned long long num;
@@ -124,7 +140,7 @@ int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args
for (count=0; *fmt ; ++fmt) {
if (*fmt != '%') {
- tx_byte(*fmt), count++;
+ call_tx(*fmt), count++;
continue;
}
@@ -187,10 +203,10 @@ repeat:
case 'c':
if (!(flags & LEFT))
while (--field_width > 0)
- tx_byte(' '), count++;
- tx_byte((unsigned char) va_arg(args, int)), count++;
+ call_tx(' '), count++;
+ call_tx((unsigned char) va_arg(args, int)), count++;
while (--field_width > 0)
- tx_byte(' '), count++;
+ call_tx(' '), count++;
continue;
case 's':
@@ -202,11 +218,11 @@ repeat:
if (!(flags & LEFT))
while (len < field_width--)
- tx_byte(' '), count++;
+ call_tx(' '), count++;
for (i = 0; i < len; ++i)
- tx_byte(*s++), count++;
+ call_tx(*s++), count++;
while (len < field_width--)
- tx_byte(' '), count++;
+ call_tx(' '), count++;
continue;
case 'p':
@@ -216,7 +232,7 @@ repeat:
}
count += number(tx_byte,
(unsigned long) va_arg(args, void *), 16,
- field_width, precision, flags);
+ field_width, precision, flags DATA_ARG);
continue;
case 'n':
@@ -233,7 +249,7 @@ repeat:
continue;
case '%':
- tx_byte('%'), count++;
+ call_tx('%'), count++;
continue;
/* integer number formats - set up the flags and "break" */
@@ -254,9 +270,9 @@ repeat:
break;
default:
- tx_byte('%'), count++;
+ call_tx('%'), count++;
if (*fmt)
- tx_byte(*fmt), count++;
+ call_tx(*fmt), count++;
else
--fmt;
continue;
@@ -276,8 +292,21 @@ repeat:
} else {
num = va_arg(args, unsigned int);
}
- count += number(tx_byte, num, base, field_width, precision, flags);
+ count += number(tx_byte, num, base, field_width, precision, flags DATA_ARG);
}
return count;
}
+
+#ifndef __ROMCC__
+static void wrap_tx_byte (unsigned char byte, void *data)
+{
+ void (*tx_byte)(unsigned char byte) = data;
+ tx_byte (byte);
+}
+
+int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args)
+{
+ return vtxdprintf(wrap_tx_byte, fmt, args, tx_byte);
+}
+#endif
diff --git a/src/include/console/vtxprintf.h b/src/include/console/vtxprintf.h
index 2cf44de..4e56827 100644
--- a/src/include/console/vtxprintf.h
+++ b/src/include/console/vtxprintf.h
@@ -36,4 +36,8 @@ typedef __builtin_va_list va_list;
int vtxprintf(void (*tx_byte)(unsigned char byte), const char *fmt, va_list args);
+#ifndef __ROMCC__
+int vtxdprintf(void (*tx_byte)(unsigned char byte, void *data), const char *fmt, va_list args, void *data);
+#endif
+
#endif
More information about the coreboot-gerrit
mailing list