[src/trunk]: src/sys/arch/arm26/arm26 Use the correct condition code when dec...

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

details:   https://anonhg.NetBSD.org/src/rev/3cf317c77c01
branches:  trunk
changeset: 509309:3cf317c77c01
user:      bjh21 <bjh21%NetBSD.org@localhost>
date:      Tue May 01 11:01:12 2001 +0000

description:
Use the correct condition code when deciding whether to take an AST (oops!).
Also disable interrupts correctly in the APCS-32 case.

diffstat:

 sys/arch/arm26/arm26/locore.S |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 208dc90ba06b -r 3cf317c77c01 sys/arch/arm26/arm26/locore.S
--- a/sys/arch/arm26/arm26/locore.S     Tue May 01 08:56:31 2001 +0000
+++ b/sys/arch/arm26/arm26/locore.S     Tue May 01 11:01:12 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.14 2001/04/30 19:57:10 bjh21 Exp $ */
+/* $NetBSD: locore.S,v 1.15 2001/05/01 11:01:12 bjh21 Exp $ */
 /*
  * Copyright (c) 1998, 1999, 2000 Ben Harris
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -195,11 +195,14 @@
        ldr     lr, [sp, #TF_R15]       /* Pull return address and PSR */
        tst     lr, #R15_MODE           /* Was trap in USR mode? */
        bne     3f                      /* If not, return */
+#ifndef __APCS_26__
+       teqp    r15, #(R15_IRQ_DISABLE | R15_MODE_SVC)
+#endif
        ldr     r4, Lastpending
 1:
        ldr     r1, [r4]
        cmp     r1, #0                  /* AST pending? */
-       bne     2f                      /* If not, return */
+       beq     2f                      /* If not, return */
        mov     r0, sp                  /* Reuse old trapframe */
        bl      _C_LABEL(ast_handler)   /* Handle AST */
        b       1b                      /* Try again */
@@ -458,4 +461,4 @@
        .global _C_LABEL(eintrcnt)
 _C_LABEL(eintrcnt):
 
-RCSID("$NetBSD: locore.S,v 1.14 2001/04/30 19:57:10 bjh21 Exp $")
+RCSID("$NetBSD: locore.S,v 1.15 2001/05/01 11:01:12 bjh21 Exp $")