svn commit: r210007 - head/sys/mips/mips

[Warner Losh]

Author: imp
Date: Tue Jul 13 17:21:15 2010
New Revision: 210007
URL: http://svn.freebsd.org/changeset/base/210007

Log:
  Use the cpuregs.h spellings for these registers rather than the cpu.h
  spelling.

Modified:
  head/sys/mips/mips/locore.S

Modified: head/sys/mips/mips/locore.S
==============================================================================
--- head/sys/mips/mips/locore.S	Tue Jul 13 17:19:57 2010	(r210006)
+++ head/sys/mips/mips/locore.S	Tue Jul 13 17:21:15 2010	(r210007)
@@ -85,8 +85,8 @@ GLOBAL(fenvp)
 GLOBAL(btext)
 ASM_ENTRY(_start)
 VECTOR(_locore, unknown)
-	/* UNSAFE TO USE a0..a3, since some bootloaders pass that to us */
-	mtc0	zero, COP_0_CAUSE_REG	# Clear soft interrupts
+	/* UNSAFE TO USE a0..a3, need to preserve the args from boot loader */
+	mtc0	zero, MIPS_COP_0_CAUSE	# Clear soft interrupts
 	
 #if defined(TARGET_OCTEON)
 	/*
@@ -123,14 +123,14 @@ VECTOR(_locore, unknown)
 	 * preserved (namely, clearing interrupt bits), and set
 	 * bits we want to explicitly set.
 	 */
-	mfc0	t2, COP_0_STATUS_REG
+	mfc0	t2, MIPS_COP_0_STATUS
 	and	t2, t0
 	or	t2, t1
-	mtc0	t2, COP_0_STATUS_REG
+	mtc0	t2, MIPS_COP_0_STATUS
 	COP0_SYNC
 
 	/* Make sure KSEG0 is cached */
-	li	t0, CFG_K0_CACHED
+	li	t0, MIPS_CCA_CNC
 	mtc0	t0, MIPS_COP_0_CONFIG
 	COP0_SYNC