Rename xmalloc() as malloc_or_panic(),

[pintos-anon] / doc / tour.texi

diff --git a/doc/tour.texi b/doc/tour.texi
index 39483a32011d6f64c0a43ac13277105d10436f0b..6882a93514a5724bc770cfa769b56b36e4197f38 100644 (file)
--- a/doc/tour.texi
+++ b/doc/tour.texi
@@ -176,9 +176,9 @@ Interrupt-driven serial port I/O is also possible now, so we use
 @func{serial_init_queue} to switch to that mode.  Finally,
 @func{timer_calibrate} calibrates the timer for accurate short delays.
 
-If the filesystem is compiled in, as it will be in project 2 and
+If the file system is compiled in, as it will be in project 2 and
 later, we now initialize the disks with @func{disk_init}, then the
-filesystem with @func{filesys_init}, and run any operations that were
+file system with @func{filesys_init}, and run any operations that were
 requested on the kernel command line with @func{fsutil_run}.
 
 Boot is complete, so we print a message.
@@ -782,11 +782,7 @@ In Pintos, @func{intr_init} in @file{threads/interrupt.c} sets up the
 IDT so that each entry points to a unique entry point in
 @file{threads/intr-stubs.S} named @func{intr@var{NN}_stub}, where
 @var{NN} is the interrupt number in
-hexadecimal.@footnote{@file{threads/intr-stubs.S} is so repetitive
-that it is actually generated by a Perl script,
-@file{threads/intr-stubs.pl}.  Thus, you will actually find
-@file{threads/intr-stubs.S} in your @file{threads/build/threads}
-directory, not in plain @file{threads}.}  Because the CPU doesn't give
+hexadecimal.  Because the CPU doesn't give
 us any other way to find out the interrupt number, this entry point
 pushes the interrupt number on the stack.  Then it jumps to
 @func{intr_entry}, which pushes all the registers that the processor