projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename base_page_dir to init_page_dir.
[pintos-anon]
/
src
/
userprog
/
pagedir.c
diff --git
a/src/userprog/pagedir.c
b/src/userprog/pagedir.c
index 30bdfe263b67f58ee9787b413036de6984c7628b..1442d4076067043f9ff35a516c999f2addff0cc3 100644
(file)
--- 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)
{
uint32_t *pd = palloc_get_page (0);
if (pd != NULL)
- memcpy (pd,
base
_page_dir, PGSIZE);
+ memcpy (pd,
init
_page_dir, PGSIZE);
return pd;
}
return pd;
}
@@
-32,7
+32,7
@@
pagedir_destroy (uint32_t *pd)
if (pd == NULL)
return;
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)
{
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 (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);
pte = lookup_page (pd, upage, true);
@@
-220,7
+220,7
@@
void
pagedir_activate (uint32_t *pd)
{
if (pd == NULL)
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
/* Store the physical address of the page directory into CR3
aka PDBR (page directory base register). This activates our