From owner-p4-projects@FreeBSD.ORG  Tue Sep  3 21:20:41 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 9C26DF6A; Tue,  3 Sep 2013 21:20:41 +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 5E665F67
 for <perforce@freebsd.org>; Tue,  3 Sep 2013 21:20:41 +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 4A99B2AF6
 for <perforce@freebsd.org>; Tue,  3 Sep 2013 21:20:41 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r83LKfUY046459
 for <perforce@freebsd.org>; Tue, 3 Sep 2013 21:20:41 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 r83LKfB6046452
 for perforce@freebsd.org; Tue, 3 Sep 2013 21:20:41 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 3 Sep 2013 21:20:41 GMT
Message-Id: <201309032120.r83LKfB6046452@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 570986 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, 03 Sep 2013 21:20:41 -0000

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

Change 570986 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/09/03 21:20:00

	Correcty '%c' -> '$c' in three currently unused CHERI macros; when
	unused, these aren't syntax checked by the compiler/assembler.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/cheri.h#20 edit

Differences ...

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

@@ -169,7 +169,7 @@
  * believe these require no clobbers, as they don't directly replace c0.
  */
 #define	CHERI_CCALL(cs, cb) do {					\
-	__asm__ __volatile__ ("ccall $c%0, %c%1" : :			\
+	__asm__ __volatile__ ("ccall $c%0, $c%1" : :			\
 	    "i" (cs), "i" (cb));					\
 } while (0)
 
@@ -260,10 +260,10 @@
  */
 #define	CHERI_CGETPCC(v, cd) do {					\
 	if ((cd) == 0)							\
-		__asm__ __volatile__ ("cgetpcc %0, %c%1" : "=r" (v) :	\
+		__asm__ __volatile__ ("cgetpcc %0, $c%1" : "=r" (v) :	\
 		    "i" (cd) : "memory");				\
 	else								\
-		__asm__ __volatile__ ("cgetpcc %0, %c%1" : "=r" (v) :	\
+		__asm__ __volatile__ ("cgetpcc %0, $c%1" : "=r" (v) :	\
 		    "i" (cd));						\
 } while (0)