diff options
| author | grehan <grehan@FreeBSD.org> | 2004-01-21 05:18:08 +0000 |
|---|---|---|
| committer | grehan <grehan@FreeBSD.org> | 2004-01-21 05:18:08 +0000 |
| commit | 5f3a308886f7431d9ed1010debb5ed4d1eb698d1 (patch) | |
| tree | a5b0e43f8ddd93cc44709f7e60a36150db7bd8c3 /sys/powerpc | |
| parent | ad056eebb840a8883b6460e1c3409b490a3d1654 (diff) | |
| download | FreeBSD-src-5f3a308886f7431d9ed1010debb5ed4d1eb698d1.zip FreeBSD-src-5f3a308886f7431d9ed1010debb5ed4d1eb698d1.tar.gz | |
- Catch up with panic __LINE__/__FILE__ changes by moving panic calls
out of asm.
- remove some long-dead code from machdep.c
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/aim/machdep.c | 18 | ||||
| -rw-r--r-- | sys/powerpc/aim/trap_subr.S | 2 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/machdep.c | 18 | ||||
| -rw-r--r-- | sys/powerpc/powerpc/trap_subr.S | 2 |
4 files changed, 16 insertions, 24 deletions
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c index 008889d..b8b68ab 100644 --- a/sys/powerpc/aim/machdep.c +++ b/sys/powerpc/aim/machdep.c @@ -149,6 +149,8 @@ void install_extint(void (*)(void)); int setfault(faultbuf); /* defined in locore.S */ +void asm_panic(char *); + long Maxmem = 0; struct pmap ofw_pmap; @@ -239,17 +241,6 @@ extern void *tlbdlmiss, *tlbdlmsize; extern void *tlbdsmiss, *tlbdsmsize; extern void *extint, *extsize; -#if 0 /* XXX: interrupt handler. We'll get to this later */ -extern void ext_intr(void); -#endif - -#ifdef DDB -extern ddblow, ddbsize; -#endif -#ifdef IPKDB -extern ipkdblow, ipkdbsize; -#endif - void powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp) { @@ -784,3 +775,8 @@ casuptr(intptr_t *p, intptr_t old, intptr_t new) return (-1); } +void +asm_panic(char *pstr) +{ + panic(pstr); +} diff --git a/sys/powerpc/aim/trap_subr.S b/sys/powerpc/aim/trap_subr.S index 624272f..f865667 100644 --- a/sys/powerpc/aim/trap_subr.S +++ b/sys/powerpc/aim/trap_subr.S @@ -594,7 +594,7 @@ CNAME(ipkdbsize) = .-CNAME(ipkdblow) bne cr4,2f; \ lis 3,cpassert@ha; /* if it is, panic */ \ addi 3,3,cpassert@l; \ - b panic; \ + b asm_panic; \ 2: lwz 3,PM_SR+0(2); \ mtsr 0,3; /* restore SR0 */ \ lwz 3,PM_SR+4(2); \ diff --git a/sys/powerpc/powerpc/machdep.c b/sys/powerpc/powerpc/machdep.c index 008889d..b8b68ab 100644 --- a/sys/powerpc/powerpc/machdep.c +++ b/sys/powerpc/powerpc/machdep.c @@ -149,6 +149,8 @@ void install_extint(void (*)(void)); int setfault(faultbuf); /* defined in locore.S */ +void asm_panic(char *); + long Maxmem = 0; struct pmap ofw_pmap; @@ -239,17 +241,6 @@ extern void *tlbdlmiss, *tlbdlmsize; extern void *tlbdsmiss, *tlbdsmsize; extern void *extint, *extsize; -#if 0 /* XXX: interrupt handler. We'll get to this later */ -extern void ext_intr(void); -#endif - -#ifdef DDB -extern ddblow, ddbsize; -#endif -#ifdef IPKDB -extern ipkdblow, ipkdbsize; -#endif - void powerpc_init(u_int startkernel, u_int endkernel, u_int basekernel, void *mdp) { @@ -784,3 +775,8 @@ casuptr(intptr_t *p, intptr_t old, intptr_t new) return (-1); } +void +asm_panic(char *pstr) +{ + panic(pstr); +} diff --git a/sys/powerpc/powerpc/trap_subr.S b/sys/powerpc/powerpc/trap_subr.S index 624272f..f865667 100644 --- a/sys/powerpc/powerpc/trap_subr.S +++ b/sys/powerpc/powerpc/trap_subr.S @@ -594,7 +594,7 @@ CNAME(ipkdbsize) = .-CNAME(ipkdblow) bne cr4,2f; \ lis 3,cpassert@ha; /* if it is, panic */ \ addi 3,3,cpassert@l; \ - b panic; \ + b asm_panic; \ 2: lwz 3,PM_SR+0(2); \ mtsr 0,3; /* restore SR0 */ \ lwz 3,PM_SR+4(2); \ |
