projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make thread_root() enable interrupts, otherwise kernel threads will
[pintos-anon]
/
src
/
threads
/
interrupt.h
diff --git
a/src/threads/interrupt.h
b/src/threads/interrupt.h
index 2a2b3ef0818409fb7e10c62b50fe3f1affc4a140..5fa67b213062ede957930919958768ee4db8702c 100644
(file)
--- a/
src/threads/interrupt.h
+++ b/
src/threads/interrupt.h
@@
-15,7
+15,7
@@
enum if_level intr_set_level (enum if_level);
enum if_level intr_enable (void);
enum if_level intr_disable (void);
\f
enum if_level intr_enable (void);
enum if_level intr_disable (void);
\f
-struct intr_
args
+struct intr_
frame
{
/* Pushed by the stubs. */
uint32_t edi;
{
/* Pushed by the stubs. */
uint32_t edi;
@@
-37,15
+37,18
@@
struct intr_args
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;
};
uint16_t ss, :16;
};
-typedef void intr_handler_func (struct intr_
args
*);
+typedef void intr_handler_func (struct intr_
frame
*);
void intr_init (void);
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 */