Merge branch 'master' of github.com:klange/osdev

This commit is contained in:
Kevin Lange 2012-01-23 19:09:27 -06:00
commit c2af881b89
2 changed files with 3 additions and 0 deletions

1
.gitignore vendored
View File

@ -12,6 +12,7 @@ hdd/bin/*
.gdb_history
bootdisk.img
util/toaru-toolchain/*
util/toaru-toolchain
*.log
*.pdf
*.aux

View File

@ -139,6 +139,7 @@ void fault_handler(struct regs *r) {
if (r->int_no >= 32 && r->int_no != SYSCALL_VECTOR) {
STOP;
}
IRQ_OFF;
void (*handler)(struct regs *r);
handler = isrs_routines[r->int_no];
if (handler) {
@ -148,4 +149,5 @@ void fault_handler(struct regs *r) {
kprintf("Unhandled exception: [%d] %s\n", r->int_no, exception_messages[r->int_no]);
HALT_AND_CATCH_FIRE("Process caused an unhandled exception", r);
}
IRQ_RES;
}