Use runtime options instead of conditional compilation for MLFQS,

[pintos-anon] / src / userprog / pagedir.c

diff --git a/src/userprog/pagedir.c b/src/userprog/pagedir.c
index c0a015ae831ab20e88311538fb3eb541c0894b25..d9cfd301e5d5997887eb64e894f8c82e5f282a03 100644 (file)
--- a/src/userprog/pagedir.c
+++ b/src/userprog/pagedir.c
@@ -192,7 +192,7 @@ pagedir_activate (uint32_t *pd)
      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 (pd)));
+  asm volatile ("mov %%cr3, %0" :: "r" (vtop (pd)));
 }
 
 /* Returns the currently active page directory. */
@@ -203,7 +203,7 @@ active_pd (void)
      `pd'.
      See [IA32-v2a] "MOV--Move to/from Control Registers" and
      [IA32-v3] 3.7.5. */
-  uint32_t *pd;
-  asm ("movl %%cr3,%0" : "=r" (pd));
-  return pd;
+  uintptr_t pd;
+  asm ("mov %0, %%cr3" : "=r" (pd));
+  return ptov (pd);
 }