From owner-p4-projects@FreeBSD.ORG  Mon Oct 22 19:55:57 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 452DC70F; Mon, 22 Oct 2012 19:55:57 +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 0463A70D
 for <perforce@freebsd.org>; Mon, 22 Oct 2012 19:55:57 +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 DE3B38FC0C
 for <perforce@freebsd.org>; Mon, 22 Oct 2012 19:55:56 +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 q9MJtu3f028990
 for <perforce@freebsd.org>; Mon, 22 Oct 2012 19:55:56 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 q9MJtu6N028987
 for perforce@freebsd.org; Mon, 22 Oct 2012 19:55:56 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 22 Oct 2012 19:55:56 GMT
Message-Id: <201210221955.q9MJtu6N028987@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 218923 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 19:55:57 -0000

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

Change 218923 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/10/22 19:55:24

	Merge an additional change from Mike Roe's GNU assembler support
	for CHERI ISAv2:
	
	commit 7075cdbc30f8a12947b9699a8aa05df70c037496
	Author: Michael Roe <mroe@cornstalk.org.uk>
	Date:   Mon Oct 22 18:16:58 2012 +0100
	
	    Added assembler support for immediate offsets with the clc and
	    csc instructions. Immediate offsets are still not supported with
	    clb (etc.)

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#9 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/contrib/binutils/opcodes/mips-opc.c#9 (text+ko) ====

@@ -202,11 +202,12 @@
 {"cmove",   "+w,+b",	0x48800002, 0xffe007ff,	0, 0, I1},
 {"csetlen", "+w,+b,m",	0x48800003, 0xffe0003f,	0, 0, I1},
 {"ccleartag", "+w",	0x48800005, 0xffe0ffff,	0, 0, I1},
-{"csc",     "+x,d(+w)", 0xf8000000, 0xfc0007ff, 0, 0, I1},
-{"clc",     "+x,d(+w)", 0xd8000000, 0xfc0007ff, 0, 0, I1},
-
-{"cscr",    "+w,m(+b)",	0x49200000, 0xffe0003f,	0,			0,		I1	},
-{"clcr",    "+w,m(+b)",	0x49400000, 0xffe0003f,	0,			0,		I1	},
+{"csc",     "+x,d,+o(+w)", 0xf8000000, 0xfc000000, 0, 0, I1},
+{"clc",     "+x,d,+o(+w)", 0xd8000000, 0xfc000000, 0, 0, I1},
+{"cscr",    "+x,d(+w)",	0xf8000000, 0xfc0007ff,	0, 0, I1},
+{"clcr",    "+x,d(+w)",	0xd8000000, 0xfc0007ff,	0, 0, I1},
+{"csci",    "+x,+o(+w)", 0xf8000000, 0xfc00f800, 0, 0, I1},
+{"clci",    "+x,+o(+w)", 0xd8000000, 0xfc00f800, 0, 0, I1},
 /* mask should be 0xfc000007. Because I don't have letters for the
  * other register and offset argument, temporarily mask them.
  * Hence mask of 0xfc0007ff.