From d3ecf3eb44379f12b47da9d08e4d1b52cf7c2601 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 1 Sep 2010 17:14:58 -0400 Subject: [PATCH] Slight simplification of copyuvm. We could simplify other things now that processes are contiguous, but we'd have to think harder about the error paths. --- vm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/vm.c b/vm.c index 2f2b238..8cfac14 100644 --- a/vm.c +++ b/vm.c @@ -310,14 +310,14 @@ copyuvm(pde_t *pgdir, uint sz) for(i = 0; i < sz; i += PGSIZE){ if(!(pte = walkpgdir(pgdir, (void *)i, 0))) panic("copyuvm: pte should exist\n"); - if(*pte & PTE_P){ - pa = PTE_ADDR(*pte); - if(!(mem = kalloc())) - goto bad; - memmove(mem, (char *)pa, PGSIZE); - if(!mappages(d, (void *)i, PGSIZE, PADDR(mem), PTE_W|PTE_U)) - goto bad; - } + if(!(*pte & PTE_P)) + panic("copyuvm: page not present\n"); + pa = PTE_ADDR(*pte); + if(!(mem = kalloc())) + goto bad; + memmove(mem, (char *)pa, PGSIZE); + if(!mappages(d, (void *)i, PGSIZE, PADDR(mem), PTE_W|PTE_U)) + goto bad; } return d;