Make userspace actually work.

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

diff --git a/src/threads/switch.h b/src/threads/switch.h
index c9ae4ab8b108bbd2b9165058f36b13dfd0319d6a..8a2974fcd999bafde09a9e46bfc274ad6dbde4dd 100644 (file)
--- a/src/threads/switch.h
+++ b/src/threads/switch.h
@@ -3,7 +3,7 @@
 
 #ifndef __ASSEMBLER__
 /* switch_thread()'s stack frame. */
-struct switch_frame 
+struct switch_threads_frame 
   {
     uint32_t ebx;               /*  0: Saved %ebx. */
     uint32_t ebp;               /*  4: Saved %ebp. */
@@ -19,11 +19,13 @@ struct switch_frame
    NEXT's context. */
 struct thread *switch_threads (struct thread *cur, struct thread *next);
 
-struct switch_thunk_frame 
+struct switch_entry_frame
   {
     void (*eip) (void);
   };
 
+void switch_entry (void);
+
 /* Pops the CUR and NEXT arguments off the stack, for use in
    initializing threads. */
 void switch_thunk (void);