summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsc <rsc>2007-08-28 19:30:23 +0000
committerrsc <rsc>2007-08-28 19:30:23 +0000
commitf04006009263d18f3b38b905a3ed18e029963351 (patch)
tree0827a38d343c06f19c23a10243669317391e6337
parentcffa9543012ee0bc2a1d355ed00839b03fe7ae0c (diff)
downloadxv6-labs-f04006009263d18f3b38b905a3ed18e029963351.tar.gz
xv6-labs-f04006009263d18f3b38b905a3ed18e029963351.tar.bz2
xv6-labs-f04006009263d18f3b38b905a3ed18e029963351.zip
nits
-rw-r--r--README8
1 files changed, 4 insertions, 4 deletions
diff --git a/README b/README
index d039912..9d56a67 100644
--- a/README
+++ b/README
@@ -4,14 +4,14 @@ but is implemented for a modern x86-based multiprocessor using ANSI C.
ACKNOWLEDGEMENTS
-xv6 is inspired by John Lions' 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,
2000)). See also http://pdos.csail.mit.edu/6.828/2007/v6.html, which
provides pointers to on-line resources for v6.
xv6 borrows code from the following sources:
JOS (asm.h, elf.h, mmu.h, bootasm.S, ide.c, console.c, and others)
- Plan 9 (bootother.S, mp.h, mp.c, ioapic.h, lapic.c)
+ Plan 9 (bootother.S, mp.h, mp.c, lapic.c)
FreeBSD (ioapic.c)
NetBSD (console.c)
@@ -37,8 +37,8 @@ need to install a cross-compiler gcc suite capable of producing x86 ELF
binaries. See http://pdos.csail.mit.edu/6.828/2007/tools.html.
Then run "make TOOLPREFIX=i386-jos-elf-".
-To run xv6, you can use Bochs or QEMU, both PC simulators. Bochs makes
-debugging easier, but QEMU is much faster.
+To run xv6, you can use Bochs or QEMU, both PC simulators.
+Bochs makes debugging easier, but QEMU is much faster.
To run in Bochs, run "make bochs" and then type "c" at the bochs prompt.
To run in QEMU, run "make qemu". Both log the xv6 screen output to
standard output.