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 7084bf14d96b559e78515a441382cf52e796bb75..99abf8e3a92ddecff94064dd7bbaf5f0086e774d 100644 (file)
--- a/src/threads/interrupt.h
+++ b/src/threads/interrupt.h
@@ -1,5 +1,5 @@
-#ifndef HEADER_INTERRUPT_H
-#define HEADER_INTERRUPT_H 1
+#ifndef THREADS_INTERRUPT_H
+#define THREADS_INTERRUPT_H
 
 #include <stdbool.h>
 #include <stdint.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. */
@@ -56,6 +58,7 @@ void intr_register (uint8_t vec, int dpl, enum intr_level, intr_handler_func *,
 bool intr_context (void);
 void intr_yield_on_return (void);
 
-const char *intr_name (int vec);
+void intr_dump_frame (const struct intr_frame *);
+const char *intr_name (uint8_t vec);
 
-#endif /* interrupt.h */
+#endif /* threads/interrupt.h */