ilo-pona/xv6-65oo2
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

use panic

Browse source
This commit is contained in:
Frans Kaashoek 2017-02-01 19:21:43 -05:00
parent 7c00ce8110
commit 2e2d14c235
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
console.c
View file

@ -111,7 +111,8 @@ panic(char *s)
cli(); cli();
cons.locking = 0; cons.locking = 0;
cprintf("cpu %d: panic: ", cpuid()); // use lapiccpunum so that we can call panic from mycpu()
cprintf("cpu %d: panic: ", lapiccpunum());
cprintf(s); cprintf(s);
cprintf("\n"); cprintf("\n");
getcallerpcs(&s, pcs); getcallerpcs(&s, pcs);

8
proc.c
View file

@ -36,12 +36,8 @@ cpuid() {
struct cpu* struct cpu*
mycpu(void) mycpu(void)
{ {
if(readeflags()&FL_IF){ if(readeflags()&FL_IF)
// Would prefer to panic but panic calls mycpu(). panic("mycpu called with interrupts enabled\n");
cprintf("mycpu called from %x with interrupts enabled\n",
__builtin_return_address(0));
}
return &cpus[lapiccpunum()]; return &cpus[lapiccpunum()];
} }