[src/trunk]: src/sys/arch/arm Use cpsr_c rather then cpsr_all where appropriate.

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

details:   https://anonhg.NetBSD.org/src/rev/6c8ab1e678cb
branches:  trunk
changeset: 535325:6c8ab1e678cb
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Aug 14 23:33:11 2002 +0000

description:
Use cpsr_c rather then cpsr_all where appropriate.

diffstat:

 sys/arch/arm/include/arm32/frame.h |  8 ++++----
 sys/arch/arm/ixp12x0/ixp12x0_irq.S |  8 ++++----
 sys/arch/arm/xscale/i80200_irq.S   |  8 ++++----
 sys/arch/arm/xscale/i80321_irq.S   |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diffs (105 lines):

diff -r 04a9c95f83cb -r 6c8ab1e678cb sys/arch/arm/include/arm32/frame.h
--- a/sys/arch/arm/include/arm32/frame.h        Wed Aug 14 23:30:21 2002 +0000
+++ b/sys/arch/arm/include/arm32/frame.h        Wed Aug 14 23:33:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: frame.h,v 1.2 2001/08/31 04:44:58 simonb Exp $ */
+/*     $NetBSD: frame.h,v 1.3 2002/08/14 23:33:11 thorpej Exp $        */
 
 /*
  * Copyright (c) 1994-1997 Mark Brinicombe.
@@ -160,11 +160,11 @@
        stmdb   sp, {r0-r3};            /* Save 4 registers */             \
        mov     r0, lr;                 /* Save xxx32 r14 */               \
        mov     r1, sp;                 /* Save xxx32 sp */                \
-       mrs     r3, spsr_all;           /* Save xxx32 spsr */              \
-       mrs     r2, cpsr_all;           /* Get the CPSR */                 \
+       mrs     r3, spsr;               /* Save xxx32 spsr */              \
+       mrs     r2, cpsr;               /* Get the CPSR */                 \
        bic     r2, r2, #(PSR_MODE);    /* Fix for SVC mode */             \
        orr     r2, r2, #(PSR_SVC32_MODE);                                 \
-       msr     cpsr_all, r2;           /* Punch into SVC mode */          \
+       msr     cpsr_c, r2;             /* Punch into SVC mode */          \
        mov     r2, sp;                 /* Save SVC sp */                  \
        str     r0, [sp, #-4]!;         /* Push return address */          \
        str     lr, [sp, #-4]!;         /* Push SVC lr */                  \
diff -r 04a9c95f83cb -r 6c8ab1e678cb sys/arch/arm/ixp12x0/ixp12x0_irq.S
--- a/sys/arch/arm/ixp12x0/ixp12x0_irq.S        Wed Aug 14 23:30:21 2002 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_irq.S        Wed Aug 14 23:33:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ixp12x0_irq.S,v 1.1 2002/07/15 16:27:17 ichiro Exp $   */
+/*     $NetBSD: ixp12x0_irq.S,v 1.2 2002/08/14 23:33:12 thorpej Exp $  */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -111,14 +111,14 @@
        mov     r1, #0x00000000
        str     r1, [r0]                /* Clear astpending */
 
-       mrs     r4, cpsr_all            /* save CPSR */
+       mrs     r4, cpsr                /* save CPSR */
        bic     r0, r4, #(I32_bit)      /* Enable IRQs */
-       msr     cpsr_all, r0
+       msr     cpsr_c, r0
 
        mov     r0, sp
        bl      _C_LABEL(ast)           /* ast(frame) */
 
-       msr     cpsr_all, r4            /* Disable IRQs */
+       msr     cpsr_c, r4              /* Disable IRQs */
        b       Lastloop                /* Check for more ASTs */
 
 Lirqout:
diff -r 04a9c95f83cb -r 6c8ab1e678cb sys/arch/arm/xscale/i80200_irq.S
--- a/sys/arch/arm/xscale/i80200_irq.S  Wed Aug 14 23:30:21 2002 +0000
+++ b/sys/arch/arm/xscale/i80200_irq.S  Wed Aug 14 23:33:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i80200_irq.S,v 1.4 2002/08/07 05:15:01 briggs Exp $    */
+/*     $NetBSD: i80200_irq.S,v 1.5 2002/08/14 23:33:12 thorpej Exp $   */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -150,14 +150,14 @@
        mov     r1, #0x00000000
        str     r1, [r0]                /* Clear astpending */
 
-       mrs     r4, cpsr_all            /* save CPSR */
+       mrs     r4, cpsr                /* save CPSR */
        bic     r0, r4, #(I32_bit)      /* Enable IRQs */
-       msr     cpsr_all, r0
+       msr     cpsr_c, r0
 
        mov     r0, sp
        bl      _C_LABEL(ast)           /* ast(frame) */
 
-       msr     cpsr_all, r4            /* Disable IRQs */
+       msr     cpsr_c, r4              /* Disable IRQs */
        b       Lastloop                /* Check for more ASTs */
 
 Lirqout:
diff -r 04a9c95f83cb -r 6c8ab1e678cb sys/arch/arm/xscale/i80321_irq.S
--- a/sys/arch/arm/xscale/i80321_irq.S  Wed Aug 14 23:30:21 2002 +0000
+++ b/sys/arch/arm/xscale/i80321_irq.S  Wed Aug 14 23:33:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i80321_irq.S,v 1.2 2002/07/29 22:00:01 thorpej Exp $   */
+/*     $NetBSD: i80321_irq.S,v 1.3 2002/08/14 23:33:12 thorpej Exp $   */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -111,14 +111,14 @@
        mov     r1, #0x00000000
        str     r1, [r0]                /* Clear astpending */
 
-       mrs     r4, cpsr_all            /* save CPSR */
+       mrs     r4, cpsr                /* save CPSR */
        bic     r0, r4, #(I32_bit)      /* Enable IRQs */
-       msr     cpsr_all, r0
+       msr     cpsr_c, r0
 
        mov     r0, sp
        bl      _C_LABEL(ast)           /* ast(frame) */
 
-       msr     cpsr_all, r4            /* Disable IRQs */
+       msr     cpsr_c, r4              /* Disable IRQs */
        b       Lastloop                /* Check for more ASTs */
 
 Lirqout: