X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=c17316aa59efec1951ad48eed5c8e4522a3e0381;hb=f329c5c10351234a6a5e2757c5f070f02b73639c;hp=9347ad42b9ecffd5b9d155691478191b738ab831;hpb=63b811f31e550794fbbcaa75ea51b41023178f28;p=pintos-anon

diff --git a/src/threads/init.c b/src/threads/init.c
index 9347ad4..c17316a 100644
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -49,8 +49,8 @@ static bool format_filesys;
 static char *initial_program;
 #endif
 
-/* -q: Power off after running requested actions? */
-static bool do_power_off;
+/* -q: Power off after kernel tasks complete? */
+bool power_off_when_done;
 
 static void ram_init (void);
 static void paging_init (void);
@@ -74,7 +74,7 @@ main (void)
   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 ();
@@ -105,6 +105,7 @@ main (void)
   /* Start thread scheduler and enable interrupts. */
   thread_start ();
   serial_init_queue ();
+  timer_calibrate ();
 
 #ifdef FILESYS
   /* Initialize filesystem. */
@@ -133,7 +134,7 @@ main (void)
 #endif
 
   /* Finish up. */
-  if (do_power_off) 
+  if (power_off_when_done) 
     power_off ();
   else 
     thread_exit ();
@@ -189,7 +190,11 @@ paging_init (void)
       pt[pte_idx] = pte_create_kernel (vaddr, true);
     }
 
-  asm volatile ("movl %0,%%cr3" :: "r" (vtop (base_page_dir)));
+  /* 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 ("mov %%cr3, %0" :: "r" (vtop (base_page_dir)));
 }
 
 /* Parses the command line. */
@@ -225,7 +230,7 @@ argv_init (void)
     else if (!strcmp (argv[i], "-d")) 
       debug_enable (argv[++i]);
     else if (!strcmp (argv[i], "-q"))
-      do_power_off = true;
+      power_off_when_done = true;
 #ifdef USERPROG
     else if (!strcmp (argv[i], "-ex")) 
       initial_program = argv[++i];