opcodes/

* s390-opc.txt (clih): Make the immediate unsigned.

gas/testsuite/
	* gas/s390/zarch-z196.s, gas/s390/zarch-z196.d: Test CLIH with
	4000000000.

gas/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2013-09-17  Richard Sandiford  <rsandifo@linux.vnet.ibm.com>
+
+	* gas/s390/zarch-z196.s, gas/s390/zarch-z196.d: Test CLIH with
+	4000000000.
+
 2013-09-16  Will Newton  <will.newton@linaro.org>
 
 	* gas/arm/neon-ldst-es.d: Add VLD1.64 instructions.

gas/testsuite/gas/s390/zarch-z196.d

@@ -22,6 +22,7 @@ Disassembly of section .text:
 .*:	b9 df 00 67 [	 ]*clhlr	%r6,%r7
 .*:	e3 67 85 b3 01 cf [	 ]*clhf	%r6,5555\(%r7,%r8\)
 .*:	cc 6f 00 09 eb 10 [	 ]*clih	%r6,650000
+.*:	cc 9f ee 6b 28 00 [	 ]*clih	%r9,4000000000
 .*:	e3 67 8a 4d fe c0 [	 ]*lbh	%r6,-5555\(%r7,%r8\)
 .*:	e3 67 8a 4d fe c4 [	 ]*lhh	%r6,-5555\(%r7,%r8\)
 .*:	e3 67 8a 4d fe ca [	 ]*lfh	%r6,-5555\(%r7,%r8\)
@@ -257,3 +258,4 @@ Disassembly of section .text:
 .*:	b9 2b 00 56 [	 ]*kmo	%r5,%r6
 .*:	b9 2c 00 00 [	 ]*pcc
 .*:	b9 2d 90 56 [	 ]*kmctr	%r5,%r6,%r9
+.*:	07 07 [	 ]*nopr	%r7

gas/testsuite/gas/s390/zarch-z196.s

@@ -16,6 +16,7 @@ foo:
 	clhlr	%r6,%r7
 	clhf	%r6,5555(%r7,%r8)
 	clih	%r6,650000
+	clih	%r9,4000000000
 	lbh	%r6,-5555(%r7,%r8)
 	lhh	%r6,-5555(%r7,%r8)
 	lfh	%r6,-5555(%r7,%r8)

opcodes/ChangeLog

@@ -1,3 +1,7 @@
+2013-09-17  Richard Sandiford  <rsandifo@linux.vnet.ibm.com>
+
+	* s390-opc.txt (clih): Make the immediate unsigned.
+
 2013-09-04  Roland McGrath  <mcgrathr@google.com>
 
 	PR gas/15914

opcodes/s390-opc.txt

@@ -995,7 +995,7 @@ cc0d cih RIL_RI "compare immediate high" z196 zarch
 b9cf clhhr RRE_RR "compare logical high high" z196 zarch
 b9df clhlr RRE_RR "compare logical high low" z196 zarch
 e300000000cf clhf RXY_RRRD "compare logical high" z196 zarch
-cc0f clih RIL_RI "compare logical immediate" z196 zarch
+cc0f clih RIL_RU "compare logical immediate" z196 zarch
 e300000000c0 lbh RXY_RRRD "load byte high" z196 zarch
 e300000000c4 lhh RXY_RRRD "load halfword high" z196 zarch
 e300000000ca lfh RXY_RRRD "load high" z196 zarch