From owner-p4-projects@FreeBSD.ORG  Sun Sep 29 09:28:52 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 8420CA16; Sun, 29 Sep 2013 09:28:52 +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 3A8D3A14
 for <perforce@freebsd.org>; Sun, 29 Sep 2013 09:28:52 +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 276022DC9
 for <perforce@freebsd.org>; Sun, 29 Sep 2013 09:28:52 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r8T9SqtP017468
 for <perforce@freebsd.org>; Sun, 29 Sep 2013 09:28:52 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 r8T9Sp3w017459
 for perforce@freebsd.org; Sun, 29 Sep 2013 09:28:51 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 29 Sep 2013 09:28:51 GMT
Message-Id: <201309290928.r8T9Sp3w017459@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 890770 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: Sun, 29 Sep 2013 09:28:52 -0000

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

Change 890770 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/29 09:28:44

	Prefer FreeBSD macro for daddiu.
	
	Replace an incorrect csc with a more correct clc when popping
	PCC from the trusted stack.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/ccall.S#7 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/cheri/ccall.S#7 (text+ko) ====

@@ -126,7 +126,7 @@
 
 	/* Push PC + 4 */
 	MFC0		k0, MIPS_COP_0_EXC_PC
-	daddiu		k0, 4
+	PTR_ADDU	k0, k0, 4
 	csd		k0, k1, U_CHERI_STACK_PC(CHERI_REG_KDC)
 
 	/*
@@ -184,7 +184,7 @@
 	clc		CHERI_REG_IDC, k1, U_CHERI_STACK_IDC(CHERI_REG_KDC)
 
 	/* Pop PCC. */
-	csc		CHERI_REG_EPCC, k1, U_CHERI_STACK_PCC(CHERI_REG_KDC)
+	clc		CHERI_REG_EPCC, k1, U_CHERI_STACK_PCC(CHERI_REG_KDC)
 
 	/* Pop PC + padding; +4 increment already done. */
 	cld		k0, k1, U_CHERI_STACK_PC(CHERI_REG_KDC)