Integrate struct addrspace into struct thread.

diff --git a/src/threads/thread.c b/src/threads/thread.c
index 36f33daa3fc69cddb16be2341414bf9f2cdc8137..540041d4d0c57eb476ff0d9eecd3c950913866a3 100644 (file)
--- a/src/threads/thread.c
+++ b/src/threads/thread.c
@@ -126,7 +126,7 @@ thread_execute (const char *filename)
   if (t == NULL)
     return false;
   
-  if (!addrspace_load (&t->addrspace, filename, &start)) 
+  if (!addrspace_load (t, filename, &start)) 
     PANIC ("%s: program load failed", filename);
 
   /* Interrupt frame. */
@@ -336,6 +336,7 @@ destroy_thread (struct thread *t)
   ASSERT (t->status == THREAD_DYING);
   ASSERT (t != thread_current ());
 
+  addrspace_destroy (t);
   palloc_free (t);
 }
 
@@ -363,7 +364,7 @@ schedule_tail (struct thread *prev)
     destroy_thread (prev);
 
 #ifdef USERPROG
-  addrspace_activate (&cur->addrspace);
+  addrspace_activate (cur);
 #endif
 }
 

diff --git a/src/threads/thread.h b/src/threads/thread.h
index 5cfbadfbfb303bc2fbb69ecf6a72e85732803dbc..c4520580fcbca7b20bc1596eeb7bcc538db06d10 100644 (file)
--- a/src/threads/thread.h
+++ b/src/threads/thread.h
@@ -19,13 +19,18 @@ enum thread_status
 
 struct thread 
   {
+    /* These members are owned by the thread_*() functions. */
     enum thread_status status;          /* Thread state. */
     char name[16];                      /* Name (for debugging purposes). */
     uint8_t *stack;                     /* Saved stack pointer. */
     list_elem rq_elem;                  /* Run queue list element. */
+
 #ifdef USERPROG
-    struct addrspace addrspace;         /* Userland address space. */
+    /* These members are owned by the addrspace_*() functions. */
+    uint32_t *pagedir;                  /* Page directory. */
 #endif
+    
+    /* Marker to detect stack overflow. */
     unsigned magic;                     /* Always set to THREAD_MAGIC. */
   };
 

diff --git a/src/userprog/addrspace.c b/src/userprog/addrspace.c
index cc186665e5682fd2994181e7865598e14e3335e5..dc6cb727f262df24b82685affe0078d0525270bf 100644 (file)
--- a/src/userprog/addrspace.c
+++ b/src/userprog/addrspace.c
@@ -8,6 +8,7 @@
 #include "mmu.h"
 #include "paging.h"
 #include "palloc.h"
+#include "thread.h"
 
 /* We load ELF binaries.  The following definitions are taken
    from the ELF specification more-or-less verbatim. */
@@ -79,12 +80,12 @@ struct Elf32_Phdr
         } while (0)
 
 static bool
-install_page (struct addrspace *as, void *upage, void *kpage)
+install_page (struct thread *t, void *upage, void *kpage)
 {
   /* Verify that there's not already a page at that virtual
      address, then map our page there. */
-  if (pagedir_get_page (as->pagedir, upage) == NULL
-      && pagedir_set_page (as->pagedir, upage, kpage, true))
+  if (pagedir_get_page (t->pagedir, upage) == NULL
+      && pagedir_set_page (t->pagedir, upage, kpage, true))
     return true;
   else
     {
@@ -94,14 +95,14 @@ install_page (struct addrspace *as, void *upage, void *kpage)
 }
 
 static bool
-load_segment (struct addrspace *as, struct file *file,
+load_segment (struct thread *t, struct file *file,
               const struct Elf32_Phdr *phdr) 
 {
   void *start, *end;
   uint8_t *upage;
   off_t filesz_left;
 
-  ASSERT (as != NULL);
+  ASSERT (t != NULL);
   ASSERT (file != NULL);
   ASSERT (phdr != NULL);
   ASSERT (phdr->p_type == PT_LOAD);
@@ -147,7 +148,7 @@ load_segment (struct addrspace *as, struct file *file,
       memset (kpage + read_bytes, 0, zero_bytes);
       filesz_left -= read_bytes;
 
-      if (!install_page (as, upage, kpage))
+      if (!install_page (t, upage, kpage))
         return false;
     }
 
@@ -155,7 +156,7 @@ load_segment (struct addrspace *as, struct file *file,
 }
 
 static bool
-setup_stack (struct addrspace *as) 
+setup_stack (struct thread *t) 
 {
   uint8_t *kpage = palloc_get (PAL_ZERO);
   if (kpage == NULL)
@@ -164,11 +165,11 @@ setup_stack (struct addrspace *as)
       return false;
     }
 
-  return install_page (as, ((uint8_t *) PHYS_BASE) - PGSIZE, kpage);
+  return install_page (t, ((uint8_t *) PHYS_BASE) - PGSIZE, kpage);
 }
 
 bool
-addrspace_load (struct addrspace *as, const char *filename,
+addrspace_load (struct thread *t, const char *filename,
                 void (**start) (void)) 
 {
   struct Elf32_Ehdr ehdr;
@@ -178,8 +179,12 @@ addrspace_load (struct addrspace *as, const char *filename,
   bool success = false;
   int i;
 
-  as->pagedir = pagedir_create ();
+  /* Allocate page directory. */
+  t->pagedir = pagedir_create ();
+  if (t->pagedir == NULL)
+    LOAD_ERROR (("page directory allocation failed"));
 
+  /* Open executable file. */
   file_open = filesys_open (filename, &file);
   if (!file_open)
     LOAD_ERROR (("open failed"));
@@ -229,14 +234,14 @@ 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 (t, &file, &phdr))
             goto error;
           break;
         }
     }
 
   /* Set up stack. */
-  if (!setup_stack (as))
+  if (!setup_stack (t))
     goto error;
 
   /* Start address. */
@@ -248,23 +253,26 @@ addrspace_load (struct addrspace *as, const char *filename,
   if (file_open)
     file_close (&file);
   if (!success) 
-    addrspace_destroy (as);
+    addrspace_destroy (t);
   return success;
 }
 
 void
-addrspace_destroy (struct addrspace *as)
+addrspace_destroy (struct thread *t)
 {
-  if (as != NULL && as->pagedir != NULL) 
-    pagedir_destroy (as->pagedir); 
+  if (t->pagedir != NULL) 
+    {
+      pagedir_destroy (t->pagedir);
+      t->pagedir = NULL; 
+    }
 }
 
 void
-addrspace_activate (struct addrspace *as) 
+addrspace_activate (struct thread *t)
 {
-  ASSERT (as != NULL);
+  ASSERT (t != NULL);
   
-  if (as->pagedir != NULL)
-    pagedir_activate (as->pagedir);
-  tss->esp0 = (uint32_t) pg_round_down (as) + PGSIZE;
+  if (t->pagedir != NULL)
+    pagedir_activate (t->pagedir);
+  tss->esp0 = (uint32_t) t + PGSIZE;
 }

diff --git a/src/userprog/addrspace.h b/src/userprog/addrspace.h
index 46ff74517963af4ebb725ef4178600bbdc1ae366..cf68189eb890f7f29d8d2c02835d48cea1268024 100644 (file)
--- a/src/userprog/addrspace.h
+++ b/src/userprog/addrspace.h
@@ -1,17 +1,11 @@
 #ifndef HEADER_ADDRSPACE_H
 #define HEADER_ADDRSPACE_H 1
 
-#include <stdint.h>
-#include "hash.h"
+#include <stdbool.h>
 
-struct addrspace 
-  {
-    uint32_t *pagedir;
-  };
-
-bool addrspace_load (struct addrspace *, const char *, void (**start) (void));
-void addrspace_destroy (struct addrspace *);
-
-void addrspace_activate (struct addrspace *);
+struct thread;
+bool addrspace_load (struct thread *, const char *, void (**start) (void));
+void addrspace_destroy (struct thread *);
+void addrspace_activate (struct thread *);
 
 #endif /* addrspace.h */