PERFORCE change 218923 for review

[Robert Watson]

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

Change 218923 by rwatson at 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 at 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.