diff options
| author | Frans Kaashoek <kaashoek@42.sub-75-251-87.myvzw.com> | 2011-08-09 21:56:43 -0400 |
|---|---|---|
| committer | Frans Kaashoek <kaashoek@42.sub-75-251-87.myvzw.com> | 2011-08-09 21:56:43 -0400 |
| commit | 8a9933a20031bcdc34f360d23a29c87f8335fd12 (patch) | |
| tree | 3d19ad659d03ca59550f2731f3eb959a166879c4 | |
| parent | 22c73411ca8d2766469218175715b1f7cc3d0ede (diff) | |
| download | xv6-labs-8a9933a20031bcdc34f360d23a29c87f8335fd12.tar.gz xv6-labs-8a9933a20031bcdc34f360d23a29c87f8335fd12.tar.bz2 xv6-labs-8a9933a20031bcdc34f360d23a29c87f8335fd12.zip | |
Tiny bit of cleanup
| -rw-r--r-- | vm.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -43,7 +43,7 @@ seginit(void) // that corresponds to linear address va. If create!=0, // create any required page table pages. static pte_t * -walkpgdir(pde_t *pgdir, const void *va, int create, char* (*alloc)(void)) +walkpgdir(pde_t *pgdir, const void *va, char* (*alloc)(void)) { pde_t *pde; pte_t *pgtab; @@ -52,7 +52,7 @@ walkpgdir(pde_t *pgdir, const void *va, int create, char* (*alloc)(void)) if(*pde & PTE_P){ pgtab = (pte_t*)p2v(PTE_ADDR(*pde)); } else { - if(!create || (pgtab = (pte_t*)alloc()) == 0) + if(!alloc || (pgtab = (pte_t*)alloc()) == 0) return 0; // Make sure all those PTE_P bits are zero. memset(pgtab, 0, PGSIZE); @@ -76,7 +76,7 @@ mappages(pde_t *pgdir, void *la, uint size, uint pa, int perm, char* (*alloc)(vo a = PGROUNDDOWN(la); last = PGROUNDDOWN(la + size - 1); for(;;){ - pte = walkpgdir(pgdir, a, 1, alloc); + pte = walkpgdir(pgdir, a, alloc); if(pte == 0) return -1; if(*pte & PTE_P) @@ -222,7 +222,7 @@ loaduvm(pde_t *pgdir, char *addr, struct inode *ip, uint offset, uint sz) if((uint)addr % PGSIZE != 0) panic("loaduvm: addr must be page aligned"); for(i = 0; i < sz; i += PGSIZE){ - if((pte = walkpgdir(pgdir, addr+i, 0, kalloc)) == 0) + if((pte = walkpgdir(pgdir, addr+i, 0)) == 0) panic("loaduvm: address should exist"); pa = PTE_ADDR(*pte); if(sz - i < PGSIZE) @@ -277,7 +277,7 @@ deallocuvm(pde_t *pgdir, uint oldsz, uint newsz) a = PGROUNDUP(newsz); for(; a < oldsz; a += PGSIZE){ - pte = walkpgdir(pgdir, (char*)a, 0, kalloc); + pte = walkpgdir(pgdir, (char*)a, 0); if(pte && (*pte & PTE_P) != 0){ pa = PTE_ADDR(*pte); if(pa == 0) @@ -322,7 +322,7 @@ copyuvm(pde_t *pgdir, uint sz) if((d = setupkvm(kalloc)) == 0) return 0; for(i = 0; i < sz; i += PGSIZE){ - if((pte = walkpgdir(pgdir, (void*)i, 0, kalloc)) == 0) + if((pte = walkpgdir(pgdir, (void*)i, 0)) == 0) panic("copyuvm: pte should exist"); if(!(*pte & PTE_P)) panic("copyuvm: page not present"); @@ -347,7 +347,7 @@ uva2ka(pde_t *pgdir, char *uva) { pte_t *pte; - pte = walkpgdir(pgdir, uva, 0, kalloc); + pte = walkpgdir(pgdir, uva, 0); if((*pte & PTE_P) == 0) return 0; if((*pte & PTE_U) == 0) |