Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/xscale Adjust egister usage so that r4 and r5 a...



details:   https://anonhg.NetBSD.org/src/rev/91c7259c0995
branches:  trunk
changeset: 946246:91c7259c0995
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Nov 21 19:55:49 2020 +0000

description:
Adjust egister usage so that r4 and r5 are preserved as cur{cpu,lwp}
respectively as required by the change to make ASTs operate per-LWP
rather than per-CPU.  DO_AST_AND_RESTORE_ALIGNMENT_FAULTS expects this.

XXX untested

diffstat:

 sys/arch/arm/xscale/i80200_irq.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 69a088bbe919 -r 91c7259c0995 sys/arch/arm/xscale/i80200_irq.S
--- a/sys/arch/arm/xscale/i80200_irq.S  Sat Nov 21 19:52:56 2020 +0000
+++ b/sys/arch/arm/xscale/i80200_irq.S  Sat Nov 21 19:55:49 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i80200_irq.S,v 1.18 2018/07/12 10:46:42 maxv Exp $     */
+/*     $NetBSD: i80200_irq.S,v 1.19 2020/11/21 19:55:49 skrll Exp $    */
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -63,7 +63,7 @@
        sub     lr, lr, #0x00000004     /* Adjust the lr */
 
        PUSHFRAMEINSVC                  /* Push an interrupt frame */
-       ENABLE_ALIGNMENT_FAULTS
+       ENABLE_ALIGNMENT_FAULTS         /* puts cur{cpu,lwp} in r4/r5 */
 
        /*
         * Note that we have entered the IRQ handler.  We are
@@ -78,7 +78,7 @@
        /*
         * Get the interrupt status into a callee-save register.
         */
-       mrc     p13, 0, r5, c4, c0, 0
+       mrc     p13, 0, r6, c4, c0, 0
 
        /*
         * XXX - any need to handle BMU interrupts?
@@ -91,7 +91,7 @@
         * interrupts disabled, and will return with interrupts
         * disabled.
         */
-       tst     r5, #(INTSRC_II)
+       tst     r6, #(INTSRC_II)
        beq     .Lextirq_return         /* no external IRQ pending */
        ldr     r1, .Lintr_dispatch
        mov     r0, sp



Home | Main Index | Thread Index | Old Index