Make processes responsible for loading themselves.

[pintos-anon] / src / threads / thread.h

diff --git a/src/threads/thread.h b/src/threads/thread.h
index 0480293dc51d19c31daae2bde619c503a0d45b16..26e785fc8d429514c627fb9a8a3922a27f0faaf3 100644 (file)
--- a/src/threads/thread.h
+++ b/src/threads/thread.h
@@ -5,10 +5,6 @@
 #include <list.h>
 #include <stdint.h>
 
-#ifdef USERPROG
-#include "userprog/addrspace.h"
-#endif
-
 /* States in a thread's life cycle. */
 enum thread_status
   {
@@ -86,7 +82,7 @@ typedef int tid_t;
    blocked state is on a semaphore wait list. */
 struct thread
   {
-    /* These members are owned by thread.c. */
+    /* Owned by thread.c. */
     tid_t tid;                          /* Thread identifier. */
     enum thread_status status;          /* Thread state. */
     char name[16];                      /* Name (for debugging purposes). */
@@ -97,12 +93,12 @@ struct thread
     list_elem elem;                     /* List element. */
 
 #ifdef USERPROG
-    /* These members are owned by userprog/addrspace.c. */
+    /* Owned by userprog/addrspace.c. */
     uint32_t *pagedir;                  /* Page directory. */
 #endif
 
-    /* Marker to detect stack overflow. */
-    unsigned magic;                     /* Always set to THREAD_MAGIC. */
+    /* Owned by thread.c */
+    unsigned magic;                     /* Detects stack overflow. */
   };
 
 void thread_init (void);
@@ -110,9 +106,6 @@ void thread_start (void);
 
 typedef void thread_func (void *aux);
 tid_t thread_create (const char *name, int priority, thread_func *, void *);
-#ifdef USERPROG
-tid_t thread_execute (const char *filename);
-#endif
 
 void thread_unblock (struct thread *);