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 e7cd6359cb076987f1426e288cbb6723c5eae5ef..99abf8e3a92ddecff94064dd7bbaf5f0086e774d 100644 (file)
--- a/src/threads/interrupt.h
+++ b/src/threads/interrupt.h
@@ -1,9 +1,10 @@
-#ifndef HEADER_INTERRUPT_H
-#define HEADER_INTERRUPT_H 1
+#ifndef THREADS_INTERRUPT_H
+#define THREADS_INTERRUPT_H
 
 #include <stdbool.h>
 #include <stdint.h>
 
+/* Interrupts on or off? */
 enum intr_level 
   {
     INTR_OFF,             /* Interrupts disabled. */
@@ -15,30 +16,38 @@ enum intr_level intr_set_level (enum intr_level);
 enum intr_level intr_enable (void);
 enum intr_level intr_disable (void);
 \f
+/* Interrupt stack frame. */
 struct intr_frame
   {
-    /* Pushed by the stubs. */
-    uint32_t edi;
-    uint32_t esi;
-    uint32_t ebp;
-    uint32_t esp_dummy;
-    uint32_t ebx;
-    uint32_t edx;
-    uint32_t ecx;
-    uint32_t eax;
-    uint16_t es, :16;
-    uint16_t ds, :16;
-    uint32_t vec_no;
-
-    /* Sometimes pushed by the CPU, otherwise by the stubs. */
-    uint32_t error_code;
-
-    /* Pushed by the CPU. */
-    void (*eip) (void);
-    uint16_t cs, :16;
-    uint32_t eflags;
-    void *esp;
-    uint16_t ss, :16;
+    /* Pushed by intr_entry in intr-stubs.S (see intr-stubs.pl).
+       These are the interrupted task's saved registers. */
+    uint32_t edi;               /* Saved EDI. */
+    uint32_t esi;               /* Saved ESI. */
+    uint32_t ebp;               /* Saved EBP. */
+    uint32_t esp_dummy;         /* Not used. */
+    uint32_t ebx;               /* Saved EBX. */
+    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. */
+
+    /* Pushed by intrXX_stub in intr-stubs.S (see intr-stubs.pl). */
+    uint32_t vec_no;            /* Interrupt vector number. */
+
+    /* Sometimes pushed by the CPU,
+       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);         /* 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 ss, :16;           /* Data segment for esp. */
   };
 
 typedef void intr_handler_func (struct intr_frame *);
@@ -49,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 */