X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finterrupt.h;h=d54b7ef0893ff4caff7af5883d47b7c123fcd0d8;hb=e6e58461d3040e76e501a9dc9d4b38c5c825dc9c;hp=7084bf14d96b559e78515a441382cf52e796bb75;hpb=1ef354f070fc0389e697be0d2d2553f5a87934ae;p=pintos-anon diff --git a/src/threads/interrupt.h b/src/threads/interrupt.h index 7084bf1..d54b7ef 100644 --- 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 #include @@ -36,12 +36,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 +56,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 */