A better panic.

013a2bac · Silas Boyd-Wickizer · 4c1ef7b0 · 013a2bac · 013a2bac · 013a2bac
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,7 @@ OBJS = \
 	string.o \
 	syscall.o \
 	sysfile.o \
+	sysproc.o \
 	uart.o \
 	vm.o \
 	trap.o \

--- a/console.c
+++ b/console.c
@@ -7,6 +7,7 @@
 #include "cpu.h"
 #include "kernel.h"
 #include "spinlock.h"
+#include "x86.h"

 #include <stdarg.h>

@@ -173,11 +174,17 @@ puts(const char *s)
 void __attribute__((noreturn))
 panic(const char *s)
 {
-  puts("panic: ");
-  puts(s);
-  puts("\n");
+  cli();
+  cons.locking = 0;
+  cprintf("cpu%d: panic: ", mycpu()->id);
+  cprintf(s);
+  cprintf("\n");
+
+  extern void sys_halt();
+  sys_halt();

-  for (;;);
+  for(;;)
+    ;
 }

 void

--- a/sysproc.c
+++ b/sysproc.c
 #include "types.h"
 #include "x86.h"
-#include "defs.h"
+#include "kernel.h"
 #include "param.h"
 #include "memlayout.h"
 #include "mmu.h"
@@ -9,6 +9,7 @@
 #include "queue.h"
 #include "proc.h"

+#if 0
 int
 sys_fork(void)
 {
@@ -143,6 +144,7 @@ sys_unmap(void)
  sti();
  return 0;
 }
+#endif

 int
 sys_halt(void)