[src/trunk]: src/sys/arch/mips/mips In TLBRead, restore PID before doing the ...

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

details:   https://anonhg.NetBSD.org/src/rev/9810f5f18262
branches:  trunk
changeset: 758565:9810f5f18262
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Nov 08 18:09:38 2010 +0000

description:
In TLBRead, restore PID before doing the saves so that the caller's
TLB entries are used instead of the PID given as the argument.

from Alessandro Forin

diffstat:

 sys/arch/mips/mips/locore_mips1.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r 28cdefd6340c -r 9810f5f18262 sys/arch/mips/mips/locore_mips1.S
--- a/sys/arch/mips/mips/locore_mips1.S Mon Nov 08 15:25:50 2010 +0000
+++ b/sys/arch/mips/mips/locore_mips1.S Mon Nov 08 18:09:38 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore_mips1.S,v 1.67 2009/12/14 00:46:06 matt Exp $   */
+/*     $NetBSD: locore_mips1.S,v 1.68 2010/11/08 18:09:38 pooka Exp $  */
 
 /*
  * Copyright (c) 1992, 1993
@@ -925,12 +925,12 @@
        tlbr                                    # Read from the TLB
        mfc0    t2, MIPS_COP_0_TLB_HI           # fetch the hi entry
        mfc0    t3, MIPS_COP_0_TLB_LOW          # fetch the low entry
-       sw      t2, 0(a1)
-       sw      t3, 4(a1)
 
        mtc0    t0, MIPS_COP_0_TLB_HI           # restore PID
+       mtc0    v1, MIPS_COP_0_STATUS           # Restore the status register
+       sw      t2, 0(a1)
        j       ra
-       mtc0    v1, MIPS_COP_0_STATUS           # Restore the status register
+       sw      t3, 4(a1)
 END(mips1_TLBRead)
 
 /*----------------------------------------------------------------------------