Sun Nov 22 05:37:40 2009 UTC ()
Correct register renaming oversight.
This makes sbmips GENERIC run again.


(cyber)
diff -r1.26.36.1.2.12 -r1.26.36.1.2.13 src/sys/arch/mips/mips/mipsX_subr.S
cvs diff -r1.26.36.1.2.12 -r1.26.36.1.2.13 src/sys/arch/mips/mips/mipsX_subr.S (expand / switch to unified diff)

--- src/sys/arch/mips/mips/mipsX_subr.S 2009/11/14 21:49:34 1.26.36.1.2.12
+++ src/sys/arch/mips/mips/mipsX_subr.S 2009/11/22 05:37:39 1.26.36.1.2.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.12 2009/11/14 21:49:34 matt Exp $ */ 1/* $NetBSD: mipsX_subr.S,v 1.26.36.1.2.13 2009/11/22 05:37:39 cyber Exp $ */
2 2
3/* 3/*
4 * Copyright 2002 Wasabi Systems, Inc. 4 * Copyright 2002 Wasabi Systems, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Written by Simon Burge for Wasabi Systems, Inc. 7 * Written by Simon Burge for Wasabi Systems, Inc.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -2158,27 +2158,27 @@ LEAF_NOPROFILE(MIPSX(cpu_switch_resume)) @@ -2158,27 +2158,27 @@ LEAF_NOPROFILE(MIPSX(cpu_switch_resume))
2158entry0: 2158entry0:
2159 _MTC0 v0, MIPS_COP_0_TLB_HI # VPN = va 2159 _MTC0 v0, MIPS_COP_0_TLB_HI # VPN = va
2160 COP0_SYNC 2160 COP0_SYNC
2161 nop 2161 nop
2162 nop 2162 nop
2163 tlbp # probe VPN 2163 tlbp # probe VPN
2164 COP0_SYNC 2164 COP0_SYNC
2165 nop 2165 nop
2166 nop 2166 nop
2167 mfc0 t0, MIPS_COP_0_TLB_INDEX 2167 mfc0 t0, MIPS_COP_0_TLB_INDEX
2168 nop 2168 nop
2169 bltz t0, entry0set 2169 bltz t0, entry0set
2170 sll t0, t0, PGSHIFT + 1 # PAGE_SHIFT + 1 2170 sll t0, t0, PGSHIFT + 1 # PAGE_SHIFT + 1
2171 PTR_LA t0, MIPS_KSEG0_START(s0) 2171 PTR_LA t0, MIPS_KSEG0_START(t0)
2172 _MTC0 t0, MIPS_COP_0_TLB_HI 2172 _MTC0 t0, MIPS_COP_0_TLB_HI
2173 COP0_SYNC 2173 COP0_SYNC
2174 _MTC0 zero, MIPS_COP_0_TLB_LO0 2174 _MTC0 zero, MIPS_COP_0_TLB_LO0
2175 COP0_SYNC 2175 COP0_SYNC
2176 _MTC0 zero, MIPS_COP_0_TLB_LO1 2176 _MTC0 zero, MIPS_COP_0_TLB_LO1
2177 COP0_SYNC 2177 COP0_SYNC
2178 nop 2178 nop
2179 nop 2179 nop
2180 tlbwi 2180 tlbwi
2181 COP0_SYNC 2181 COP0_SYNC
2182 nop 2182 nop
2183 nop 2183 nop
2184 _MTC0 v0, MIPS_COP_0_TLB_HI # set VPN again 2184 _MTC0 v0, MIPS_COP_0_TLB_HI # set VPN again