Date: Sun, 29 Sep 2013 11:14:43 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 891716 for review Message-ID: <201309291114.r8TBEh64076323@skunkworks.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@891716?ac=10 Change 891716 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/29 11:14:31 Remove XXX comment about setting the type; we now do that. Remove use of K0/K1 registers in CCall/CReturn -- that was temporary scaffolding. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#22 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#22 (text+ko) ==== @@ -101,7 +101,6 @@ static void cheritest_ccall(void) { - register_t k0, k1; /*- * Construct a generic capability in $c3 that describes the combined @@ -111,7 +110,6 @@ * $c2, suitable for use with CCall. * * Current limitations: - * - Doesn't set the type (XXXRW: new or old semantics?) * - $c2 doesn't matter as sandbox_creturn doesn't access data. * - We don't flush registers before CCall. * - We don't restore registers after CCall. @@ -137,33 +135,13 @@ /* Invoke capability. */ CHERI_CCALL(1, 2); - - /* - * XXXRW: Rely on a side channel out of our test handler to see - * whether it was a CCall or CReturn. - */ - __asm__ __volatile__ ("move %0, $k0" : "=r" (k0)); - __asm__ __volatile__ ("move %0, $k1" : "=r" (k1)); - printf("MIPS K0: %016jx\n", k0); - printf("MIPS K1: %016jx\n", k1); } static void cheritest_creturn(void) { - register_t k0, k1; - /* XXXRW: Temporary nop semantics. */ CHERI_CRETURN(); - - /* - * XXXRW: Rely on a side channel out of our test handler to see - * whether it was a CCall or CReturn. - */ - __asm__ __volatile__ ("move %0, $k0" : "=r" (k0)); - __asm__ __volatile__ ("move %0, $k1" : "=r" (k1)); - printf("MIPS K0: %016jx\n", k0); - printf("MIPS K1: %016jx\n", k1); } static voidhelp
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309291114.r8TBEh64076323>