ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

Make names line up with text

Browse source
This commit is contained in:
Frans Kaashoek 2018-10-04 09:21:36 -04:00
parent 2fa3a8fd05
commit 704775b63d
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
vm.c
View file

@ -66,22 +66,22 @@ seginit(void)
static pte_t * static pte_t *
walkpgdir(pde_t *pml4, const void *va, int alloc) walkpgdir(pde_t *pml4, const void *va, int alloc)
{ {
pde_t *pgtab = pml4; pde_t *pgdir = pml4;
pde_t *pte; pde_t *pde;
int level; int level;
for (level = L_PML4; level > 0; level--) { for (level = L_PML4; level > 0; level--) {
pte = &pgtab[PX(level, va)]; pde = &pgdir[PX(level, va)];
if(*pte & PTE_P) if(*pde & PTE_P)
pgtab = (pte_t*)P2V(PTE_ADDR(*pte)); pgdir = (pte_t*)P2V(PTE_ADDR(*pde));
else { else {
if(!alloc || (pgtab = (pte_t*)kalloc()) == 0) if(!alloc || (pgdir = (pde_t*)kalloc()) == 0)
return 0; return 0;
memset(pgtab, 0, PGSIZE); memset(pgdir, 0, PGSIZE);
*pte = V2P(pgtab) | PTE_P | PTE_W | PTE_U; *pde = V2P(pgdir) | PTE_P | PTE_W | PTE_U;
} }
} }
return &pgtab[PX(level, va)]; return &pgdir[PX(level, va)];
} }
// Create PTEs for virtual addresses starting at va that refer to // Create PTEs for virtual addresses starting at va that refer to