From owner-p4-projects@FreeBSD.ORG Mon Sep 23 21:33:49 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2667C200; Mon, 23 Sep 2013 21:33:49 +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 D9F3E1FE for ; Mon, 23 Sep 2013 21:33:48 +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 ABCD62B80 for ; Mon, 23 Sep 2013 21:33:48 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NLXmwA012696 for ; Mon, 23 Sep 2013 21:33:48 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 r8NLXmAJ012602 for perforce@freebsd.org; Mon, 23 Sep 2013 21:33:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 23 Sep 2013 21:33:48 GMT Message-Id: <201309232133.r8NLXmAJ012602@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 821164 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: Mon, 23 Sep 2013 21:33:49 -0000 http://p4web.freebsd.org/@@821164?ac=10 Change 821164 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/23 21:33:41 Set up code and data capabilities to more narrowly point to the inlined minimal test sandbox assembly in cheritest_sandbox.S. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#18 edit .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest_sandbox.S#2 edit .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest_sandbox.h#2 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#18 (text+ko) ==== @@ -114,15 +114,17 @@ * - 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, 4); /* XXXRW: Use symbols not magic. */ + CHERI_CINCBASE(10, 0, &sandbox_creturn); + /* XXXRW: CHERI_CSETTYPE(10, 10, &sandbox_creturn); */ + CHERI_CSETLEN(10, 10, (uintptr_t)&sandbox_creturn_end - + (uintptr_t)&sandbox_creturn); CHERI_CANDPERM(10, 10, CHERI_PERM_EXECUTE); /* XXXRW: CHERI_CSEALCODE(10, 10); */ - CHERI_CINCBASE(11, 0, sandbox_creturn); - /* XXXRW: CHERI_CSETTYPE(11, 11, sandbox_creturn); */ - CHERI_CSETLEN(11, 11, 4); /* XXXRW: Use symbols not magic. */ + CHERI_CINCBASE(11, 0, &sandbox_creturn); + /* XXXRW: CHERI_CSETTYPE(11, 11, &sandbox_creturn); */ + CHERI_CSETLEN(11, 11, (uintptr_t)&sandbox_creturn_end - + (uintptr_t)&sandbox_creturn); CHERI_CANDPERM(11, 11, CHERI_PERM_LOAD); /* XXXRW: CHERI_CSEALDATA(11, 11); */ ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest_sandbox.S#2 (text+ko) ==== @@ -46,5 +46,7 @@ sandbox_creturn: creturn + .end sandbox_creturn - .end sandbox_creturn + .global sandbox_creturn_end +sandbox_creturn_end: ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest_sandbox.h#2 (text+ko) ==== @@ -31,6 +31,7 @@ #ifndef _CHERITEST_SANDBOX_H_ #define _CHERITEST_SANDBOX_H_ -void sandbox_creturn(void); +extern void *sandbox_creturn; +extern void *sandbox_creturn_end; #endif /* !_CHERITEST_SANDBOX_H_ */