d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Catch up with panic __LINE__/__FILE__ changes by moving panic calls

Browse Source 
out of asm.
- remove some long-dead code from machdep.c
This commit is contained in:
Peter Grehan 2004-01-21 05:18:08 +00:00
parent 462ded3729
commit e976ea5a89
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/powerpc/aim/machdep.c
View File

@ -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);
}

2
sys/powerpc/aim/trap_subr.S
View File

@ -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); \

18
sys/powerpc/powerpc/machdep.c
View File

@ -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);
}

2
sys/powerpc/powerpc/trap_subr.S
View File

@ -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); \