projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comments.
[pintos-anon]
/
src
/
userprog
/
pagedir.c
diff --git
a/src/userprog/pagedir.c
b/src/userprog/pagedir.c
index 39a8f0a3af286f9227cf7d7226f19b7cd18e50e4..bfcda457512574f85f06b1c950a08fe15117621a 100644
(file)
--- a/
src/userprog/pagedir.c
+++ b/
src/userprog/pagedir.c
@@
-40,7
+40,6
@@
lookup_page (uint32_t *pd, void *upage, bool create)
uint32_t *pde;
ASSERT (pd != NULL);
uint32_t *pde;
ASSERT (pd != NULL);
- ASSERT (pg_ofs (upage) == 0);
ASSERT (upage < PHYS_BASE);
/* Check for a page table for UPAGE.
ASSERT (upage < PHYS_BASE);
/* Check for a page table for UPAGE.
@@
-84,9
+83,9
@@
pagedir_set_page (uint32_t *pd, void *upage, void *kpage,
}
void *
}
void *
-pagedir_get_page (uint32_t *pd, void *upage)
+pagedir_get_page (uint32_t *pd,
const
void *upage)
{
{
- uint32_t *pte = lookup_page (pd, upage, false);
+ uint32_t *pte = lookup_page (pd,
(void *)
upage, false);
return pte != NULL && *pte != 0 ? pte_get_page (*pte) : NULL;
}
return pte != NULL && *pte != 0 ? pte_get_page (*pte) : NULL;
}