X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=cb4edf9deb5a7a39eae5b12f8f030e4d3f3e1e2b;hb=a1975cbec0da9ccce19f76df431b48d3cbfed3cd;hp=8ee50a2731b8730a2abef9caa4b88f747a8cce51;hpb=4ebf33908a571a7cde93fe618902b044e3633cdf;p=pintos-anon

diff --git a/src/threads/init.c b/src/threads/init.c
index 8ee50a2..cb4edf9 100644
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -45,13 +45,6 @@ uint32_t *base_page_dir;
    If true, use multi-level feedback queue scheduler. */
 bool enable_mlfqs;
 
-#ifdef VM
-/* -rndpg:
-   If false (default), use LRU page replacement policy.
-   If true, use random page replacement policy. */
-bool enable_random_paging;
-#endif
-
 #ifdef FILESYS
 /* -f: Format the filesystem? */
 static bool format_filesys;
@@ -195,8 +188,9 @@ paging_init (void)
   /* 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)));
+     to/from Control Registers" and [IA32-v3a] 3.7.5 "Base Address
+     of the Page Directory". */
+  asm volatile ("movl %0, %%cr3" :: "r" (vtop (base_page_dir)));
 }
 
 /* Breaks the kernel command line into words and returns them as
@@ -257,14 +251,9 @@ parse_options (char **argv)
 #ifdef USERPROG
       else if (!strcmp (name, "-ul"))
         user_page_limit = atoi (value);
-#endif
-#ifdef VM
-      else if (!strcmp (name, "-rndpg"))
-        enable_random_paging = true;
 #endif
       else
         PANIC ("unknown option `%s' (use -h for help)", name);
-
     }
   
   return argv;
@@ -366,9 +355,6 @@ usage (void)
           "  -mlfqs             Use multi-level feedback queue scheduler.\n"
 #ifdef USERPROG
           "  -ul=COUNT          Limit user memory to COUNT pages.\n"
-#endif
-#ifdef VM
-          "  -rndpg             Use random page replacement policy.\n"
 #endif
           );
   power_off ();