Resolve hisenbugs regarding GCC and -Os
This commit is contained in:
@ -17,6 +17,19 @@
|
||||
#include "proc/ps2kbproc/ps2kbproc.h"
|
||||
#include "rbuf/rbuf.h"
|
||||
|
||||
typedef struct BackTraceFrame {
|
||||
struct BackTraceFrame *rbp;
|
||||
uint64_t rip;
|
||||
} BackTraceFrame;
|
||||
|
||||
void backtrace(BackTraceFrame *bt) {
|
||||
kprintf("Backtrace:\n");
|
||||
for (size_t frame = 0; bt; frame++) {
|
||||
kprintf(" 0x%llx\n", bt->rip);
|
||||
bt = bt->rbp;
|
||||
}
|
||||
}
|
||||
|
||||
void hal_intr_disable(void) {
|
||||
asm volatile("cli");
|
||||
}
|
||||
@ -178,9 +191,7 @@ void hal_syscalldispatch(IntrStackFrame *frame) {
|
||||
}
|
||||
|
||||
void intr_eoi(uint8_t irq) {
|
||||
if (irq >= 8) {
|
||||
io_out8(PIC2_CMD, PIC_EOI);
|
||||
}
|
||||
io_out8(PIC2_CMD, PIC_EOI);
|
||||
io_out8(PIC1_CMD, PIC_EOI);
|
||||
}
|
||||
|
||||
@ -188,7 +199,8 @@ void intr_handleintr(IntrStackFrame *frame) {
|
||||
if (frame->trapnum <= 31) {
|
||||
kprintf("ERROR %s, 0x%lX\n", exceptions[frame->trapnum], frame->errnum);
|
||||
intr_dumpframe(frame);
|
||||
if ((frame->trapnum == 14 && frame->errnum & 0x4) || frame->trapnum == 0x6) {
|
||||
backtrace((BackTraceFrame *)frame->regs.rbp);
|
||||
if (frame->errnum & 0x4) {
|
||||
kprintf("killed pid %ld %s\n", PROCS.current->pid, PROCS.current->name);
|
||||
proc_killself();
|
||||
proc_sched((void *)frame);
|
||||
|
Reference in New Issue
Block a user