diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-11-17 23:30:09 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2020-11-17 23:30:09 +0100 |
| commit | 972f95aa637ed70a65e0e90d2e589b58a81d8a59 (patch) | |
| tree | 95950c9adcc3e910ba9f3954e9b668a6ab114e4d /sys/src/9/pc/trap.c | |
| parent | 8cb33f2f18d8383fd78368110b3a78c7732da6f9 (diff) | |
pc, pc64: load idt early in trapinit0()
loading the interrupt vector table early allows
us to handle traps during bootup before mmuinit()
which gives better diagnostics for debugging.
we also can handle general protection fault on
rdmsr() and wrmsr() which helps during
cpuidentify() and archinit() when probing for
cpu features.
Diffstat (limited to 'sys/src/9/pc/trap.c')
| -rw-r--r-- | sys/src/9/pc/trap.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/src/9/pc/trap.c b/sys/src/9/pc/trap.c index fadb64f42..faaf90101 100644 --- a/sys/src/9/pc/trap.c +++ b/sys/src/9/pc/trap.c @@ -9,8 +9,6 @@ #include "../port/error.h" #include <trace.h> -static int trapinited; - void noted(Ureg*, ulong); static void debugexc(Ureg*, void*); @@ -197,13 +195,13 @@ trapinit0(void) int d1, v; ulong vaddr; Segdesc *idt; + ushort ptr[3]; idt = (Segdesc*)IDTADDR; vaddr = (ulong)vectortable; for(v = 0; v < 256; v++){ d1 = (vaddr & 0xFFFF0000)|SEGP; switch(v){ - case VectorBPT: d1 |= SEGPL(3)|SEGIG; break; @@ -220,6 +218,10 @@ trapinit0(void) idt[v].d1 = d1; vaddr += 6; } + ptr[0] = sizeof(Segdesc)*256-1; + ptr[1] = IDTADDR & 0xFFFF; + ptr[2] = IDTADDR >> 16; + lidt(ptr); } void @@ -237,7 +239,6 @@ trapinit(void) nmienable(); addarchfile("irqalloc", 0444, irqallocread, nil); - trapinited = 1; } static char* excname[32] = { @@ -328,13 +329,6 @@ trap(Ureg* ureg) Vctl *ctl, *v; Mach *mach; - if(!trapinited){ - /* fault386 can give a better error message */ - if(ureg->trap == VectorPF) - fault386(ureg, nil); - panic("trap %lud: not ready", ureg->trap); - } - m->perf.intrts = perfticks(); user = userureg(ureg); if(user){ @@ -482,6 +476,10 @@ trap(Ureg* ureg) return; } } + + /* early fault before trapinit() */ + if(vno == VectorPF) + fault386(ureg, 0); } dumpregs(ureg); |