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

nits

Browse source
This commit is contained in:
Robert Morris 2012-08-28 14:11:23 -04:00
parent c1ee7eb4d3
commit 792d83cad1
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
README
View file

@ -6,7 +6,7 @@ ACKNOWLEDGMENTS
xv6 is inspired by John Lions's Commentary on UNIX 6th Edition (Peer xv6 is inspired by John Lions's Commentary on UNIX 6th Edition (Peer
to Peer Communications; ISBN: 1-57398-013-7; 1st edition (June 14, to Peer Communications; ISBN: 1-57398-013-7; 1st edition (June 14,
2000)). See also http://pdos.csail.mit.edu/6.828/2007/v6.html, which 2000)). See also http://pdos.csail.mit.edu/6.828/2012/v6.html, which
provides pointers to on-line resources for v6. provides pointers to on-line resources for v6.
xv6 borrows code from the following sources: xv6 borrows code from the following sources:
@ -15,7 +15,7 @@ xv6 borrows code from the following sources:
FreeBSD (ioapic.c) FreeBSD (ioapic.c)
NetBSD (console.c) NetBSD (console.c)
The following people made contributions: The following people have made contributions:
Russ Cox (context switching, locking) Russ Cox (context switching, locking)
Cliff Frey (MP) Cliff Frey (MP)
Xiao Yu (MP) Xiao Yu (MP)
@ -26,7 +26,7 @@ In addition, we are grateful for the patches contributed by Greg
Price, Yandong Mao, and Hitoshi Mitake. Price, Yandong Mao, and Hitoshi Mitake.
The code in the files that constitute xv6 is The code in the files that constitute xv6 is
Copyright 2006-2011 Frans Kaashoek, Robert Morris, and Russ Cox. Copyright 2006-2012 Frans Kaashoek, Robert Morris, and Russ Cox.
ERROR REPORTS ERROR REPORTS
@ -38,13 +38,13 @@ BUILDING AND RUNNING XV6
To build xv6 on an x86 ELF machine (like Linux or FreeBSD), run "make". To build xv6 on an x86 ELF machine (like Linux or FreeBSD), run "make".
On non-x86 or non-ELF machines (like OS X, even on x86), you will On non-x86 or non-ELF machines (like OS X, even on x86), you will
need to install a cross-compiler gcc suite capable of producing x86 ELF need to install a cross-compiler gcc suite capable of producing x86 ELF
binaries. See http://pdos.csail.mit.edu/6.828/2011/tools.html. binaries. See http://pdos.csail.mit.edu/6.828/2012/tools.html.
Then run "make TOOLPREFIX=i386-jos-elf-". Then run "make TOOLPREFIX=i386-jos-elf-".
To run xv6, you can use Bochs or QEMU, both PC simulators. To run xv6, you can use the Bochs or QEMU PC simulators. Bochs makes
Bochs makes debugging easier, but QEMU is much faster. debugging easier, but QEMU is much faster. To run in Bochs, run "make
To run in Bochs, run "make bochs" and then type "c" at the bochs prompt. bochs" and then type "c" at the bochs prompt. To run in QEMU, run
To run in QEMU, run "make qemu". "make qemu".
To create a typeset version of the code, run "make xv6.pdf". This To create a typeset version of the code, run "make xv6.pdf". This
requires the "mpage" utility. See http://www.mesa.nl/pub/mpage/. requires the "mpage" utility. See http://www.mesa.nl/pub/mpage/.

8
vm.c
View file

@ -118,10 +118,10 @@ static struct kmap {
uint phys_end; uint phys_end;
int perm; int perm;
} kmap[] = { } kmap[] = {
{ (void*)KERNBASE, 0, EXTMEM, PTE_W}, // I/O space { (void*)KERNBASE, 0, EXTMEM, PTE_W}, // I/O space
{ (void*)KERNLINK, V2P(KERNLINK), V2P(data), 0}, // kernel text+rodata { (void*)KERNLINK, V2P(KERNLINK), V2P(data), 0}, // kern text+rodata
{ (void*)data, V2P(data), PHYSTOP, PTE_W}, // kernel data+memory { (void*)data, V2P(data), PHYSTOP, PTE_W}, // kern data+memory
{ (void*)DEVSPACE, DEVSPACE, 0, PTE_W}, // more devices { (void*)DEVSPACE, DEVSPACE, 0, PTE_W}, // more devices
}; };
// Set up kernel part of a page table. // Set up kernel part of a page table.