-#ifndef HEADER_SWITCH_H
-#define HEADER_SWITCH_H 1
+#ifndef THREADS_SWITCH_H
+#define THREADS_SWITCH_H
#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. */
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);
#define SWITCH_CUR 20
#define SWITCH_NEXT 24
-#endif /* switch.h */
+#endif /* threads/switch.h */