Merge branch 'master' of github.com:cs61/cs61-exercises

Author: Margo

kernel4x/.gdbinit

@@ -1,14 +1,16 @@
-init-if-undefined $target_set = 0
-if $target_set == 0
+init-if-undefined $loaded = 0
+if $loaded == 0
+    set $loaded = 1
     set arch i386:x86-64
-    target remote localhost:1234
     file obj/kernel.full
     add-symbol-file obj/bootsector.full 0x7c00
     add-symbol-file obj/p-alloc.full 0x100000
     add-symbol-file obj/p-recurse.full 0x100000
     add-symbol-file obj/p-fork.full 0x100000
     add-symbol-file obj/p-panic.full 0x100000
+    target remote localhost:1234
     source build/functions.gdb
     display/5i $pc
-    set $target_set = 1
+
+    # Your initialization commands here (if you want)
 end

kernel4x/.gitignore

@@ -1,7 +1,5 @@
 *~
 core*
 log.txt
-os[0-9]*.img
+*.img
 obj
-weensyos1
-weensyos1.tar.gz

kernel4x/BRANCHES.md

@@ -1,7 +1,7 @@
 The files in this directory are:
 
 /*
- * Copyright (C) 2006-2012 Eddie Kohler
+ * Copyright (C) 2006-2016 Eddie Kohler
  * Copyright (C) 2005 Regents of the University of California
  * Copyright (C) 1997 Massachusetts Institute of Technology
  *

kernel4x/COPYRIGHT

@@ -108,11 +108,11 @@ run-gdb-%: run-gdb-$(QEMUDISPLAY)-%
 	@:
 
 run-gdb-graphic-%: %.img check-qemu
-	$(call run,$(QEMU_PRELOAD) $(QEMU) $(QEMUOPT) -S -gdb tcp::1234 $(QEMUIMG) &,QEMU $<)
-	$(call run,gdb -x .gdbinit,GDB)
+	$(call run,$(QEMU_PRELOAD) $(QEMU) $(QEMUOPT) -gdb tcp::1234 $(QEMUIMG) &,QEMU $<)
+	$(call run,sleep 0.5; gdb -x .gdbinit,GDB)
 
 run-gdb-console-%: %.img check-qemu
-	$(call run,$(QEMU_PRELOAD) $(QEMU) $(QEMUOPT) -curses -S -gdb tcp::1234 $(QEMUIMG),QEMU $<)
+	$(call run,$(QEMU_PRELOAD) $(QEMU) $(QEMUOPT) -curses -gdb tcp::1234 $(QEMUIMG),QEMU $<)
 
 run: run-qemu-$(basename $(IMAGE))
 run-qemu: run-qemu-$(basename $(IMAGE))

kernel4x/GNUmakefile

@@ -26,7 +26,7 @@ CFLAGS := $(CFLAGS) \
 	-std=gnu11 -m64 -mcmodel=large \
 	-mno-red-zone -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow \
 	-ffreestanding -fno-omit-frame-pointer \
-	-Wall -Wno-format -Wno-unused -Werror -gdwarf-2
+	-Wall -W -Wshadow -Wno-format -Wno-unused -Werror -gdwarf-2
 # Include -fno-stack-protector if the option exists.
 CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
 DEPCFLAGS = -MD -MF $(DEPSDIR)/$*.d -MP

kernel4x/build/rules.mk

@@ -663,12 +663,34 @@ void log_printf(const char* format, ...) {
 }
 
 
+// error_printf, error_vprintf
+//    Print debugging messages to the console and to the host's
+//    `log.txt` file via `log_printf`.
+
+int error_vprintf(int cpos, int color, const char* format, va_list val) {
+    va_list val2;
+    __builtin_va_copy(val2, val);
+    log_vprintf(format, val2);
+    va_end(val2);
+    return console_vprintf(cpos, color, format, val);
+}
+
+int error_printf(int cpos, int color, const char* format, ...) {
+    va_list val;
+    va_start(val, format);
+    cpos = error_vprintf(cpos, color, format, val);
+    va_end(val);
+    return cpos;
+}
+
+
 // check_keyboard
 //    Check for the user typing a control key. 'a' through 'd' cause a soft
 //    reboot where the kernel runs a different program.
-//    Control-C or 'q' exit the virtual machine.
+//    Control-C or 'q' exit the virtual machine. Returns key typed or -1
+//    for no key.
 
-void check_keyboard(void) {
+int check_keyboard(void) {
     int c = keyboard_readc();
     if (c >= 'a' && c < 'a' + WEENSYOS_NBINARIES) {
         // Install a temporary page table to carry us through the
@@ -695,6 +717,7 @@ void check_keyboard(void) {
                      : : "b" (multiboot_info) : "memory");
     } else if (c == 0x03 || c == 'q')
         poweroff();
+    return c;
 }
 
 
@@ -718,20 +741,12 @@ void panic(const char* format, ...) {
 
     if (format) {
         // Print panic message to both the screen and the log
-        int cpos = console_printf(CPOS(23, 0), 0xC000, "PANIC: ");
-        log_printf("PANIC: ");
-
-        cpos = console_vprintf(cpos, 0xC000, format, val);
-        log_vprintf(format, val);
-
-        if (CCOL(cpos)) {
-            cpos = console_printf(cpos, 0xC000, "\n");
-            log_printf("\n");
-        }
-    } else {
-        (void) console_printf(CPOS(23, 0), 0xC000, "PANIC");
-        log_printf("PANIC\n");
-    }
+        int cpos = error_printf(CPOS(24, 0), 0xC000, "PANIC: ");
+        cpos = error_vprintf(cpos, 0xC000, format, val);
+        if (CCOL(cpos))
+            error_printf(cpos, 0xC000, "\n");
+    } else
+        error_printf(CPOS(24, 0), 0xC000, "PANIC");
 
     va_end(val);
     fail();

kernel4x/k-hardware.c

@@ -196,35 +196,34 @@ void exception(x86_64_registers* reg) {
         schedule();
 
     case INT_GPF:
-        console_printf(CPOS(24, 0), 0xC000, "Process %d GPF (rip=%p)!\n",
-                       current->p_pid, current->p_registers.reg_rip);
+        error_printf(CPOS(23, 0), 0xC000, "Process %d GPF!\n", current->p_pid);
         current->p_state = P_BLOCKED;
         break;
 
     case INT_PAGEFAULT: {
-        uintptr_t faultaddr = rcr2();
-        const char* who = reg->reg_err & PFERR_USER
-            ? "user" : "kernel";
+        uintptr_t addr = rcr2();
         const char* operation = reg->reg_err & PFERR_WRITE
-            ? "write" : "read";
+                ? "write" : "read";
         const char* problem = reg->reg_err & PFERR_PRESENT
-            ? "protection problem" : "missing page";
-
-        if (reg->reg_err & PFERR_USER) {
-            console_printf(CPOS(23, 0), 0xC000,
-                           "process %d page fault for %p (%s %s, rip=%p)!\n",
-                           current->p_pid, faultaddr, operation, problem,
-                           reg->reg_rip);
-            current->p_state = P_BLOCKED;
-        } else
-            panic("%s page fault for %p (%s %s, rip=%p)!\n",
-                  who, faultaddr, operation, problem, reg->reg_rip);
+                ? "protection problem" : "missing page";
+        char name[20];
+        if (reg->reg_err & PFERR_USER)
+            snprintf(name, sizeof(name), "Process %d", current->p_pid);
+        else
+            strcpy(name, "Kernel");
+
+        error_printf(CPOS(23, 0), 0xC000,
+                     "%s page fault for %p (%s %s, rip=%p)!\n",
+                     name, addr, operation, problem, reg->reg_rip);
+        if (!(reg->reg_err & PFERR_USER))
+            panic("Kernel page fault");
+        current->p_state = P_BLOCKED;
         break;
     }
 
     default:
-        panic("Unexpected exception %d!\n", current->p_registers.reg_intno);
-        break;  /* will not be reached */
+        panic("Unexpected exception %d!\n", reg->reg_intno);
+        break;                  /* will not be reached */
 
     }
 
@@ -273,7 +272,9 @@ void run(proc* p) {
     assert(p->p_state == P_RUNNABLE);
     current = p;
 
+    // Load the process's current pagetable
     lcr3((uintptr_t) p->p_pagetable);
+
     // This function is defined in k-exception.S. It restores the process's
     // registers then jumps back to user mode.
     exception_return(&p->p_registers);

kernel4x/kernel.c

@@ -148,8 +148,8 @@ int keyboard_readc(void);
 
 // check_keyboard
 //    Check for the user typing a control key. Control-C or 'q' exit
-//    the virtual machine.
-void check_keyboard(void);
+//    the virtual machine. Returns key typed or -1 for no key.
+int check_keyboard(void);
 
 
 // process_init(p, flags)
@@ -186,4 +186,13 @@ void page_unalloc(uintptr_t addr);
 void log_printf(const char* format, ...) __attribute__((noinline));
 void log_vprintf(const char* format, va_list val) __attribute__((noinline));
 
+
+// error_printf, error_vprintf
+//    Print debugging messages to the console and to the host's
+//    `log.txt` file via `log_printf`.
+int error_printf(int cpos, int color, const char* format, ...)
+    __attribute__((noinline));
+int error_vprintf(int cpos, int color, const char* format, va_list val)
+    __attribute__((noinline));
+
 #endif

kernel4x/kernel.h

@@ -181,10 +181,12 @@ void printer_vprintf(printer* p, int color, const char* format, va_list val) {
     again:
         switch (*format) {
         case 'l':
+        case 'z':
             length = 1;
             ++format;
             goto again;
-        case 'd': {
+        case 'd':
+        case 'i': {
             long x = length ? va_arg(val, long) : va_arg(val, int);
             int negative = x < 0 ? FLAG_NEGATIVE : 0;
             num = negative ? -x : x;
@@ -218,7 +220,6 @@ void printer_vprintf(printer* p, int color, const char* format, va_list val) {
             numbuf[0] = va_arg(val, int);
             numbuf[1] = '\0';
             break;
-        normal:
         default:
             data = numbuf;
             numbuf[0] = (*format ? *format : '%');
@@ -254,7 +255,7 @@ void printer_vprintf(printer* p, int color, const char* format, va_list val) {
             zeros = precision > len ? precision - len : 0;
         else if ((flags & FLAG_NUMERIC) && (flags & FLAG_ZERO)
                  && !(flags & FLAG_LEFTJUSTIFY)
-                 && len + strlen(prefix) < width)
+                 && len + (int) strlen(prefix) < width)
             zeros = width - len - strlen(prefix);
         else
             zeros = 0;