[src/nathanw_sa]: src/sys/arch Rearrange slightly and pass p, not l, to ras_l...

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

details:   https://anonhg.NetBSD.org/src/rev/4d712891da93
branches:  nathanw_sa
changeset: 506235:4d712891da93
user:      nathanw <nathanw%NetBSD.org@localhost>
date:      Tue Sep 17 23:50:18 2002 +0000

description:
Rearrange slightly and pass p, not l, to ras_lookup().

diffstat:

 sys/arch/arm/arm32/cpuswitch.S   |  8 ++++----
 sys/arch/m68k/m68k/switch_subr.s |  8 ++++----
 sys/arch/mips/mips/locore.S      |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diffs (81 lines):

diff -r 33b5273e9082 -r 4d712891da93 sys/arch/arm/arm32/cpuswitch.S
--- a/sys/arch/arm/arm32/cpuswitch.S    Tue Sep 17 23:45:46 2002 +0000
+++ b/sys/arch/arm/arm32/cpuswitch.S    Tue Sep 17 23:50:18 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpuswitch.S,v 1.3.2.22 2002/09/17 21:13:20 nathanw Exp $       */
+/*     $NetBSD: cpuswitch.S,v 1.3.2.23 2002/09/17 23:50:18 nathanw Exp $       */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -659,8 +659,8 @@
         * Check for restartable atomic sequences (RAS).
         */
 
-       ldr     r2, [r6, #(L_PROC)]
-       ldr     r2, [r2, #(P_NRAS)]
+       ldr     r5, [r6, #(L_PROC)]
+       ldr     r2, [r5, #(P_NRAS)]
        ldr     r4, [r7, #(PCB_TF)]     /* r4 = trapframe (used below) */
        teq     r2, #0                  /* p->p_nras == 0? */
        bne     .Lswitch_do_ras         /* no, check for one */
@@ -682,7 +682,7 @@
 
 .Lswitch_do_ras:
        ldr     r1, [r4, #(TF_PC)]      /* second ras_lookup() arg */
-       mov     r0, r6                  /* first ras_lookup() arg */
+       mov     r0, r5                  /* first ras_lookup() arg */
        bl      _C_LABEL(ras_lookup)
        cmn     r0, #1                  /* -1 means "not in a RAS" */
        strne   r0, [r4, #(TF_PC)]
diff -r 33b5273e9082 -r 4d712891da93 sys/arch/m68k/m68k/switch_subr.s
--- a/sys/arch/m68k/m68k/switch_subr.s  Tue Sep 17 23:45:46 2002 +0000
+++ b/sys/arch/m68k/m68k/switch_subr.s  Tue Sep 17 23:50:18 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: switch_subr.s,v 1.1.2.7 2002/09/17 21:15:20 nathanw Exp $      */
+/*     $NetBSD: switch_subr.s,v 1.1.2.8 2002/09/18 00:02:03 nathanw Exp $      */
 
 /*
  * Copyright (c) 2001 The NetBSD Foundation.
@@ -354,12 +354,12 @@
         *  Check for restartable atomic sequences (RAS)
         */
        movl    _C_LABEL(curlwp),%a0
-       movl    %a0@(L_PROC),%a0
-       tstl    %a0@(P_NRAS)
+       movl    %a0@(L_PROC),%a2
+       tstl    %a2@(P_NRAS)
        jeq     1f
        movl    %a0@(L_MD_REGS),%a1
        movl    %a1@(TF_PC),%sp@-
-       movl    %a0,%sp@-
+       movl    %a2,%sp@-
        jbsr    _C_LABEL(ras_lookup)
        addql   #8,%sp
        movql   #-1,%d0
diff -r 33b5273e9082 -r 4d712891da93 sys/arch/mips/mips/locore.S
--- a/sys/arch/mips/mips/locore.S       Tue Sep 17 23:45:46 2002 +0000
+++ b/sys/arch/mips/mips/locore.S       Tue Sep 17 23:50:18 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.126.2.15 2002/09/17 21:15:45 nathanw Exp $        */
+/*     $NetBSD: locore.S,v 1.126.2.16 2002/09/17 23:56:16 nathanw Exp $        */
 
 /*
  * Copyright (c) 1992, 1993
@@ -506,14 +506,14 @@
        /*
         * Check for restartable atomic sequences (RAS)
         */
-       lw      v1, L_PROC(s7)  
+       lw      t1, L_PROC(s7)  
        lw      a0, L_ADDR(s7)
-       lw      v1, P_NRAS(v1)
+       lw      v1, P_NRAS(t1)
 
        addu    t0, a0, USPACE - FRAME_SIZ
        beq     v1, zero, 1f
        nop
-       move    a0, s7
+       move    a0, t1
        jal     _C_LABEL(ras_lookup)
        lw      a1, FRAME_EPC(t0)
        lw      a0, L_ADDR(s7)