From owner-p4-projects@FreeBSD.ORG  Mon Nov 12 01:33:51 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id D9CB596C; Mon, 12 Nov 2012 01:33:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 818A796A
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 01:33:50 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id 62DCD8FC08
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 01:33:50 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qAC1Xo9K039073
 for <perforce@freebsd.org>; Mon, 12 Nov 2012 01:33:50 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qAC1Xnls039070
 for perforce@freebsd.org; Mon, 12 Nov 2012 01:33:49 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Nov 2012 01:33:49 GMT
Message-Id: <201211120133.qAC1Xnls039070@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 <rwatson@FreeBSD.org>
Subject: PERFORCE change 219752 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Nov 2012 01:33:51 -0000

http://p4web.freebsd.org/@@219752?ac=10

Change 219752 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2012/11/12 01:32:53

	When throwing a capability-related exception, include more
	information on potentially interesting CP2 registers in log
	output.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#9 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/cheri.c#9 (text+ko) ====

@@ -274,6 +274,46 @@
 	intr_enable();
 	CHERI_REG_PRINT(c, ctag, 0);
 
+	/* C1 */
+	intr_disable();
+	CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c1, 0);
+	CHERI_GETCAPREG(CHERI_CR_KR1C, c);
+	CHERI_CGETTAG(ctag, 0);
+	intr_enable();
+	CHERI_REG_PRINT(c, ctag, 1);
+
+	/* C2 */
+	intr_disable();
+	CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c2, 0);
+	CHERI_GETCAPREG(CHERI_CR_KR1C, c);
+	CHERI_CGETTAG(ctag, 0);
+	intr_enable();
+	CHERI_REG_PRINT(c, ctag, 2);
+
+	/* C3 */
+	intr_disable();
+	CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c3, 0);
+	CHERI_GETCAPREG(CHERI_CR_KR1C, c);
+	CHERI_CGETTAG(ctag, 0);
+	intr_enable();
+	CHERI_REG_PRINT(c, ctag, 3);
+
+	/* C24 */
+	intr_disable();
+	CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c24, 0);
+	CHERI_GETCAPREG(CHERI_CR_KR1C, c);
+	CHERI_CGETTAG(ctag, 0);
+	intr_enable();
+	CHERI_REG_PRINT(c, ctag, 24);
+
+	/* C26 */
+	intr_disable();
+	CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_c26, 0);
+	CHERI_GETCAPREG(CHERI_CR_KR1C, c);
+	CHERI_CGETTAG(ctag, 0);
+	intr_enable();
+	CHERI_REG_PRINT(c, ctag, 26);
+
 	/* EPCC */
 	intr_disable();
 	CHERI_CLC(CHERI_CR_KR1C, CHERI_CR_KDC, &cheriframe->cf_pcc, 0);