summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2018-10-04 09:21:36 -0400
committerFrans Kaashoek <[email protected]>2018-10-04 09:21:36 -0400
commit704775b63d2d78445e45a8b65e87a67abbc45e75 (patch)
tree84e4390770088d99b349b3504171b3d6eeb3041b /vm.c
parent2fa3a8fd0557ebeb6a59c3de44332232f18ac1d9 (diff)
downloadxv6-labs-704775b63d2d78445e45a8b65e87a67abbc45e75.tar.gz
xv6-labs-704775b63d2d78445e45a8b65e87a67abbc45e75.tar.bz2
xv6-labs-704775b63d2d78445e45a8b65e87a67abbc45e75.zip
Make names line up with text
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/vm.c b/vm.c
index 4b272ff..ebb6749 100644
--- a/vm.c
+++ b/vm.c
@@ -66,22 +66,22 @@ seginit(void)
static pte_t *
walkpgdir(pde_t *pml4, const void *va, int alloc)
{
- pde_t *pgtab = pml4;
- pde_t *pte;
+ pde_t *pgdir = pml4;
+ pde_t *pde;
int level;
for (level = L_PML4; level > 0; level--) {
- pte = &pgtab[PX(level, va)];
- if(*pte & PTE_P)
- pgtab = (pte_t*)P2V(PTE_ADDR(*pte));
+ pde = &pgdir[PX(level, va)];
+ if(*pde & PTE_P)
+ pgdir = (pte_t*)P2V(PTE_ADDR(*pde));
else {
- if(!alloc || (pgtab = (pte_t*)kalloc()) == 0)
+ if(!alloc || (pgdir = (pde_t*)kalloc()) == 0)
return 0;
- memset(pgtab, 0, PGSIZE);
- *pte = V2P(pgtab) | PTE_P | PTE_W | PTE_U;
+ memset(pgdir, 0, PGSIZE);
+ *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