Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nuke ci_spillstk/CI_SPILLSTK. No longer needed.

Browse Source
This commit is contained in:
matt 2003-08-08 07:14:26 +00:00
parent a41eaef46a
commit 3d5b7190ad
5 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/arch/powerpc/include/asm.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: asm.h,v 1.14 2003/08/02 19:40:39 matt Exp $ */
/* $NetBSD: asm.h,v 1.15 2003/08/08 07:14:26 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -112,23 +112,21 @@
andc er,er,tmp1; /* page align */ \
lis tmp1,_C_LABEL(cpu_info)@ha; \
addi tmp1,tmp1,_C_LABEL(cpu_info)@l; \
mtsprg 0,tmp1; /* save for later use */ \
mtsprg0 tmp1; /* save for later use */ \
addi er,er,INTSTK; \
stw er,CI_INTSTK(tmp1); \
addi er,er,SPILLSTK; \
stw er,CI_SPILLSTK(tmp1); \
stw er,CI_IDLE_PCB(tmp1); \
stptr er,CI_INTSTK(tmp1); \
stptr er,CI_IDLE_PCB(tmp1); \
addi er,er,USPACE; /* space for idle_u */ \
li tmp2,-1; \
stw tmp2,CI_INTRDEPTH(tmp1); \
stint tmp2,CI_INTRDEPTH(tmp1); \
li tmp2,0; \
stw tmp2,-16(er); /* terminate idle stack chain */\
stptr tmp2,-CALLFRAMELEN(er); /* terminate idle stack chain */\
lis tmp1,_C_LABEL(proc0paddr)@ha; \
stw er,_C_LABEL(proc0paddr)@l(tmp1); \
stptr er,_C_LABEL(proc0paddr)@l(tmp1); \
addi er,er,USPACE; /* stackpointer for proc0 */ \
addi sp,er,-FRAMELEN; /* stackpointer for proc0 */ \
/* er = end of mem reserved for kernel */ \
stwu tmp2,-16(sp) /* end of stack chain */
stptru tmp2,-CALLFRAMELEN(sp) /* end of stack chain */
#endif

3
sys/arch/powerpc/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.33 2003/08/04 22:26:59 matt Exp $ */
/* $NetBSD: cpu.h,v 1.34 2003/08/08 07:14:26 matt Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@ -78,7 +78,6 @@ struct cpu_info {
int ci_ipending;
int ci_intrdepth;
char *ci_intstk;
char *ci_spillstk;
#define CPUSAVE_LEN 8
register_t ci_tempsave[CPUSAVE_LEN];
register_t ci_ddbsave[CPUSAVE_LEN];

3
sys/arch/powerpc/oea/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.2 2003/08/03 21:26:27 matt Exp $
# $NetBSD: genassym.cf,v 1.3 2003/08/08 07:14:27 matt Exp $
#
# Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -177,7 +177,6 @@ define CI_WANT_RESCHED offsetof(struct cpu_info, ci_want_resched)
define CI_CPL offsetof(struct cpu_info, ci_cpl)
define CI_INTRDEPTH offsetof(struct cpu_info, ci_intrdepth)
define CI_INTSTK offsetof(struct cpu_info, ci_intstk)
define CI_SPILLSTK offsetof(struct cpu_info, ci_spillstk)
define CI_TEMPSAVE offsetof(struct cpu_info, ci_tempsave)
define CI_DDBSAVE offsetof(struct cpu_info, ci_ddbsave)
define CI_IPKDBSAVE offsetof(struct cpu_info, ci_ipkdbsave)

5
sys/arch/powerpc/oea/oea_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: oea_machdep.c,v 1.9 2003/07/15 02:54:45 lukem Exp $ */
/* $NetBSD: oea_machdep.c,v 1.10 2003/08/08 07:14:27 matt Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.9 2003/07/15 02:54:45 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.10 2003/08/08 07:14:27 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@ -618,7 +618,6 @@ oea_startup(const char *model)
KASSERT(curcpu() != NULL);
KASSERT(lwp0.l_cpu != NULL);
KASSERT(curcpu()->ci_intstk != 0);
KASSERT(curcpu()->ci_spillstk != 0);
KASSERT(curcpu()->ci_intrdepth == -1);
/*

16
sys/arch/powerpc/powerpc/trap_subr.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap_subr.S,v 1.46 2003/08/08 06:11:48 matt Exp $ */
/* $NetBSD: trap_subr.S,v 1.47 2003/08/08 07:14:28 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -802,19 +802,6 @@ disitrap:
streg %r30,(CI_TEMPSAVE+CPUSAVE_DAR)(%r1)
streg %r31,(CI_TEMPSAVE+CPUSAVE_DSISR)(%r1)
mfsrr1 %r31
mtcr %r31
bt 17,u_trap /* branch if PSL_PR is true */
mfsprg1 %r1 /* restore [K]SP */
subf %r30,%r30,%r1 /* get the distance between the KSP
and the exception address */
cmplwi %r30,NBPG /* distance less than a page? */
bgt+ k_trap /* no, use existing kernel stack */
GET_CPUINFO(%r1) /* get cpu_info for this cpu */
ldptr %r1,CI_SPILLSTK(%r1) /* get top of spill stack */
b k_trap
.globl _C_LABEL(trapstart)
.type _C_LABEL(trapstart),@function
_C_LABEL(trapstart):
@ -826,7 +813,6 @@ realtrap:
overwritten) */
s_trap:
bf 17,k_trap /* branch if PSL_PR is false */
u_trap:
GET_CPUINFO(%r1) /* get cpu_info for this cpu */
ldptr %r1,CI_CURPCB(%r1)
addi %r1,%r1,USPACE /* stack is top of user struct */