diff options
author | Frans Kaashoek <[email protected]> | 2011-07-27 20:49:45 -0400 |
---|---|---|
committer | Frans Kaashoek <[email protected]> | 2011-07-27 20:49:45 -0400 |
commit | dccb915282854476ce47752df6631dcce3b8f661 (patch) | |
tree | a84aa8ed35618f99c3d7e8cdd466d22ae7bad597 /README | |
parent | 9acdfe0d04f3fcf95c6e392e08afb45bdfe16c20 (diff) | |
parent | 13a96baefc0ff5d8262c4bc8c797bee4b157443c (diff) | |
download | xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.tar.gz xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.tar.bz2 xv6-labs-dccb915282854476ce47752df6631dcce3b8f661.zip |
Merge commit 'origin/master' into page
Diffstat (limited to 'README')
-rw-r--r-- | README | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -19,6 +19,11 @@ The following people made contributions: Russ Cox (context switching, locking) Cliff Frey (MP) Xiao Yu (MP) + Nickolai Zeldovich + Austin Clements + +In addition, we are grateful for the patches contributed by Greg +Price, Yandong Mao, and Hitoshi Mitake. The code in the files that constitute xv6 is Copyright 2006-2007 Frans Kaashoek, Robert Morris, and Russ Cox. @@ -39,9 +44,7 @@ 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 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. +To run in QEMU, run "make qemu". -To create a typeset version of the code, run "make xv6.pdf". -This requires the "mpage" text formatting utility. -See http://www.mesa.nl/pub/mpage/. +To create a typeset version of the code, run "make xv6.pdf". This +requires the "mpage" utility. See http://www.mesa.nl/pub/mpage/. |