Date: Mon, 23 Sep 2013 21:48:03 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 821292 for review Message-ID: <201309232148.r8NLm3lS033350@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@821292?ac=10 Change 821292 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/23 21:47:39 Use $1 and $c2 for ccall arguments, to match the effective ABI used in cheritest's ccall2 test. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#19 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#19 (text+ko) ==== @@ -104,32 +104,32 @@ register_t k0, k1; /*- - * Construct a code capability in $c10, and a data capability in $c11, + * Construct a code capability in $c1, and a data capability in $c2, * starting with $c0 for both. * * Current limitations: * - Doesn't set the type (XXXRW: new or old semantics?) * - Doesn't use sealing. - * - $c11 doesn't matter as sandbox_creturn doesn't access data. + * - $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. */ - CHERI_CINCBASE(10, 0, &sandbox_creturn); - /* XXXRW: CHERI_CSETTYPE(10, 10, &sandbox_creturn); */ - CHERI_CSETLEN(10, 10, (uintptr_t)&sandbox_creturn_end - + CHERI_CINCBASE(1, 0, &sandbox_creturn); + /* XXXRW: CHERI_CSETTYPE(1, 1, &sandbox_creturn); */ + CHERI_CSETLEN(1, 1, (uintptr_t)&sandbox_creturn_end - (uintptr_t)&sandbox_creturn); - CHERI_CANDPERM(10, 10, CHERI_PERM_EXECUTE); - /* XXXRW: CHERI_CSEALCODE(10, 10); */ + CHERI_CANDPERM(1, 1, CHERI_PERM_EXECUTE); + /* XXXRW: CHERI_CSEALCODE(1, 1); */ - CHERI_CINCBASE(11, 0, &sandbox_creturn); - /* XXXRW: CHERI_CSETTYPE(11, 11, &sandbox_creturn); */ - CHERI_CSETLEN(11, 11, (uintptr_t)&sandbox_creturn_end - + CHERI_CINCBASE(2, 0, &sandbox_creturn); + /* XXXRW: CHERI_CSETTYPE(2, 2, &sandbox_creturn); */ + CHERI_CSETLEN(2, 2, (uintptr_t)&sandbox_creturn_end - (uintptr_t)&sandbox_creturn); - CHERI_CANDPERM(11, 11, CHERI_PERM_LOAD); - /* XXXRW: CHERI_CSEALDATA(11, 11); */ + CHERI_CANDPERM(2, 2, CHERI_PERM_LOAD); + /* XXXRW: CHERI_CSEALDATA(2, 2); */ /* Invoke capability. */ - CHERI_CCALL(10, 11); + CHERI_CCALL(1, 2); /* * XXXRW: Rely on a side channel out of our test handler to see
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309232148.r8NLm3lS033350>