projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Irq 7 is special. It is not just the parallel port. It can also be a
[pintos-anon]
/
src
/
threads
/
interrupt.c
diff --git
a/src/threads/interrupt.c
b/src/threads/interrupt.c
index 29aea870ba547e4e67a5534c36c2f498e82c03e6..72b37837dcf420f98110b4e1ab23c838b3704a29 100644
(file)
--- a/
src/threads/interrupt.c
+++ b/
src/threads/interrupt.c
@@
-6,8
+6,8
@@
#include "threads/flags.h"
#include "threads/intr-stubs.h"
#include "threads/io.h"
#include "threads/flags.h"
#include "threads/intr-stubs.h"
#include "threads/io.h"
-#include "threads/mmu.h"
#include "threads/thread.h"
#include "threads/thread.h"
+#include "threads/vaddr.h"
#include "devices/timer.h"
/* Number of x86 interrupts. */
#include "devices/timer.h"
/* Number of x86 interrupts. */
@@
-355,16
+355,23
@@
intr_handler (struct intr_frame *frame)
yield_on_return = false;
}
yield_on_return = false;
}
- /* Invoke the interrupt's handler.
- If there is no handler, invoke the unexpected interrupt
- handler. */
+ /* Invoke the interrupt's handler. */
handler = intr_handlers[frame->vec_no];
handler = intr_handlers[frame->vec_no];
- if (handler == NULL)
+ if (handler != NULL)
+ handler (frame);
+ else if (frame->vec_no == 0x27 || frame->vec_no == 0x2f)
{
{
+ /* There is no handler, but this interrupt can trigger
+ spuriously due to a hardware fault or hardware race
+ condition. Ignore it. */
+ }
+ else
+ {
+ /* No handler and not spurious. Invoke the unexpected
+ interrupt handler. */
intr_dump_frame (frame);
intr_dump_frame (frame);
- PANIC ("Unexpected interrupt");
+ PANIC ("Unexpected interrupt");
}
}
- handler (frame);
/* Complete the processing of an external interrupt. */
if (external)
/* Complete the processing of an external interrupt. */
if (external)