Rewrite page allocator to support multi-page allocations.

[pintos-anon] / doc / vm.texi

diff --git a/doc/vm.texi b/doc/vm.texi
index 85605cc2294f2e1a30eb76e957aefc271fdd933c..fa511cdf99c540153afa215bad7a5779fc89c37b 100644 (file)
--- a/doc/vm.texi
+++ b/doc/vm.texi
@@ -25,6 +25,9 @@ All the test programs from the previous project should also work with
 this project.  You should also write programs to test the new features
 introduced in this project.
 
 this project.  You should also write programs to test the new features
 introduced in this project.
 

+Your submission should define @code{THREAD_JOIN_IMPLEMENTED} in
+@file{constants.h} (@pxref{Conditional Compilation}).
+

 @menu
 * VM Design::                   
 * Page Faults::                 
 @menu
 * VM Design::                   
 * Page Faults::                 


@@ -370,11 +373,11 @@ first page fault.
 @item
 If neither @code{read_bytes} nor @code{zero_bytes} equals
 @code{PGSIZE}, then part of the page is to be read from disk and the
 @item
 If neither @code{read_bytes} nor @code{zero_bytes} equals
 @code{PGSIZE}, then part of the page is to be read from disk and the

-remainder zeroed.  This is a special case, which you should handle by
+remainder zeroed.  This is a special case.  You may handle it by

 reading the partial page from disk at executable load time and zeroing
 reading the partial page from disk at executable load time and zeroing

-the rest of the page.  It is the only case in which loading should not
-be ``lazy''; even real OSes such as Linux do not load partial pages
-lazily.
+the rest of the page.  This is the only case in which we will allow
+you to load a page in a non-``lazy'' fashion.  Many real OSes such as
+Linux do not load partial pages lazily.

 @end itemize
 
 Incidentally, if you have trouble handling the third case above, you
 @end itemize
 
 Incidentally, if you have trouble handling the third case above, you


@@ -484,12 +487,7 @@ that we need it to do. What gives?}
 
 You are welcome to modify it.  It is not used by any of the code we
 provided, so modifying it won't affect any code but yours.  Do
 
 You are welcome to modify it.  It is not used by any of the code we
 provided, so modifying it won't affect any code but yours.  Do

-whatever it takes to make it work like you want it to.
-
-@item
-@b{Is the data segment page-aligned?}
-
-No.
+whatever it takes to make it work the way you want.

 
 @item
 @b{What controls the layout of user programs?}
 
 @item
 @b{What controls the layout of user programs?}