greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into clang

Browse source
This commit is contained in:
Gregory Burd 2013-03-12 21:52:01 -04:00
commit 1627777b4a
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -148,6 +148,12 @@ _forktest: forktest.o $(ULIB)
mkfs: mkfs.c fs.h mkfs: mkfs.c fs.h
gcc -Werror -Wall -o mkfs mkfs.c gcc -Werror -Wall -o mkfs mkfs.c
# Prevent deletion of intermediate files, e.g. cat.o, after first build, so
# that disk image changes after first build are persistent until clean. More
# details:
# http://www.gnu.org/software/make/manual/html_node/Chained-Rules.html
.PRECIOUS: %.o
UPROGS=\ UPROGS=\
_cat\ _cat\
_echo\ _echo\

1
mmu.h
View file

@ -142,6 +142,7 @@ struct segdesc {
// Address in page table or page directory entry // Address in page table or page directory entry
#define PTE_ADDR(pte) ((uint)(pte) & ~0xFFF) #define PTE_ADDR(pte) ((uint)(pte) & ~0xFFF)
#define PTE_FLAGS(pte) ((uint)(pte) & 0xFFF)
#ifndef __ASSEMBLER__ #ifndef __ASSEMBLER__
typedef uint pte_t; typedef uint pte_t;

5
vm.c
View file

@ -311,7 +311,7 @@ copyuvm(pde_t *pgdir, uint sz)
{ {
pde_t *d; pde_t *d;
pte_t *pte; pte_t *pte;
uint pa, i; uint pa, i, flags;
char *mem; char *mem;
if((d = setupkvm()) == 0) if((d = setupkvm()) == 0)
@ -322,10 +322,11 @@ copyuvm(pde_t *pgdir, uint sz)
if(!(*pte & PTE_P)) if(!(*pte & PTE_P))
panic("copyuvm: page not present"); panic("copyuvm: page not present");
pa = PTE_ADDR(*pte); pa = PTE_ADDR(*pte);
flags = PTE_FLAGS(*pte);
if((mem = kalloc()) == 0) if((mem = kalloc()) == 0)
goto bad; goto bad;
memmove(mem, (char*)p2v(pa), PGSIZE); memmove(mem, (char*)p2v(pa), PGSIZE);
if(mappages(d, (void*)i, PGSIZE, v2p(mem), PTE_W|PTE_U) < 0) if(mappages(d, (void*)i, PGSIZE, v2p(mem), flags) < 0)
goto bad; goto bad;
} }
return d; return d;