greg/xv6
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tell SETGATE to leave interrupts on for T_SYSCALL

Browse source 
panic if unknown fault with CPL=0 (i.e. in kernel)
This commit is contained in:
rtm 2007-09-25 15:23:44 +00:00
parent d7a90d3b5c
commit 3eda2714e6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trap.c
View file

@ -20,7 +20,7 @@ tvinit(void)
for(i = 0; i < 256; i++) for(i = 0; i < 256; i++)
SETGATE(idt[i], 0, SEG_KCODE<<3, vectors[i], 0); SETGATE(idt[i], 0, SEG_KCODE<<3, vectors[i], 0);
SETGATE(idt[T_SYSCALL], 0, SEG_KCODE<<3, vectors[T_SYSCALL], DPL_USER); SETGATE(idt[T_SYSCALL], 1, SEG_KCODE<<3, vectors[T_SYSCALL], DPL_USER);
initlock(&tickslock, "time"); initlock(&tickslock, "time");
} }
@ -72,7 +72,7 @@ trap(struct trapframe *tf)
break; break;
default: default:
if(cp == 0){ if(cp == 0 || (tf->cs & 3) == 0){
// Otherwise it's our mistake. // Otherwise it's our mistake.
cprintf("unexpected trap %d from cpu %d eip %x\n", cprintf("unexpected trap %d from cpu %d eip %x\n",
tf->trapno, cpu(), tf->eip); tf->trapno, cpu(), tf->eip);