[src/trunk]: src/sys/arch/powerpc/powerpc Rework ddblow so that if PSL_PR == ...

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

details:   https://anonhg.NetBSD.org/src/rev/8bb095649ebd
branches:  trunk
changeset: 553901:8bb095649ebd
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Oct 22 17:27:58 2003 +0000

description:
Rework ddblow so that if PSL_PR == 1, it dispatches directly to the
trap handler and bypasses the ddbtrap code.

diffstat:

 sys/arch/powerpc/powerpc/trap_subr.S |  20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r c597437df9f5 -r 8bb095649ebd sys/arch/powerpc/powerpc/trap_subr.S
--- a/sys/arch/powerpc/powerpc/trap_subr.S      Wed Oct 22 17:24:43 2003 +0000
+++ b/sys/arch/powerpc/powerpc/trap_subr.S      Wed Oct 22 17:27:58 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap_subr.S,v 1.50 2003/10/09 07:12:24 matt Exp $      */
+/*     $NetBSD: trap_subr.S,v 1.51 2003/10/22 17:27:58 matt Exp $      */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -555,13 +555,26 @@
        .globl  _C_LABEL(ddblow),_C_LABEL(ddbsize)
 _C_LABEL(ddblow):
        mtsprg1 %r1                     /* save SP */
+       mtsprg2 %r29                    /* save r29 */
+       mfcr    %r29                    /* save CR in r29 */
+       mfsrr1  %r1
+       mtcr    %r1
        GET_CPUINFO(%r1)
+       bf      17,1f                   /* branch if privileged */
+       streg   %r28,(CI_TEMPSAVE+CPUSAVE_R28)(%r1)     /* free r28 */
+       mfsprg2 %r28
+       streg   %r28,(CI_TEMPSAVE+CPUSAVE_R29)(%r1)     /* free r29 */
+       streg   %r30,(CI_TEMPSAVE+CPUSAVE_R30)(%r1)     /* free r30 */
+       streg   %r31,(CI_TEMPSAVE+CPUSAVE_R31)(%r1)     /* free r31 */
+       mflr    %r28                    /* save LR */
+       bla     u_trap
+1:
        streg   %r28,(CI_DDBSAVE+CPUSAVE_R28)(%r1) /* save r28 */
-       streg   %r29,(CI_DDBSAVE+CPUSAVE_R29)(%r1) /* save r29 */
+       mfsprg2 %r28
+       streg   %r28,(CI_DDBSAVE+CPUSAVE_R29)(%r1) /* save r29 */
        streg   %r30,(CI_DDBSAVE+CPUSAVE_R30)(%r1) /* save r30 */
        streg   %r31,(CI_DDBSAVE+CPUSAVE_R31)(%r1) /* save r31 */
        mflr    %r28                    /* save LR */
-       mfcr    %r29                    /* save CR */
        lis     %r1,ddbstk+INTSTK@ha    /* get new SP */
        addi    %r1,%r1,ddbstk+INTSTK@l
        bla     ddbtrap
@@ -846,6 +859,7 @@
 s_trap:
        bf      17,k_trap               /* branch if PSL_PR is false */
        GET_CPUINFO(%r1)                /* get cpu_info for this cpu */
+u_trap:
        ldptr   %r1,CI_CURPCB(%r1)
        addi    %r1,%r1,USPACE          /* stack is top of user struct */