No FILESYS_STUB anymore.

[pintos-anon] / src / userprog / addrspace.c

diff --git a/src/userprog/addrspace.c b/src/userprog/addrspace.c
index eb0de496851a5a340270e8d1cdd38074d677d88e..454eef1fa286e8612e7a7bd2da9bab5839098c97 100644 (file)
--- a/src/userprog/addrspace.c
+++ b/src/userprog/addrspace.c
@@ -3,6 +3,7 @@
 #include "debug.h"
 #include "file.h"
 #include "filesys.h"
+#include "init.h"
 #include "lib.h"
 #include "mmu.h"
 #include "malloc.h"
@@ -172,19 +173,20 @@ addrspace_load (struct addrspace *as, const char *filename,
                 void (**start) (void)) 
 {
   struct Elf32_Ehdr ehdr;
-  struct file *file = NULL;
+  struct file file;
+  bool file_open = false;
   off_t file_ofs;
   bool success = false;
   int i;
 
   as->pagedir = pagedir_create ();
 
-  file = filesys_open (filename);
-  if (file == NULL)
+  file_open = filesys_open (filename, &file);
+  if (!file_open)
     LOAD_ERROR (("open failed"));
 
   /* Read and verify executable header. */
-  if (file_read (file, &ehdr, sizeof ehdr) != sizeof ehdr) 
+  if (file_read (&file, &ehdr, sizeof ehdr) != sizeof ehdr) 
     LOAD_ERROR (("error reading executable header"));
   if (memcmp (ehdr.e_ident, "\177ELF\1\1\1", 7) != 0)
     LOAD_ERROR (("file is not ELF"));
@@ -206,14 +208,9 @@ addrspace_load (struct addrspace *as, const char *filename,
     {
       struct Elf32_Phdr phdr;
 
-      file_seek (file, file_ofs);
-      if (file_read (file, &phdr, sizeof phdr) != sizeof phdr)
+      file_seek (&file, file_ofs);
+      if (file_read (&file, &phdr, sizeof phdr) != sizeof phdr)
         LOAD_ERROR (("error reading program header"));
-      printk ("%x: %08x, %08x %08x %08x %05x %05x\n",
-              file_tell (file),
-              phdr.p_type,
-              phdr.p_offset, phdr.p_vaddr, phdr.p_paddr,
-              phdr.p_filesz, phdr.p_memsz);
       file_ofs += sizeof phdr;
       switch (phdr.p_type) 
         {
@@ -233,7 +230,7 @@ addrspace_load (struct addrspace *as, const char *filename,
           printk ("unknown ELF segment type %08x\n", phdr.p_type);
           break;
         case PT_LOAD:
-          if (!load_segment (as, file, &phdr))
+          if (!load_segment (as, &file, &phdr))
             goto error;
           break;
         }
@@ -249,8 +246,8 @@ addrspace_load (struct addrspace *as, const char *filename,
   success = true;
 
  error:
-  if (file != NULL)
-    file_close (file);
+  if (file_open)
+    file_close (&file);
   if (!success) 
     addrspace_destroy (as);
   return success;
@@ -270,4 +267,5 @@ addrspace_activate (struct addrspace *as)
   
   if (as->pagedir != NULL)
     pagedir_activate (as->pagedir);
+  tss->esp0 = (uint32_t) pg_round_down (as) + PGSIZE;
 }