projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment.
[pintos-anon]
/
doc
/
intro.texi
diff --git
a/doc/intro.texi
b/doc/intro.texi
index 5a0da3940710577e6df2b73577a129e3489f04e5..d95842ee274f1e84d75aabe65226dc0c906258d4 100644
(file)
--- a/
doc/intro.texi
+++ b/
doc/intro.texi
@@
-1,4
+1,4
@@
-@node Introduction
, Pintos Tour, Top, Top
+@node Introduction
@chapter Introduction
Welcome to Pintos. Pintos is a simple operating system framework for
@chapter Introduction
Welcome to Pintos. Pintos is a simple operating system framework for
@@
-248,8
+248,8
@@
must precede the commands passed to the Pintos kernel and be separated
from them by @option{--}, so that the whole command looks like
@code{pintos @var{option}@dots{} -- @var{argument}@dots{}}. Invoke
@code{pintos} without any arguments to see a list of available options.
from them by @option{--}, so that the whole command looks like
@code{pintos @var{option}@dots{} -- @var{argument}@dots{}}. Invoke
@code{pintos} without any arguments to see a list of available options.
-Options can select a simulator to use: the default is Bochs, but
on the
-
Linux machines
@option{--qemu} selects qemu. You can run the simulator
+Options can select a simulator to use: the default is Bochs, but
+@option{--qemu} selects qemu. You can run the simulator
with a debugger (@pxref{GDB}). You can set the amount of memory to give
the VM. Finally, you can select how you want VM output to be displayed:
use @option{-v} to turn off the VGA display, @option{-t} to use your
with a debugger (@pxref{GDB}). You can set the amount of memory to give
the VM. Finally, you can select how you want VM output to be displayed:
use @option{-v} to turn off the VGA display, @option{-t} to use your
@@
-307,7
+307,7
@@
timings, in which a one-second delay should take approximately one
second of real time. Simulation in real-time mode is not reproducible,
and options @option{-j} and @option{-r} are mutually exclusive.
second of real time. Simulation in real-time mode is not reproducible,
and options @option{-j} and @option{-r} are mutually exclusive.
-
On the Linux machines only, t
he qemu simulator is available as an
+
T
he qemu simulator is available as an
alternative to Bochs (use @option{--qemu} when invoking
@command{pintos}). The qemu simulator is much faster than Bochs, but it
only supports real-time simulation and does not have a reproducible
alternative to Bochs (use @option{--qemu} when invoking
@command{pintos}). The qemu simulator is much faster than Bochs, but it
only supports real-time simulation and does not have a reproducible
@@
-531,20
+531,18
@@
work.
The original structure and form of Pintos was inspired by the Nachos
instructional operating system from the University of California,
The original structure and form of Pintos was inspired by the Nachos
instructional operating system from the University of California,
-Berkeley. A few of the source files were originally more-or-less
-literal translations of the Nachos C++ code into C. These files bear
-the original UCB license notice.
+Berkeley.
A few of the Pintos source files are derived from code used in the
Massachusetts Institute of Technology's 6.828 advanced operating systems
course. These files bear the original MIT license notice.
The Pintos projects and documentation originated with those designed for
A few of the Pintos source files are derived from code used in the
Massachusetts Institute of Technology's 6.828 advanced operating systems
course. These files bear the original MIT license notice.
The Pintos projects and documentation originated with those designed for
-Nachos by current and former CS140 teaching assistants at Stanford
+Nachos by current and former CS
140 teaching assistants at Stanford
University, including at least Yu Ping, Greg Hutchins, Kelly Shaw, Paul
Twohey, Sameer Qureshi, and John Rector.
University, including at least Yu Ping, Greg Hutchins, Kelly Shaw, Paul
Twohey, Sameer Qureshi, and John Rector.
-Example code for
condition variables (@pxref{Condition Variable
s}) is
+Example code for
monitors (@pxref{Monitor
s}) is
from classroom slides originally by Dawson Engler and updated by Mendel
Rosenblum.
from classroom slides originally by Dawson Engler and updated by Mendel
Rosenblum.