From owner-p4-projects@FreeBSD.ORG  Tue Oct 23 07:27:13 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id B051119D; Tue, 23 Oct 2012 07:27:13 +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 2D3F919B
 for <perforce@freebsd.org>; Tue, 23 Oct 2012 07:27:13 +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 0A0608FC08
 for <perforce@freebsd.org>; Tue, 23 Oct 2012 07:27:13 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q9N7RCXu070388
 for <perforce@freebsd.org>; Tue, 23 Oct 2012 07:27:12 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q9N7RCcg070385
 for perforce@freebsd.org; Tue, 23 Oct 2012 07:27:12 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 23 Oct 2012 07:27:12 GMT
Message-Id: <201210230727.q9N7RCcg070385@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 218949 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: Tue, 23 Oct 2012 07:27:14 -0000

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

Change 218949 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/10/23 07:26:19

	CHERI capability registers now include a tag, so teach the kernel
	debugger to print that tag.

Affected files ...

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

Differences ...

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

@@ -241,10 +241,13 @@
 #ifdef DDB
 #define	DB_CHERI_REG_PRINT_NUM(crn, num) do {				\
 	struct chericap c;						\
+	u_int ctag;							\
 									\
 	CHERI_GETCAPREG((crn), c);					\
-	db_printf("C%u u: %u perms %04jx otype %016jx\n", num,		\
-	    c.c_unsealed, (uintmax_t)c.c_perms, (uintmax_t)c.c_otype);	\
+	CHERI_CGETTAG(ctag, (crn));					\
+	db_printf("C%u t: %u u: %u perms %04jx otype %016jx\n", num,	\
+	    ctag, c.c_unsealed, (uintmax_t)c.c_perms,			\
+	    (uintmax_t)c.c_otype);					\
 	db_printf("\tbase %016jx length %016jx\n", (uintmax_t)c.c_base,	\
 	    (uintmax_t)c.c_length);					\
 } while (0)