projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wording fixes.
[pintos-anon]
/
src
/
threads
/
switch.h
diff --git
a/src/threads/switch.h
b/src/threads/switch.h
index 8a2974fcd999bafde09a9e46bfc274ad6dbde4dd..d79af5d7169614d2b7ba536d47208a5270b312b0 100644
(file)
--- a/
src/threads/switch.h
+++ b/
src/threads/switch.h
@@
-1,5
+1,5
@@
-#ifndef
HEADER
_SWITCH_H
-#define
HEADER_SWITCH_H 1
+#ifndef
THREADS
_SWITCH_H
+#define
THREADS_SWITCH_H
#ifndef __ASSEMBLER__
/* switch_thread()'s stack frame. */
#ifndef __ASSEMBLER__
/* switch_thread()'s stack frame. */
@@
-10,15
+10,16
@@
struct switch_threads_frame
uint32_t esi; /* 8: Saved %esi. */
uint32_t edi; /* 12: Saved %edi. */
void (*eip) (void); /* 16: Return address. */
uint32_t esi; /* 8: Saved %esi. */
uint32_t edi; /* 12: Saved %edi. */
void (*eip) (void); /* 16: Return address. */
- struct thread *cur; /* 20:
thread_switch
()'s CUR argument. */
- struct thread *next; /* 24:
thread_switch
()'s NEXT argument. */
+ struct thread *cur; /* 20:
switch_threads
()'s CUR argument. */
+ struct thread *next; /* 24:
switch_threads
()'s NEXT argument. */
};
/* Switches from CUR, which must be the running thread, to NEXT,
};
/* Switches from CUR, which must be the running thread, to NEXT,
- which must also be running
thread_switch
(), returning CUR in
+ which must also be running
switch_threads
(), returning CUR in
NEXT's context. */
struct thread *switch_threads (struct thread *cur, struct thread *next);
NEXT's context. */
struct thread *switch_threads (struct thread *cur, struct thread *next);
+/* Stack frame for switch_entry(). */
struct switch_entry_frame
{
void (*eip) (void);
struct switch_entry_frame
{
void (*eip) (void);
@@
-35,4
+36,4
@@
void switch_thunk (void);
#define SWITCH_CUR 20
#define SWITCH_NEXT 24
#define SWITCH_CUR 20
#define SWITCH_NEXT 24
-#endif /* switch.h */
+#endif /*
threads/
switch.h */