Merge multiboot2 into mbtag-spec

This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-03-28 13:59:16 +02:00
commit c841decd4d
2 files changed
+24 -1

No files matched your search

+7
View File
@@ -1,3 +1,10 @@
2010-03-14 Vladimir Serbinenko <phcoder@gmail.com>
* doc/kernel.c (cmain): Use padding to properly display 64-bit
quantities.
(printf): Add padding support.
Reported by: Soeren D. Schulze.
2010-02-09 Vladimir Serbinenko <phcoder@gmail.com> 2010-02-09 Vladimir Serbinenko <phcoder@gmail.com>
* doc/multiboot.texi: Fix a typo. * doc/multiboot.texi: Fix a typo.
+17 -1
View File
@@ -320,9 +320,22 @@ printf (const char *format, ...)
putchar (c); putchar (c);
else else
{ {
char *p; char *p, *p2;
int pad0 = 0, pad = 0;
c = *format++; c = *format++;
if (c == '0')
{
pad0 = 1;
c = *format++;
}
if (c >= '0' && c <= '9')
{
pad = c - '0';
c = *format++;
}
switch (c) switch (c)
{ {
case 'd': case 'd':
@@ -339,6 +352,9 @@ printf (const char *format, ...)
p = "(null)"; p = "(null)";
string: string:
for (p2 = p; *p2; p2++);
for (; p2 < p + pad; p2++)
putchar (pad0 ? '0' : ' ');
while (*p) while (*p)
putchar (*p++); putchar (*p++);
break; break;