X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finterrupt.h;h=99abf8e3a92ddecff94064dd7bbaf5f0086e774d;hb=f2e18d716109879cefc489049a0d8bef072bdd40;hp=5060b9d90bf7d2764b2e1d4e00e785212bca3f7e;hpb=6916b246f3be8c72d6e77fd98c4a1447fd2c1de7;p=pintos-anon diff --git a/src/threads/interrupt.h b/src/threads/interrupt.h index 5060b9d..99abf8e 100644 --- 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. */ + 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. */ @@ -36,12 +38,12 @@ struct intr_frame uint32_t vec_no; /* Interrupt vector number. */ /* Sometimes pushed by the CPU, - otherwise by intrXX_stub for consistency. */ + otherwise for consistency pushed as 0 by intrXX_stub. */ uint32_t error_code; /* Error code. */ /* 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. */