Updated to use Bochs 2.6.11

[pintos-anon] / doc / userprog.texi

diff --git a/doc/userprog.texi b/doc/userprog.texi
index a1321950fd3f877328f801853839be7c9cf69741..67af709bacc78df837ea7fc8a59eab4528728c49 100644 (file)
--- a/doc/userprog.texi
+++ b/doc/userprog.texi
@@ -261,7 +261,7 @@ processor's floating-point unit when switching threads.
 
 The @file{src/examples} directory contains a few sample user
 programs.  The @file{Makefile} in this directory
 
 The @file{src/examples} directory contains a few sample user
 programs.  The @file{Makefile} in this directory

-compiles the provided examples, and you can edit it
+compiles the provided examples, and you can edit it to

 compile your own programs as well.  Some of the example programs will
 only work once projects 3 or 4 have been implemented.
 
 compile your own programs as well.  Some of the example programs will
 only work once projects 3 or 4 have been implemented.
 


@@ -371,7 +371,7 @@ data segment can be adjusted with a system call, but you will not have
 to implement this.
 
 The code segment in Pintos starts at user virtual address
 to implement this.
 
 The code segment in Pintos starts at user virtual address

-@t{0x08084000}, approximately 128 MB from the bottom of the address
+@t{0x08048000}, approximately 128 MB from the bottom of the address

 space.  This value is specified in @bibref{SysV-i386} and has no deep
 significance.
 
 space.  This value is specified in @bibref{SysV-i386} and has no deep
 significance.
 


@@ -600,8 +600,8 @@ programs only.)  System call numbers for each system call are defined in
 @file{lib/syscall-nr.h}:
 
 @deftypefn {System Call} void halt (void)
 @file{lib/syscall-nr.h}:
 
 @deftypefn {System Call} void halt (void)

-Terminates Pintos by calling @func{power_off} (declared in
-@file{threads/init.h}).  This should be seldom used, because you lose
+Terminates Pintos by calling @func{shutdown_power_off} (declared in
+@file{devices/shutdown.h}).  This should be seldom used, because you lose

 some information about possible deadlock situations, etc.
 @end deftypefn
 
 some information about possible deadlock situations, etc.
 @end deftypefn