From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 18:40:12 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 825E2AD4; Mon, 22 Oct 2012 18:40:12 +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 3F22FAD2
 for <perforce@freebsd.org>; Mon, 22 Oct 2012 18:40:12 +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 23B218FC08
 for <perforce@freebsd.org>; Mon, 22 Oct 2012 18:40:12 +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 q9MIeBxK022411
 for <perforce@freebsd.org>; Mon, 22 Oct 2012 18:40:11 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 q9MIeB8J022408
 for perforce@freebsd.org; Mon, 22 Oct 2012 18:40:11 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 22 Oct 2012 18:40:11 GMT
Message-Id: <201210221840.q9MIeB8J022408@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 218919 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, 22 Oct 2012 18:40:12 -0000

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

Change 218919 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/10/22 18:39:25

	Update cheriasm.h for upstream changes to CP0 status register
	constants (good changes even).

Affected files ...

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

Differences ...

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

@@ -46,7 +46,7 @@
  */
 #define	CHERI_EXCEPTION_ENTER(reg)					\
 	mfc0	reg, MIPS_COP_0_STATUS;					\
-	andi	reg, reg, SR_KSU_USER;					\
+	andi	reg, reg, MIPS_SR_KSU_USER;				\
 	beq	reg, $0, 64f;						\
 	nop;								\
 	cmove	$c27, $c0;						\
@@ -68,7 +68,7 @@
  */
 #define	CHERI_EXCEPTION_RETURN(reg)					\
 	mfc0	reg, MIPS_COP_0_STATUS;					\
-	andi	reg, reg, SR_KSU_USER;					\
+	andi	reg, reg, MIPS_SR_KSU_USER;				\
 	beq	reg, $0, 65f;						\
 	nop;								\
 	b	66f;							\