X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fuserprog%2Fprocess.c;h=8f5aa59d5c7ff57b70916407f3fc43b7f5edbbc5;hb=f487a2e31258aae56304b947950355ac2b074f2f;hp=a52646104e0d6e00be9a58493e93b7883fe1b41a;hpb=760b9888dad2d81f97439e879321502c7e28e733;p=pintos-anon diff --git a/src/userprog/process.c b/src/userprog/process.c index a526461..8f5aa59 100644 --- a/src/userprog/process.c +++ b/src/userprog/process.c @@ -14,9 +14,9 @@ #include "threads/flags.h" #include "threads/init.h" #include "threads/interrupt.h" -#include "threads/mmu.h" #include "threads/palloc.h" #include "threads/thread.h" +#include "threads/vaddr.h" static thread_func execute_thread NO_RETURN; static bool load (const char *cmdline, void (**eip) (void), void **esp); @@ -380,8 +380,7 @@ validate_segment (const struct Elf32_Phdr *phdr, struct file *file) or disk read error occurs. */ static bool load_segment (struct file *file, off_t ofs, uint8_t *upage, - uint32_t read_bytes, uint32_t zero_bytes, - bool writable) + uint32_t read_bytes, uint32_t zero_bytes, bool writable) { ASSERT ((read_bytes + zero_bytes) % PGSIZE == 0); ASSERT (pg_ofs (upage) == 0);