Move halt functionality to main.c

Avoid calling sys_halt from inside the kernel.

Move halt functionality to main.c
42c41a06 · Austin Clements · 7770d60c · 42c41a06 · 42c41a06 · 42c41a06
--- a/include/kernel.hh
+++ b/include/kernel.hh
@@ -148,6 +148,9 @@ void            lapic_tlbflush(hwid_t);
 void            lapic_sampconf(hwid_t);
 void            lapicpc(char mask);

+// main.c
+void            halt(void) __attribute__((noreturn));
+
 // mp.c
 extern int      ncpu;
 int             mpbcpu(void);

--- a/kernel/console.cc
+++ b/kernel/console.cc
@@ -183,7 +183,7 @@ kerneltrap(struct trapframe *tf)
  printtrace(tf->rbp);

  panicked = 1;
-  sys_halt();
+  halt();
  for(;;)
    ;
 }
@@ -204,7 +204,7 @@ panic(const char *fmt, ...)
  printtrace(rrbp());

  panicked = 1;
-  sys_halt();
+  halt();
  for(;;)
    ;
 }

--- a/kernel/main.cc
+++ b/kernel/main.cc
@@ -140,3 +140,14 @@ cmain(u64 mbmagic, u64 mbaddr)

  panic("Unreachable");
 }
+
+void
+halt(void)
+{
+  int i;
+  const char s[] = "Shutdown";
+
+  for(i = 0; i < 8; i++)
+    outb(0x8900, s[i]);
+  for (;;);
+}
--- a/kernel/sysproc.cc
+++ b/kernel/sysproc.cc
@@ -148,12 +148,8 @@ sys_unmap(userptr<void> addr, size_t len)
 int
 sys_halt(void)
 {
-  int i;
-  const char s[] = "Shutdown";
-
-  for(i = 0; i < 8; i++)
-    outb(0x8900, s[i]);
-  return 0;
+  halt();
+  panic("halt returned");
 }

 //SYSCALL