projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make userspace actually work.
[pintos-anon]
/
src
/
threads
/
interrupt.h
diff --git
a/src/threads/interrupt.h
b/src/threads/interrupt.h
index 917fc7591bf4cb61bd2212f2d09cb012b26b49b8..5fa67b213062ede957930919958768ee4db8702c 100644
(file)
--- a/
src/threads/interrupt.h
+++ b/
src/threads/interrupt.h
@@
-37,15
+37,18
@@
struct intr_frame
void (*eip) (void);
uint16_t cs, :16;
uint32_t eflags;
void (*eip) (void);
uint16_t cs, :16;
uint32_t eflags;
-
uint32_t
esp;
+
void *
esp;
uint16_t ss, :16;
};
typedef void intr_handler_func (struct intr_frame *);
void intr_init (void);
uint16_t ss, :16;
};
typedef void intr_handler_func (struct intr_frame *);
void intr_init (void);
-void intr_register (uint8_t vec, int dpl, enum if_level, intr_handler_func *);
+void intr_register (uint8_t vec, int dpl, enum if_level, intr_handler_func *,
+ const char *name);
bool intr_context (void);
void intr_yield_on_return (void);
bool intr_context (void);
void intr_yield_on_return (void);
+const char *intr_name (int vec);
+
#endif /* interrupt.h */
#endif /* interrupt.h */