From owner-p4-projects@FreeBSD.ORG Tue Sep 3 22:30:56 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6FE8E9D; Tue, 3 Sep 2013 22:30:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 874E6E9A for ; Tue, 3 Sep 2013 22:30:56 +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 728AB206C for ; Tue, 3 Sep 2013 22:30:56 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r83MUuOn056226 for ; Tue, 3 Sep 2013 22:30:56 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 r83MUuJA056222 for perforce@freebsd.org; Tue, 3 Sep 2013 22:30:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 3 Sep 2013 22:30:56 GMT Message-Id: <201309032230.r83MUuJA056222@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 571561 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: Tue, 03 Sep 2013 22:30:57 -0000 http://p4web.freebsd.org/@@571561?ac=10 Change 571561 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/03 22:30:10 Add stub CCall and CReturn exercise cases to cheritest -- for now, they expect the kernel's temporary behaviour of $pc += 4 rather than an actual invoke. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#12 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2012 Robert N. M. Watson + * Copyright (c) 2012-2013 Robert N. M. Watson * All rights reserved. * * This software was developed by SRI International and the University of @@ -66,7 +66,9 @@ usage(void) { + fprintf(stderr, "cheritest ccall\n"); fprintf(stderr, "cheritest copyregs\n"); + fprintf(stderr, "cheritest creturn\n"); fprintf(stderr, "cheritest listregs\n"); fprintf(stderr, "cheritest overrun\n"); fprintf(stderr, "cheritest sandbox\n"); @@ -93,6 +95,22 @@ } static void +cheritest_ccall(void) +{ + + /* XXXRW: Temporary nop semantics. */ + CHERI_CCALL(10, 11); +} + +static void +cheritest_creturn(void) +{ + + /* XXXRW: Temporary nop semantics. */ + CHERI_CRETURN(); +} + +static void cheritest_copyregs(void) { @@ -252,8 +270,12 @@ for (i = 0; i < argc; i++) { if (strcmp(argv[i], "listregs") == 0) cheritest_listregs(); + else if (strcmp(argv[i], "ccall") == 0) + cheritest_ccall(); else if (strcmp(argv[i], "copyregs") == 0) cheritest_copyregs(); + else if (strcmp(argv[i], "creturn") == 0) + cheritest_creturn(); else if (strcmp(argv[i], "overrun") == 0) cheritest_overrun(); else if (strcmp(argv[i], "sandbox") == 0)