Changeset 90 for trunk

Timestamp:

Jun 29, 2017, 11:00:53 AM (7 years ago)

Author:

max@…

Message:

scroll for real, and add %c

File:

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

trunk/hal/x86_64/core/x86_printf.c

@@ -52 +52 @@
 static void check_scroll()
 {
-        char *base = (uint64_t)iom_base + (0xB8000 - IOM_BEGIN);
+        char *base = (char *)iom_base + (0xB8000 - IOM_BEGIN);
         char *src, *dst;
         size_t i;
@@ -67 +67 @@
         }
 
-        memset(base, 0, CONS_X_SIZE * 2 * CONS_Y_SIZE);
+        memset(&cons_buffer[0] + (CONS_X_SIZE * 2) * (CONS_Y_SIZE - 1),
+            0, (CONS_X_SIZE * 2));
 
         cons_ptr -= (CONS_X_SIZE * 2);
@@ -135 +136 @@
 }
 
+static char alphabet[] = "abcdefghijklmnopqrstuvwxyz";
+
 void x86_printf(char *s, ...)
 {
         va_list ap;
 
-        char buf[16];
+        char buf[64];
         int i, j, size, buflen, neg;
 
@@ -162 +165 @@
                         }
 
-                        if (c == 'z') {
+                        if (c == 'c') {
+                                ival = va_arg(ap, int);
+                                if ((ival - 97) > sizeof(alphabet)) {
+                                        x86_printf("(unknown:%d)", ival);
+                                } else {
+                                        x86_putc(alphabet[ival - 97]);
+                                }
+                        } else if (c == 'z') {
                                 zval = va_arg(ap, uint64_t);
                                 x86_ztoa(buf, zval, 10);