Rename xmalloc() as malloc_or_panic(),

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

diff --git a/src/threads/init.c b/src/threads/init.c
index cf7a896222a5e2370b8f03827fda4fbaf9c8d4c1..73a2e98305ffed99b683a9a350624e44c3f78717 100644 (file)
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -29,6 +29,7 @@
 #endif
 #ifdef FILESYS
 #include "devices/disk.h"
+#include "devices/partition.h"
 #include "filesys/filesys.h"
 #include "filesys/fsutil.h"
 #endif
@@ -40,7 +41,7 @@ size_t ram_pages;
 uint32_t *base_page_dir;
 
 #ifdef FILESYS
-/* -f: Format the filesystem? */
+/* -f: Format the file system? */
 static bool format_filesys;
 #endif
 
@@ -108,8 +109,9 @@ main (void)
   timer_calibrate ();
 
 #ifdef FILESYS
-  /* Initialize filesystem. */
+  /* Initialize file system. */
   disk_init ();
+  partition_init ();
   filesys_init (format_filesys);
   fsutil_run ();
 #endif
@@ -194,7 +196,7 @@ paging_init (void)
      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)));
+  asm volatile ("mov %%cr3, %0" :: "r" (vtop (base_page_dir)));
 }
 
 /* Parses the command line. */
@@ -267,15 +269,15 @@ argv_init (void)
           " -ul USER_MAX        Limit user memory to USER_MAX pages.\n"
 #endif
 #ifdef FILESYS
-          " -f                  Format the filesystem disk (hdb or hd0:1).\n"
+          " -f                  Format the file system disk (hdb or hd0:1).\n"
           " -ci FILENAME SIZE   Copy SIZE bytes from the scratch disk (hdc\n"
-          "                     or hd1:0) into the filesystem as FILENAME\n"
+          "                     or hd1:0) into the file system as FILENAME\n"
           " -co FILENAME        Copy FILENAME to the scratch disk, with\n"
           "                     size at start of sector 0 and data afterward\n"
           " -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"
+          " -ls                 List the files in the file system\n"
+          " -D                  Dump complete file system contents\n"
 #endif
           " -q                  Power off after doing requested actions.\n"
           " -u                  Print this help message and power off.\n"