From: Ben Pfaff Date: Sun, 8 Jan 2006 03:32:26 +0000 (+0000) Subject: Fix for updated comments. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a56a1bda60ec314c6e62af22fa95e94c0d5379b5;p=pintos-anon Fix for updated comments. --- diff --git a/solutions/p3.patch b/solutions/p3.patch index b285d50..69e7d4b 100644 --- a/solutions/p3.patch +++ b/solutions/p3.patch @@ -633,7 +633,7 @@ diff -u src/userprog/process.c~ src/userprog/process.c ASSERT (file != NULL); ASSERT (phdr != NULL); -@@ -360,69 +471,129 @@ load_segment (struct file *file, const s +@@ -360,73 +471,129 @@ load_segment (struct file *file, const s return false; } @@ -728,8 +728,12 @@ diff -u src/userprog/process.c~ src/userprog/process.c } -/* Adds a mapping from user virtual address UPAGE to kernel -- virtual address KPAGE to the page table. Fails if UPAGE is -- already mapped or if memory allocation fails. */ +- virtual address KPAGE to the page table. +- UPAGE must not already be mapped. +- KPAGE should probably be a page obtained from the user pool +- with palloc_get_page(). +- Returns true on success, false if UPAGE is already mapped or +- if memory allocation fails. */ +/* Sets up command line arguments in KPAGE, which will be mapped + to UPAGE in user space. The command line arguments are taken + from CMD_LINE, separated by spaces. Sets *ESP to the initial