PERFORCE change 211406 for review

Robert Watson rwatson at FreeBSD.org
Sun May 20 03:24:43 UTC 2012


http://p4web.freebsd.org/@@211406?ac=10

Change 211406 by rwatson at rwatson_svr_ctsrd_mipsbuild on 2012/05/20 03:24:00

	Add new CHERI_MDROOT and CHERI_SDROOT kernel configuration files,
	derived from similar BERI configurations.  Add a new CPU_CHERI
	CPU definition to supplement the current BERI definitely; the one
	special-casing of BERI in the kernel also applies to CHERI, so
	extend it.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/conf/options.mips#3 edit
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/CHERI_MDROOT#1 add
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/CHERI_SDROOT#1 add
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/machdep.c#2 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/conf/options.mips#3 (text+ko) ====

@@ -38,6 +38,7 @@
 CPU_RMI		opt_global.h
 CPU_NLM		opt_global.h
 CPU_BERI	opt_global.h
+CPU_CHERI	opt_global.h
 
 # XXX These are bogus and should be replaced by proper ABI or ISA checks.
 ISA_MIPS1	opt_cputype.h

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/machdep.c#2 (text+ko) ====

@@ -351,7 +351,7 @@
 	 * XXXRW: Why don't we install the XTLB handler for all 64-bit
 	 * architectures?
 	 */
-#if defined(CPU_CNMIPS) || defined(CPU_RMI) || defined(CPU_NLM) || defined (CPU_BERI)
+#if defined(CPU_CNMIPS) || defined(CPU_RMI) || defined(CPU_NLM) || defined(CPU_BERI) || defined(CPU_CHERI)
 /* Fake, but sufficient, for the 32-bit with 64-bit hardware addresses  */
 	bcopy(MipsTLBMiss, (void *)MIPS3_XTLB_MISS_EXC_VEC,
 	      MipsTLBMissEnd - MipsTLBMiss);


More information about the p4-projects mailing list