X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=cf7a896222a5e2370b8f03827fda4fbaf9c8d4c1;hb=f0ad7eb8b43516c7a2999fd217ec85d954dfc791;hp=203b79dff7fca5b4a51bbe6b43c9f8e2a6028fe8;hpb=c00124df280431bb3f1fd26ef0f5c863365c6474;p=pintos-anon

diff --git a/src/threads/init.c b/src/threads/init.c
index 203b79d..cf7a896 100644
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -17,11 +17,11 @@
 #include "threads/loader.h"
 #include "threads/malloc.h"
 #include "threads/mmu.h"
-#include "threads/paging.h"
 #include "threads/palloc.h"
 #include "threads/test.h"
 #include "threads/thread.h"
 #ifdef USERPROG
+#include "userprog/process.h"
 #include "userprog/exception.h"
 #include "userprog/gdt.h"
 #include "userprog/syscall.h"
@@ -36,49 +36,59 @@
 /* Amount of physical memory, in 4 kB pages. */
 size_t ram_pages;
 
+/* Page directory with kernel mappings only. */
+uint32_t *base_page_dir;
+
 #ifdef FILESYS
-/* Format the filesystem? */
+/* -f: Format the filesystem? */
 static bool format_filesys;
 #endif
 
 #ifdef USERPROG
-/* Initial program to run. */
+/* -ex: Initial program to run. */
 static char *initial_program;
 #endif
 
-/* Power off after running requested actions? */
-static bool power_off;
+/* -q: Power off after kernel tasks complete? */
+bool power_off_when_done;
 
 static void ram_init (void);
+static void paging_init (void);
 static void argv_init (void);
-static void do_power_off (void);
+static void print_stats (void);
 
 int main (void) NO_RETURN;
 
 int
 main (void)
 {
-  /* Initialize everything needed for printf() first. */
+  /* Clear BSS and get machine's RAM size. */  
   ram_init ();
+
+  /* Initialize ourselves as a thread so we can use locks. */
   thread_init ();
+
+  /* Initialize the console so we can use printf(). */
   vga_init ();
   serial_init_poll ();
   console_init ();
 
   /* Greet user. */
-  printf ("Pintos booting with %'zd kB RAM...\n", ram_pages * (PGSIZE / 1024));
+  printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024);
 
   /* Parse command line. */
   argv_init ();
 
-  /* Initialize memory system, segments, paging. */
+  /* Initialize memory system. */
   palloc_init ();
+  malloc_init ();
   paging_init ();
+
+  /* Segmentation. */
 #ifdef USERPROG
   tss_init ();
   gdt_init ();
 #endif
-  malloc_init ();
 
   /* Set random seed if argv_init() didn't. */
   random_init (0);
@@ -95,6 +105,7 @@ main (void)
   /* Start thread scheduler and enable interrupts. */
   thread_start ();
   serial_init_queue ();
+  timer_calibrate ();
 
 #ifdef FILESYS
   /* Initialize filesystem. */
@@ -109,18 +120,24 @@ main (void)
   /* Run a user program. */
   if (initial_program != NULL)
     {
+      tid_t tid;
       printf ("\nExecuting '%s':\n", initial_program);
-      thread_execute (initial_program); 
+      tid = process_execute (initial_program);
+#ifdef THREAD_JOIN_IMPLEMENTED
+      if (tid != TID_ERROR)
+        thread_join (tid);
+#endif
     }
 #else
+  /* Run the compiled-in test function. */
   test ();
 #endif
 
-  if (power_off) 
-    do_power_off ();
-
-  /* Terminate this thread. */
-  thread_exit ();
+  /* Finish up. */
+  if (power_off_when_done) 
+    power_off ();
+  else 
+    thread_exit ();
 }
 
 /* Clear BSS and obtain RAM size from loader. */
@@ -140,6 +157,46 @@ ram_init (void)
   ram_pages = *(uint32_t *) ptov (LOADER_RAM_PAGES);
 }
 
+/* Populates the base page directory and page table with the
+   kernel virtual mapping, and then sets up the CPU to use the
+   new page directory.  Points base_page_dir to the page
+   directory it creates.
+
+   At the time this function is called, the active page table
+   (set up by loader.S) only maps the first 4 MB of RAM, so we
+   should not try to use extravagant amounts of memory.
+   Fortunately, there is no need to do so. */
+static void
+paging_init (void)
+{
+  uint32_t *pd, *pt;
+  size_t page;
+
+  pd = base_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO);
+  pt = NULL;
+  for (page = 0; page < ram_pages; page++) 
+    {
+      uintptr_t paddr = page * PGSIZE;
+      void *vaddr = ptov (paddr);
+      size_t pde_idx = pd_no (vaddr);
+      size_t pte_idx = pt_no (vaddr);
+
+      if (pd[pde_idx] == 0)
+        {
+          pt = palloc_get_page (PAL_ASSERT | PAL_ZERO);
+          pd[pde_idx] = pde_create (pt);
+        }
+
+      pt[pte_idx] = pte_create_kernel (vaddr, true);
+    }
+
+  /* Store the physical address of the page directory into CR3
+     aka PDBR (page directory base register).  This activates our
+     new page tables immediately.  See [IA32-v2a] "MOV--Move
+     to/from Control Registers" and [IA32-v3] 3.7.5. */
+  asm volatile ("movl %0,%%cr3" :: "r" (vtop (base_page_dir)));
+}
+
 /* Parses the command line. */
 static void
 argv_init (void) 
@@ -152,14 +209,17 @@ argv_init (void)
   /* The command line is made up of null terminated strings
      followed by an empty string.  Break it up into words. */
   cmd_line = pos = ptov (LOADER_CMD_LINE);
+  printf ("Kernel command line:");
   while (pos < cmd_line + LOADER_CMD_LINE_LEN)
     {
       ASSERT (argc < LOADER_CMD_LINE_LEN / 2);
       if (*pos == '\0')
         break;
       argv[argc++] = pos;
+      printf (" %s", pos);
       pos = strchr (pos, '\0') + 1;
     }
+  printf ("\n");
   argv[argc] = "";
   argv[argc + 1] = "";
 
@@ -170,13 +230,15 @@ argv_init (void)
     else if (!strcmp (argv[i], "-d")) 
       debug_enable (argv[++i]);
     else if (!strcmp (argv[i], "-q"))
-      power_off = true;
+      power_off_when_done = true;
 #ifdef USERPROG
     else if (!strcmp (argv[i], "-ex")) 
       initial_program = argv[++i];
+    else if (!strcmp (argv[i], "-ul"))
+      user_page_limit = atoi (argv[++i]);
 #endif
 #ifdef FILESYS
-  else if (!strcmp (argv[i], "-f"))
+    else if (!strcmp (argv[i], "-f"))
       format_filesys = true;
     else if (!strcmp (argv[i], "-ci")) 
       {
@@ -202,6 +264,7 @@ argv_init (void)
           " -d CLASS[,...]      Enable the given classes of debug messages.\n"
 #ifdef USERPROG
           " -ex 'PROG [ARG...]' Run PROG, passing the optional arguments.\n"
+          " -ul USER_MAX        Limit user memory to USER_MAX pages.\n"
 #endif
 #ifdef FILESYS
           " -f                  Format the filesystem disk (hdb or hd0:1).\n"
@@ -215,14 +278,18 @@ argv_init (void)
           " -D                  Dump complete filesystem contents\n"
 #endif
           " -q                  Power off after doing requested actions.\n"
+          " -u                  Print this help message and power off.\n"
           );
+        power_off ();
       }
     else 
-      PANIC ("unknown option `%s'", argv[i]);
+      PANIC ("unknown option `%s' (use -u for help)", argv[i]);
 }
 
+/* Powers down the machine we're running on,
+   as long as we're running on Bochs or qemu. */
 void
-do_power_off (void) 
+power_off (void) 
 {
   const char s[] = "Shutdown";
   const char *p;
@@ -231,8 +298,28 @@ do_power_off (void)
   filesys_done ();
 #endif
 
+  print_stats ();
+
   printf ("Powering off...\n");
+  serial_flush ();
+
   for (p = s; *p != '\0'; p++)
     outb (0x8900, *p);
   for (;;);
 }
+
+/* Print statistics about Pintos execution. */
+static void
+print_stats (void) 
+{
+  timer_print_stats ();
+  thread_print_stats ();
+#ifdef FILESYS
+  disk_print_stats ();
+#endif
+  console_print_stats ();
+  kbd_print_stats ();
+#ifdef USERPROG
+  exception_print_stats ();
+#endif
+}