From owner-p4-projects@FreeBSD.ORG Sun Sep 15 18:56:48 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED87C119; Sun, 15 Sep 2013 18:56:47 +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 B1859117 for ; Sun, 15 Sep 2013 18:56:47 +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 831752FEE for ; Sun, 15 Sep 2013 18:56:47 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r8FIulce052753 for ; Sun, 15 Sep 2013 18:56:47 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 r8FIulgM052749 for perforce@freebsd.org; Sun, 15 Sep 2013 18:56:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 15 Sep 2013 18:56:47 GMT Message-Id: <201309151856.r8FIulgM052749@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 717817 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, 15 Sep 2013 18:56:48 -0000 http://p4web.freebsd.org/@@717817?ac=10 Change 717817 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/15 18:56:33 Add two new test comments to bin/cheritest: list privileged CP2 registers, and list the CP2 cause register. Both should (and do) cause SIGPROT for the user process. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#15 edit Differences ... ==== //depot/projects/ctsrd/cheribsd/src/bin/cheritest/cheritest.c#15 (text+ko) ==== @@ -71,6 +71,8 @@ fprintf(stderr, "cheritest ccall\n"); fprintf(stderr, "cheritest copyregs\n"); fprintf(stderr, "cheritest creturn\n"); + fprintf(stderr, "cheritest listcausereg\n"); + fprintf(stderr, "cheritest listprivregs\n"); fprintf(stderr, "cheritest listregs\n"); fprintf(stderr, "cheritest overrun\n"); fprintf(stderr, "cheritest sandbox\n"); @@ -125,6 +127,32 @@ } static void +cheritest_listcausereg(void) +{ + register_t cause; + + printf("CP2 cause register:\n"); + CHERI_CGETCAUSE(cause); + printf("Cause: %ju\n", (uintmax_t)cause); +} + +static void +cheritest_listprivregs(void) +{ + + /* + * Because of the assembly generated by CP2_CR_GET(), can't use a loop + * -- register numbers must be available at compile-time. + */ + printf("CP2 privileged registers:\n"); + CHERI_CAPREG_PRINT(27); + CHERI_CAPREG_PRINT(28); + CHERI_CAPREG_PRINT(29); + CHERI_CAPREG_PRINT(30); + CHERI_CAPREG_PRINT(31); +} + +static void cheritest_listregs(void) { @@ -270,7 +298,11 @@ CHERI_CMOVE(1, 0); for (i = 0; i < argc; i++) { - if (strcmp(argv[i], "listregs") == 0) + if (strcmp(argv[i], "listcausereg") == 0) + cheritest_listcausereg(); + else if (strcmp(argv[i], "listprivregs") == 0) + cheritest_listprivregs(); + else if (strcmp(argv[i], "listregs") == 0) cheritest_listregs(); else if (strcmp(argv[i], "ccall") == 0) cheritest_ccall();