Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/shark/isa Don't use r7, use r5 instead



details:   https://anonhg.NetBSD.org/src/rev/f0e9c0f20a67
branches:  trunk
changeset: 781393:f0e9c0f20a67
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Sep 03 16:35:33 2012 +0000

description:
Don't use r7, use r5 instead

diffstat:

 sys/arch/shark/isa/isa_irq.S |  16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diffs (67 lines):

diff -r d0c2ee14d7ae -r f0e9c0f20a67 sys/arch/shark/isa/isa_irq.S
--- a/sys/arch/shark/isa/isa_irq.S      Mon Sep 03 16:07:17 2012 +0000
+++ b/sys/arch/shark/isa/isa_irq.S      Mon Sep 03 16:35:33 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: isa_irq.S,v 1.13 2010/12/20 00:25:43 matt Exp $        */
+/*     $NetBSD: isa_irq.S,v 1.14 2012/09/03 16:35:33 matt Exp $        */
 
 /*
  * Copyright 1997
@@ -113,8 +113,8 @@
 /*
  * Register usage
  *
+ *  r5  - Pointer to handler pointer list
  *  r6  - Address of current handler
- *  r7  - Pointer to handler pointer list
  *  r8  - Current IRQ requests.
  *  r9  - Used to count through possible IRQ bits.
  *  r10 - Base address of IOMD
@@ -183,17 +183,17 @@
         */
 
        mov     r9, #(NIPL - 1)
-       ldr     r7, .Lspl_masks
+       ldr     r5, .Lspl_masks
 
 .Lfind_highest_ipl:
-       ldr     r2, [r7, r9, lsl #2]
+       ldr     r2, [r5, r9, lsl #2]
        tst     r8, r2
        subeq   r9, r9, #1
        beq     .Lfind_highest_ipl
 
        /* r9 = SPL level of highest priority interrupt */
        add     r9, r9, #1
-       ldr     r2, [r7, r9, lsl #2]
+       ldr     r2, [r5, r9, lsl #2]
        mvn     r2, r2
        orr     r0, r0, r2
 
@@ -210,7 +210,7 @@
        bic     r0, r0, #I32_bit
        msr     cpsr_all, r0
 
-       ldr     r7, .Lirqhandlers
+       ldr     r5, .Lirqhandlers
        mov     r9, #0x00000001
 
 irqloop:
@@ -218,7 +218,7 @@
        tst     r8, r9                  /* Is a bit set ? */
        beq     nextirq                 /* No ? try next bit */
 
-       ldr     r6, [r7]                /* Get address of first handler structure */
+       ldr     r6, [r5]                /* Get address of first handler structure */
 
        teq     r6, #0x00000000         /* Do we have a handler */
        moveq   r0, r8                  /* IRQ requests as arg 0 */
@@ -255,7 +255,7 @@
        stmia   r3, {r1-r2}             /* store ev_count */
 
 nextirq:
-       add     r7, r7, #0x00000004     /* update pointer to handlers */
+       add     r5, r5, #0x00000004     /* update pointer to handlers */
        mov     r9, r9, lsl #1          /* move on to next bit */
        teq     r9, #(1 << 16)          /* done the last bit ? */
        bne     irqloop                 /* no - loop back. */



Home | Main Index | Thread Index | Old Index