projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply appropriate changes from main branch to bring win0405-branch up
[pintos-anon]
/
src
/
threads
/
interrupt.h
diff --git
a/src/threads/interrupt.h
b/src/threads/interrupt.h
index adb7fa99b4a424e116914551c4edb0f3d2d30d20..99abf8e3a92ddecff94064dd7bbaf5f0086e774d 100644
(file)
--- a/
src/threads/interrupt.h
+++ b/
src/threads/interrupt.h
@@
-29,6
+29,8
@@
struct intr_frame
uint32_t edx; /* Saved EDX. */
uint32_t ecx; /* Saved ECX. */
uint32_t eax; /* Saved EAX. */
uint32_t edx; /* Saved EDX. */
uint32_t ecx; /* Saved ECX. */
uint32_t eax; /* Saved EAX. */
+ uint16_t gs, :16; /* Saved GS segment register. */
+ uint16_t fs, :16; /* Saved FS segment register. */
uint16_t es, :16; /* Saved ES segment register. */
uint16_t ds, :16; /* Saved DS segment register. */
uint16_t es, :16; /* Saved ES segment register. */
uint16_t ds, :16; /* Saved DS segment register. */
@@
-41,7
+43,7
@@
struct intr_frame
/* Pushed by the CPU.
These are the interrupted task's saved registers. */
/* Pushed by the CPU.
These are the interrupted task's saved registers. */
- void (*eip) (void); /*
Current or next instruction
. */
+ void (*eip) (void); /*
Next instruction to execute
. */
uint16_t cs, :16; /* Code segment for eip. */
uint32_t eflags; /* Saved CPU flags. */
void *esp; /* Saved stack pointer. */
uint16_t cs, :16; /* Code segment for eip. */
uint32_t eflags; /* Saved CPU flags. */
void *esp; /* Saved stack pointer. */