Changeset 32 for trunk/hal/x86_64/x86_printf.c

Timestamp:

Jun 21, 2017, 11:34:09 AM (7 years ago)

Author:

max@…

Message:

Update. Retrieve and parse the multiboot info, and dump the mmap. Some
more sanity checks could probably be added.

File:

• trunk/hal/x86_64/x86_printf.c (modified) (3 diffs)

trunk/hal/x86_64/x86_printf.c

@@ -75 +75 @@
 }
 
+static void x86_ztoa(char *buf, uint64_t n, uint64_t base)
+{
+        uint64_t tmp;
+        int i, j;
+
+        tmp = n;
+        i = 0;
+
+        do {
+                tmp = n % base;
+                buf[i++] = (tmp < 10) ? (tmp + '0') : (tmp + 'a' - 10);
+        } while (n /= base);
+        buf[i--] = 0;
+
+        for (j = 0; j < i; j++, i--) {
+                tmp = buf[j];
+                buf[j] = buf[i];
+                buf[i] = tmp;
+        }
+}
+
 void x86_printf(char *s, ...)
 {
@@ -85 +106 @@
         int ival;
         unsigned int uival;
+        uint64_t zval;
 
         va_start(ap, s);
@@ -101 +123 @@
                         }
 
-                        if (c == 'd') {
+                        if (c == 'z') {
+                                zval = va_arg(ap, uint64_t);
+                                x86_ztoa(buf, zval, 10);
+
+                                buflen = strlen(buf);
+                                if (buflen < size)
+                                        for (i = size, j = buflen; i >= 0; i--, j--)
+                                                buf[i] = (j >= 0) ? buf[j] : '0';
+
+                                x86_printf(buf);
+                        } else if (c == 'Z') {
+                                zval = va_arg(ap, uint64_t);
+                                x86_ztoa(buf, zval, 16);
+
+                                buflen = strlen(buf);
+                                if (buflen < size)
+                                        for (i = size, j = buflen; i >= 0; i--, j--)
+                                                buf[i] = (j >= 0) ? buf[j] : '0';
+
+                                x86_printf("0x%s", buf);
+                        } else if (c == 'd') {
                                 ival = va_arg(ap, int);
                                 if (ival < 0) {