[src/trunk]: src/sys/arch/sh3/sh3 Use __INTR_MASK_EXCEPTION_UNBLOCK combo.

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

details:   https://anonhg.NetBSD.org/src/rev/839b4e6ecb5b
branches:  trunk
changeset: 761648:839b4e6ecb5b
user:      uwe <uwe%NetBSD.org@localhost>
date:      Fri Feb 04 04:14:25 2011 +0000

description:
Use __INTR_MASK_EXCEPTION_UNBLOCK combo.

diffstat:

 sys/arch/sh3/sh3/exception_vector.S |  19 +++++++------------
 1 files changed, 7 insertions(+), 12 deletions(-)

diffs (75 lines):

diff -r 3463928ef091 -r 839b4e6ecb5b sys/arch/sh3/sh3/exception_vector.S
--- a/sys/arch/sh3/sh3/exception_vector.S       Fri Feb 04 04:13:52 2011 +0000
+++ b/sys/arch/sh3/sh3/exception_vector.S       Fri Feb 04 04:14:25 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exception_vector.S,v 1.48 2011/02/04 03:23:33 uwe Exp $        */
+/*     $NetBSD: exception_vector.S,v 1.49 2011/02/04 04:14:25 uwe Exp $        */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
 #define _ALIGN_TEXT    .align 5
 #include <sh3/asm.h>
 
-__KERNEL_RCSID(0, "$NetBSD: exception_vector.S,v 1.48 2011/02/04 03:23:33 uwe Exp $")
+__KERNEL_RCSID(0, "$NetBSD: exception_vector.S,v 1.49 2011/02/04 04:14:25 uwe Exp $")
 
 
 /*
@@ -73,7 +73,6 @@
  */
 NENTRY(sh_vector_generic)
        __EXCEPTION_ENTRY
-       __INTR_MASK(r0, r1)
        /* Identify exception cause */
        MOV     (EXPEVT, r0)
        mov.l   @r0, r0
@@ -90,7 +89,7 @@
        bt      1f
 
        /* tlb_exception(curlwp, tf, TEA); */
-       __EXCEPTION_UNBLOCK(r0, r1)
+       __INTR_MASK_EXCEPTION_UNBLOCK(r0, r1, r3)
        mov.l   .Lg_tlb_exception, r0
        jsr     @r0
         mov    r14, r5                 /* 2nd arg */
@@ -105,7 +104,7 @@
        mov.l   r2, @(TF_UBC, r14)      /* clear tf->tf_ubc */
        mov.w   r2, @r1                 /* disable UBC channel A */
 #endif
-       __EXCEPTION_UNBLOCK(r0, r1)
+       __INTR_MASK_EXCEPTION_UNBLOCK(r0, r1, r3)
        mov.l   .Lg_general_exception, r0
        jsr     @r0
         mov    r14, r5                 /* 2nd arg */
@@ -270,8 +269,7 @@
        mov.l   @r2, r2                 ! *SH3_EXPEVT
        mov.l   @r0, r6                 ! arg3: va = *SH3_TEA
        mov.l   @r1, r4                 ! arg1: curlwp
-       __INTR_MASK(r0, r1)
-       __EXCEPTION_UNBLOCK(r0, r1)
+       __INTR_MASK_EXCEPTION_UNBLOCK(r0, r1, r3)
        mov.l   .L3_tlb_exception, r0
        mov.l   r2, @(TF_EXPEVT, r14)   ! tf->tf_expevt = EXPEVT
        jsr     @r0
@@ -421,8 +419,7 @@
        mov.l   @(0x24, r0), r2         ! *SH4_EXPEVT
        mov.l   @(0x0c, r0), r6         ! arg3: va = *SH4_TEA
        mov.l   @r1, r4                 ! arg1: curlwp
-       __INTR_MASK(r0, r1)
-       __EXCEPTION_UNBLOCK(r0, r1)
+       __INTR_MASK_EXCEPTION_UNBLOCK(r0, r1, r3)
        mov.l   .L4_tlb_exception, r0
        mov.l   r2, @(TF_EXPEVT, r14)   ! tf->tf_expevt = EXPEVT
        jsr     @r0
@@ -462,9 +459,7 @@
        stc     ssr, r4
        stc     spc, r5
        stc     r0_bank, r6             ! ssp
-
-       __INTR_MASK(r0, r1)
-       __EXCEPTION_UNBLOCK(r0, r1)     ! enable exceptions for P3 access
+       __INTR_MASK_EXCEPTION_UNBLOCK(r0, r1, r3)
 
        mov.l   .Li_ci_idepth, r8       ! callee-saved
        mov.l   .Li_intc_intr, r0