Redo makefiles.

[pintos-anon] / src / threads / init.c

diff --git a/src/threads/init.c b/src/threads/init.c
index a3ab43d577c5d6a98bd629883c7f1e84c840034e..57d5301c3ae3a0477e3aeb846c0ec97b01d940b3 100644 (file)
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -2,27 +2,31 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <limits.h>
-#include "debug.h"
-#include "gdt.h"
 #include "interrupt.h"
 #include "io.h"
-#include "kbd.h"
-#include "lib.h"
 #include "loader.h"
 #include "malloc.h"
 #include "mmu.h"
 #include "paging.h"
 #include "palloc.h"
-#include "random.h"
-#include "serial.h"
 #include "thread.h"
-#include "timer.h"
-#include "tss.h"
-#include "vga.h"
+#include "devices/kbd.h"
+#include "devices/serial.h"
+#include "devices/timer.h"
+#include "devices/vga.h"
+#include "lib/debug.h"
+#include "lib/lib.h"
+#include "lib/random.h"
+#ifdef USERPROG
+#include "userprog/exception.h"
+#include "userprog/gdt.h"
+#include "userprog/syscall.h"
+#include "userprog/tss.h"
+#endif
 #ifdef FILESYS
-#include "filesys.h"
-#include "disk.h"
-#include "fsutil.h"
+#include "devices/disk.h"
+#include "filesys/filesys.h"
+#include "filesys/fsutil.h"
 #endif
 
 /* Amount of physical memory, in 4 kB pages. */
@@ -41,27 +45,12 @@ static char *initial_program;
 static void ram_init (void);
 static void argv_init (void);
 
-static void
-main_thread (void *aux UNUSED) 
-{
-#ifdef FILESYS
-  disk_init ();
-  filesys_init (format_filesys);
-  fsutil_run ();
-#endif
-
-#ifdef USERPROG
-  if (initial_program != NULL)
-    thread_execute (initial_program);
-  else
-    PANIC ("no initial program specified");
-#endif
-}
+int main (void) NO_RETURN;
 
 int
 main (void)
 {
-  /* Initialize prerequisites for calling printk(). */
+  /* Needed by printk(), so initialize them very early. */
   ram_init ();
   vga_init ();
   serial_init ();
@@ -72,27 +61,54 @@ main (void)
   /* Parse command line. */
   argv_init ();
 
-  /* Initialize memory system. */
+  /* Initialize memory system, segments, paging. */
+  thread_init ();
   palloc_init ();
   paging_init ();
+#ifdef USERPROG
   tss_init ();
   gdt_init ();
+#endif
   malloc_init ();
 
+  /* Set random seed if not already done. */
   random_init (0);
 
   /* Initialize interrupt handlers. */
   intr_init ();
   timer_init ();
   kbd_init ();
+#ifdef USERPROG
+  exception_init ();
+  syscall_init ();
+#endif
 
-  /* Do everything else in a system thread. */
-  thread_init ();
-  thread_create ("main", main_thread, NULL);
+  /* Start thread scheduler and enable interrupts. */
   thread_start ();
-}
 
+#ifdef FILESYS
+  /* Initialize filesystem. */
+  disk_init ();
+  filesys_init (format_filesys);
+  fsutil_run ();
+#endif
+
+  printk ("Boot complete.\n");
+
+#ifdef USERPROG
+  /* Run a user program. */
+  if (initial_program != NULL)
+    {
+      printk ("\nExecuting '%s':\n", initial_program);
+      thread_execute (initial_program); 
+    }
+#endif
 
+  /* Terminate this thread. */
+  thread_exit ();
+}
+\f
+/* Clear BSS and obtain RAM size from loader. */
 static void
 ram_init (void) 
 {
@@ -105,10 +121,11 @@ ram_init (void)
   extern char _start_bss, _end_bss;
   memset (&_start_bss, 0, &_end_bss - &_start_bss);
 
-  /* Get RAM size from loader. */
+  /* Get RAM size from loader.  See loader.S. */
   ram_pages = *(uint32_t *) ptov (LOADER_RAM_PAGES);
 }
-\f
+
+/* Parses the command line. */
 static void
 argv_init (void) 
 {
@@ -170,8 +187,9 @@ argv_init (void)
           " -p FILENAME         Print the contents of FILENAME\n"
           " -r FILENAME         Delete FILENAME\n"
           " -ls                 List the files in the filesystem\n"
-          " -D                  Dump complete filesystem contents\n");
+          " -D                  Dump complete filesystem contents\n"
 #endif
+          );
       }
     else 
       PANIC ("unknown option `%s'", argv[i]);