[src/trunk]: src/sys/arch/powerpc/ibm4xx Check PSL_PR instead of CI_IDEPTH in...

[kiyohara <kiyohara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c5707e73cceb
branches:  trunk
changeset: 772183:c5707e73cceb
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Thu Dec 22 11:33:54 2011 +0000

description:
Check PSL_PR instead of CI_IDEPTH in INTR_PROLOG.

diffstat:

 sys/arch/powerpc/ibm4xx/trap_subr.S |  12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diffs (34 lines):

diff -r 1eb2096ef84d -r c5707e73cceb sys/arch/powerpc/ibm4xx/trap_subr.S
--- a/sys/arch/powerpc/ibm4xx/trap_subr.S       Thu Dec 22 07:42:43 2011 +0000
+++ b/sys/arch/powerpc/ibm4xx/trap_subr.S       Thu Dec 22 11:33:54 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap_subr.S,v 1.21 2011/12/15 11:13:25 kiyohara Exp $  */
+/*     $NetBSD: trap_subr.S,v 1.22 2011/12/22 11:33:54 kiyohara Exp $  */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -164,11 +164,10 @@
        mflr    %r28;                   /* save LR */           \
        mfcr    %r29;                   /* save CR */           \
        mfxer   %r30;                   /* save XER */          \
-       lwz     %r31,CI_IDEPTH(%r1);    /* already running on intstk? */ \
-       addic.  %r31,%r31,1;                                    \
-       stw     %r31,CI_IDEPTH(%r1);                            \
+       mfsrr1  %r31;                                           \
+       mtcr    %r31;                                           \
        lwz     %r1,CI_INTSTK(%r1);     /* get intstk */        \
-       beq     1f;                                             \
+       bt      MSR_PR,1f;              /* branch if PSL_PR is true */ \
        mfsprg1 %r1;                    /* yes, get old SP */   \
 1:
 
@@ -487,9 +486,6 @@
        wrteei  0
        isync
        GET_CPUINFO(%r5)
-       lwz     %r4,CI_IDEPTH(%r5)
-       addi    %r4,%r4,-1              /* adjust reentrancy count */
-       stw     %r4,CI_IDEPTH(%r5)
 
        lwz     %r4,FRAME_SRR1(%r1)
 /* Returning to user mode? */