From owner-p4-projects@FreeBSD.ORG Mon Sep 23 21:48:04 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C831C8D; Mon, 23 Sep 2013 21:48:04 +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 F1EF0C8B for ; Mon, 23 Sep 2013 21:48:03 +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 C3C202C62 for ; Mon, 23 Sep 2013 21:48:03 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NLm35x033353 for ; Mon, 23 Sep 2013 21:48:03 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 r8NLm3lS033350 for perforce@freebsd.org; Mon, 23 Sep 2013 21:48:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 23 Sep 2013 21:48:03 GMT Message-Id: <201309232148.r8NLm3lS033350@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 821292 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:48:04 -0000 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