X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2Fuserprog%2Fpagedir.c;h=1442d4076067043f9ff35a516c999f2addff0cc3;hp=30bdfe263b67f58ee9787b413036de6984c7628b;hb=fde3b8ee3eaf48b1a6bb14568aedc207e62accab;hpb=64e74e3536b95c4d0a46aec56bc373ad0f6d470b

diff --git a/src/userprog/pagedir.c b/src/userprog/pagedir.c
index 30bdfe2..1442d40 100644
--- a/src/userprog/pagedir.c
+++ b/src/userprog/pagedir.c
@@ -18,7 +18,7 @@ pagedir_create (void)
 {
   uint32_t *pd = palloc_get_page (0);
   if (pd != NULL)
-    memcpy (pd, base_page_dir, PGSIZE);
+    memcpy (pd, init_page_dir, PGSIZE);
   return pd;
 }
 
@@ -32,7 +32,7 @@ pagedir_destroy (uint32_t *pd)
   if (pd == NULL)
     return;
 
-  ASSERT (pd != base_page_dir);
+  ASSERT (pd != init_page_dir);
   for (pde = pd; pde < pd + pd_no (PHYS_BASE); pde++)
     if (*pde & PTE_P) 
       {
@@ -104,7 +104,7 @@ pagedir_set_page (uint32_t *pd, void *upage, void *kpage, bool writable)
   ASSERT (pg_ofs (kpage) == 0);
   ASSERT (is_user_vaddr (upage));
   ASSERT (vtop (kpage) >> PTSHIFT < ram_pages);
-  ASSERT (pd != base_page_dir);
+  ASSERT (pd != init_page_dir);
 
   pte = lookup_page (pd, upage, true);
 
@@ -220,7 +220,7 @@ void
 pagedir_activate (uint32_t *pd) 
 {
   if (pd == NULL)
-    pd = base_page_dir;
+    pd = init_page_dir;
 
   /* Store the physical address of the page directory into CR3
      aka PDBR (page directory base register).  This activates our