From owner-p4-projects@FreeBSD.ORG Sun Sep 29 11:14:44 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3AD78F0; Sun, 29 Sep 2013 11:14:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 953FF8EE for ; Sun, 29 Sep 2013 11:14:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8136E2212 for ; Sun, 29 Sep 2013 11:14:43 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r8TBEh1a076326 for ; Sun, 29 Sep 2013 11:14:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r8TBEh64076323 for perforce@freebsd.org; Sun, 29 Sep 2013 11:14:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 29 Sep 2013 11:14:43 GMT Message-Id: <201309291114.r8TBEh64076323@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 891716 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Sep 2013 11:14:44 -0000 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 void