/* Interrupt stack frame. */
struct intr_frame
{
- /* Pushed by intr_entry in intr-stubs.S (see intr-stubs.pl).
+ /* Pushed by intr_entry in intr-stubs.S.
These are the interrupted task's saved registers. */
uint32_t edi; /* Saved EDI. */
uint32_t esi; /* Saved ESI. */
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). */
+ /* Pushed by intrNN_stub in intr-stubs.S. */
uint32_t vec_no; /* Interrupt vector number. */
/* Sometimes pushed by the CPU,
- otherwise for consistency pushed as 0 by intrXX_stub. */
+ otherwise for consistency pushed as 0 by intrNN_stub.
+ The CPU puts it just under `eip', but we move it here. */
uint32_t error_code; /* Error code. */
+ /* Pushed by intrNN_stub in intr-stubs.S.
+ This frame pointer eases interpretation of backtraces. */
+ void *frame_pointer; /* Saved EBP (frame pointer). */
+
/* Pushed by the CPU.
These are the interrupted task's saved registers. */
void (*eip) (void); /* Next instruction to execute. */
typedef void intr_handler_func (struct intr_frame *);
void intr_init (void);
-void intr_register (uint8_t vec, int dpl, enum intr_level, intr_handler_func *,
- const char *name);
+void intr_register_ext (uint8_t vec, intr_handler_func *, const char *name);
+void intr_register_int (uint8_t vec, int dpl, enum intr_level,
+ intr_handler_func *, const char *name);
bool intr_context (void);
void intr_yield_on_return (void);