From owner-p4-projects@FreeBSD.ORG  Sat Nov 10 00:28:23 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 5367E839; Sat, 10 Nov 2012 00:28:23 +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 EC80E837
 for <perforce@freebsd.org>; Sat, 10 Nov 2012 00:28:22 +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 D04488FC0A
 for <perforce@freebsd.org>; Sat, 10 Nov 2012 00:28:22 +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 qAA0SMwM026776
 for <perforce@freebsd.org>; Sat, 10 Nov 2012 00:28:22 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 qAA0SMXO026773
 for perforce@freebsd.org; Sat, 10 Nov 2012 00:28:22 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 10 Nov 2012 00:28:22 GMT
Message-Id: <201211100028.qAA0SMXO026773@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 219712 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: Sat, 10 Nov 2012 00:28:23 -0000

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

Change 219712 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/11/10 00:27:21

	During rearrangement of capability registers for CHERI ISAv2, we
	switched which register would temporarily hold a saved userspace
	data capability during exception handling; however, I missed an
	instance, which meant that $C0 might not get properly saved and
	restored if exceptions were delivered while the kernel was
	running on behalf of a process containing sandboxes.  This change
	eliminates that inconsistency and now appears to allow modified
	$C0 values to work.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheriasm.h#10 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheriasm.h#10 (text+ko) ====

@@ -49,7 +49,7 @@
 	andi	reg, reg, MIPS_SR_KSU_USER;				\
 	beq	reg, $0, 64f;						\
 	nop;								\
-	cmove	$c27, $c0;						\
+	cmove	$c25, $c0;						\
 	cmove	$c0, $c30;						\
 64: