Date: Tue, 19 Jun 2012 11:03:36 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 213136 for review Message-ID: <201206191103.q5JB3as7070394@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@213136?ac=10 Change 213136 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/06/19 11:03:23 Shift CHERI headers from sys/mips/cheri to sys/mips/include making them a bit more accessible. Rename them to cheri*.h from cp2*.h as well. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2.c#7 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2.h#9 delete .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2asm.h#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2reg.h#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheri.h#1 add .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheriasm.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cherireg.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/pcb.h#4 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/proc.h#4 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/exception.S#5 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/pm_machdep.c#4 edit .. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#6 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cp2.c#7 (text+ko) ==== @@ -32,9 +32,8 @@ #include <sys/kernel.h> #include <sys/proc.h> -#include <mips/include/pcb.h> - -#include <mips/cheri/cp2.h> +#include <machine/cheri.h> +#include <machine/pcb.h> /* * Beginnings of a programming interface for explicitly managing capability ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/pcb.h#4 (text+ko) ==== @@ -45,7 +45,7 @@ #include <machine/frame.h> #ifdef CPU_CHERI -#include <mips/cheri/cp2.h> +#include <machine/cheri.h> #endif /* ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/proc.h#4 (text+ko) ==== @@ -40,7 +40,7 @@ #define _MACHINE_PROC_H_ #ifdef CPU_CHERI -#include <mips/cheri/cp2.h> +#include <machine/cheri.h> #endif #ifdef CPU_CNMIPS #include <machine/octeon_cop2.h> ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/exception.S#5 (text+ko) ==== @@ -63,8 +63,8 @@ #include <machine/pte.h> #ifdef CPU_CHERI -#include <mips/cheri/cp2asm.h> -#include <mips/cheri/cp2reg.h> +#include <machine/cheriasm.h> +#include <machine/cherireg.h> #endif #include "opt_cputype.h" ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/pm_machdep.c#4 (text+ko) ==== @@ -70,7 +70,7 @@ #include <fs/procfs/procfs.h> #ifdef CPU_CHERI -#include <mips/cheri/cp2.h> +#include <machine/cheri.h> #endif #define UCONTEXT_MAGIC 0xACEDBADE ==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/swtch.S#6 (text+ko) ==== @@ -65,8 +65,8 @@ #include <machine/pte.h> #ifdef CPU_CHERI -#include <mips/cheri/cp2asm.h> -#include <mips/cheri/cp2reg.h> +#include <machine/cheriasm.h> +#include <machine/cherireg.h> #endif #include "assym.s"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206191103.q5JB3as7070394>