6 files changed, 157 insertions, 52 deletions
diff --git a/gas/testsuite/gas/s390/esa-g5.d b/gas/testsuite/gas/s390/esa-g5.d
index 949ef14..67a971b 100644
--- a/gas/testsuite/gas/s390/esa-g5.d
+++ b/gas/testsuite/gas/s390/esa-g5.d
@@ -78,10 +78,14 @@ Disassembly of section .text:
 .*:	07 29 [	 ]*bhr	%r9
 .*:	07 f9 [	 ]*br	%r9
 .*:	a7 95 00 00 [	 ]*bras	%r9,e2 <foo\+0xe2>
-.*:	a7 64 00 00 [	 ]*jlh	e6 <foo\+0xe6>
-.*:	a7 66 00 00 [	 ]*brct	%r6,ea <foo\+0xea>
-.*:	84 69 00 00 [	 ]*brxh	%r6,%r9,ee <foo\+0xee>
-.*:	85 69 00 00 [	 ]*brxle	%r6,%r9,f2 <foo\+0xf2>
+.*:	a7 65 00 00 [	 ]*bras	%r6,e6 <foo\+0xe6>
+.*:	a7 64 00 00 [	 ]*jlh	ea <foo\+0xea>
+.*:	a7 66 00 00 [	 ]*brct	%r6,ee <foo\+0xee>
+.*:	a7 66 00 00 [	 ]*brct	%r6,f2 <foo\+0xf2>
+.*:	84 69 00 00 [	 ]*brxh	%r6,%r9,f6 <foo\+0xf6>
+.*:	84 69 00 00 [	 ]*brxh	%r6,%r9,fa <foo\+0xfa>
+.*:	85 69 00 00 [	 ]*brxle	%r6,%r9,fe <foo\+0xfe>
+.*:	85 69 00 00 [	 ]*brxle	%r6,%r9,102 <foo\+0x102>
 .*:	b2 5a 00 69 [	 ]*bsa	%r6,%r9
 .*:	b2 58 00 69 [	 ]*bsg	%r6,%r9
 .*:	0b 69 [	 ]*bsm	%r6,%r9
@@ -180,27 +184,49 @@ Disassembly of section .text:
 .*:	b2 21 00 69 [	 ]*ipte	%r6,%r9
 .*:	b2 29 00 69 [	 ]*iske	%r6,%r9
 .*:	b2 23 00 69 [	 ]*ivsk	%r6,%r9
-.*:	a7 f4 00 00 [	 ]*j	278 <foo\+0x278>
-.*:	a7 84 00 00 [	 ]*je	27c <foo\+0x27c>
-.*:	a7 24 00 00 [	 ]*jh	280 <foo\+0x280>
-.*:	a7 a4 00 00 [	 ]*jhe	284 <foo\+0x284>
-.*:	a7 44 00 00 [	 ]*jl	288 <foo\+0x288>
-.*:	a7 c4 00 00 [	 ]*jle	28c <foo\+0x28c>
-.*:	a7 64 00 00 [	 ]*jlh	290 <foo\+0x290>
-.*:	a7 44 00 00 [	 ]*jl	294 <foo\+0x294>
-.*:	a7 74 00 00 [	 ]*jne	298 <foo\+0x298>
-.*:	a7 d4 00 00 [	 ]*jnh	29c <foo\+0x29c>
-.*:	a7 54 00 00 [	 ]*jnhe	2a0 <foo\+0x2a0>
-.*:	a7 b4 00 00 [	 ]*jnl	2a4 <foo\+0x2a4>
-.*:	a7 34 00 00 [	 ]*jnle	2a8 <foo\+0x2a8>
-.*:	a7 94 00 00 [	 ]*jnlh	2ac <foo\+0x2ac>
-.*:	a7 b4 00 00 [	 ]*jnl	2b0 <foo\+0x2b0>
-.*:	a7 e4 00 00 [	 ]*jno	2b4 <foo\+0x2b4>
-.*:	a7 d4 00 00 [	 ]*jnh	2b8 <foo\+0x2b8>
-.*:	a7 74 00 00 [	 ]*jne	2bc <foo\+0x2bc>
-.*:	a7 14 00 00 [	 ]*jo	2c0 <foo\+0x2c0>
-.*:	a7 24 00 00 [	 ]*jh	2c4 <foo\+0x2c4>
-.*:	a7 84 00 00 [	 ]*je	2c8 <foo\+0x2c8>
+.*:	a7 f4 00 00 [	 ]*j	288 <foo\+0x288>
+.*:	a7 84 00 00 [	 ]*je	28c <foo\+0x28c>
+.*:	a7 24 00 00 [	 ]*jh	290 <foo\+0x290>
+.*:	a7 a4 00 00 [	 ]*jhe	294 <foo\+0x294>
+.*:	a7 44 00 00 [	 ]*jl	298 <foo\+0x298>
+.*:	a7 c4 00 00 [	 ]*jle	29c <foo\+0x29c>
+.*:	a7 64 00 00 [	 ]*jlh	2a0 <foo\+0x2a0>
+.*:	a7 44 00 00 [	 ]*jl	2a4 <foo\+0x2a4>
+.*:	a7 74 00 00 [	 ]*jne	2a8 <foo\+0x2a8>
+.*:	a7 d4 00 00 [	 ]*jnh	2ac <foo\+0x2ac>
+.*:	a7 54 00 00 [	 ]*jnhe	2b0 <foo\+0x2b0>
+.*:	a7 b4 00 00 [	 ]*jnl	2b4 <foo\+0x2b4>
+.*:	a7 34 00 00 [	 ]*jnle	2b8 <foo\+0x2b8>
+.*:	a7 94 00 00 [	 ]*jnlh	2bc <foo\+0x2bc>
+.*:	a7 b4 00 00 [	 ]*jnl	2c0 <foo\+0x2c0>
+.*:	a7 e4 00 00 [	 ]*jno	2c4 <foo\+0x2c4>
+.*:	a7 d4 00 00 [	 ]*jnh	2c8 <foo\+0x2c8>
+.*:	a7 74 00 00 [	 ]*jne	2cc <foo\+0x2cc>
+.*:	a7 14 00 00 [	 ]*jo	2d0 <foo\+0x2d0>
+.*:	a7 24 00 00 [	 ]*jh	2d4 <foo\+0x2d4>
+.*:	a7 84 00 00 [	 ]*je	2d8 <foo\+0x2d8>
+.*:	a7 04 00 00 [	 ]*jnop	2dc <foo\+0x2dc>
+.*:	a7 14 00 00 [	 ]*jo	2e0 <foo\+0x2e0>
+.*:	a7 24 00 00 [	 ]*jh	2e4 <foo\+0x2e4>
+.*:	a7 24 00 00 [	 ]*jh	2e8 <foo\+0x2e8>
+.*:	a7 34 00 00 [	 ]*jnle	2ec <foo\+0x2ec>
+.*:	a7 44 00 00 [	 ]*jl	2f0 <foo\+0x2f0>
+.*:	a7 44 00 00 [	 ]*jl	2f4 <foo\+0x2f4>
+.*:	a7 54 00 00 [	 ]*jnhe	2f8 <foo\+0x2f8>
+.*:	a7 64 00 00 [	 ]*jlh	2fc <foo\+0x2fc>
+.*:	a7 74 00 00 [	 ]*jne	300 <foo\+0x300>
+.*:	a7 74 00 00 [	 ]*jne	304 <foo\+0x304>
+.*:	a7 84 00 00 [	 ]*je	308 <foo\+0x308>
+.*:	a7 84 00 00 [	 ]*je	30c <foo\+0x30c>
+.*:	a7 94 00 00 [	 ]*jnlh	310 <foo\+0x310>
+.*:	a7 a4 00 00 [	 ]*jhe	314 <foo\+0x314>
+.*:	a7 b4 00 00 [	 ]*jnl	318 <foo\+0x318>
+.*:	a7 b4 00 00 [	 ]*jnl	31c <foo\+0x31c>
+.*:	a7 c4 00 00 [	 ]*jle	320 <foo\+0x320>
+.*:	a7 d4 00 00 [	 ]*jnh	324 <foo\+0x324>
+.*:	a7 d4 00 00 [	 ]*jnh	328 <foo\+0x328>
+.*:	a7 e4 00 00 [	 ]*jno	32c <foo\+0x32c>
+.*:	a7 f4 00 00 [	 ]*j	330 <foo\+0x330>
 .*:	ed 65 af ff 00 18 [	 ]*kdb	%f6,4095\(%r5,%r10\)
 .*:	b3 18 00 69 [	 ]*kdbr	%f6,%f9
 .*:	ed 65 af ff 00 08 [	 ]*keb	%f6,4095\(%r5,%r10\)
@@ -483,4 +509,4 @@ Disassembly of section .text:
 .*:	f8 58 5f ff af ff [	 ]*zap	4095\(6,%r5\),4095\(9,%r10\)
 .*:	b2 21 b0 69 [	 ]*ipte	%r6,%r9,%r11
 .*:	b2 21 bd 69 [	 ]*ipte	%r6,%r9,%r11,13
-.*:	07 07 [ 	]*nopr	%r7
+.*:	07 07 [	 ]*nopr	%r7
diff --git a/gas/testsuite/gas/s390/esa-g5.s b/gas/testsuite/gas/s390/esa-g5.s
index c417b81..ee3d631 100644
--- a/gas/testsuite/gas/s390/esa-g5.s
+++ b/gas/testsuite/gas/s390/esa-g5.s
@@ -72,10 +72,14 @@ foo:
 	bpr	%r9
 	br	%r9
 	bras	%r9,.
+	jas	%r6,.
 	brc	6,.
 	brct	6,.
+	jct	%r6,.
 	brxh	%r6,%r9,.
+	jxh	%r6,%r9,.
 	brxle	%r6,%r9,.
+	jxle	%r6,%r9,.
 	bsa	%r6,%r9
 	bsg	%r6,%r9
 	bsm	%r6,%r9
@@ -195,6 +199,28 @@ foo:
 	jo	.
 	jp	.
 	jz	.
+	jnop	.
+	bro	.
+	brh	.
+	brp	.
+	brnle	.
+	brl	.
+	brm	.
+	brnhe	.
+	brlh	.
+	brne	.
+	brnz	.
+	bre	.
+	brz	.
+	brnlh	.
+	brhe	.
+	brnl	.
+	brnm	.
+	brle	.
+	brnh	.
+	brnp	.
+	brno	.
+	bru	.
 	kdb	%f6,4095(%r5,%r10)
 	kdbr	%f6,%f9
 	keb	%f6,4095(%r5,%r10)
diff --git a/gas/testsuite/gas/s390/esa-z900.d b/gas/testsuite/gas/s390/esa-z900.d
index f6ff081..42f408b 100644
--- a/gas/testsuite/gas/s390/esa-z900.d
+++ b/gas/testsuite/gas/s390/esa-z900.d
@@ -6,29 +6,52 @@
 Disassembly of section .text:
 
 .* <foo>:
-.*:	c0 f4 00 00 00 00 [	 ]*jg	0 \<foo\>
-.*:	c0 14 00 00 00 00 [	 ]*jgo	6 \<foo\+0x6>
-.*:	c0 24 00 00 00 00 [	 ]*jgh	c \<foo\+0xc>
-.*:	c0 24 00 00 00 00 [	 ]*jgh	12 \<foo\+0x12>
-.*:	c0 34 00 00 00 00 [	 ]*jgnle	18 \<foo\+0x18>
-.*:	c0 44 00 00 00 00 [	 ]*jgl	1e \<foo\+0x1e>
-.*:	c0 44 00 00 00 00 [	 ]*jgl	24 \<foo\+0x24>
-.*:	c0 54 00 00 00 00 [	 ]*jgnhe	2a \<foo\+0x2a>
-.*:	c0 64 00 00 00 00 [	 ]*jglh	30 \<foo\+0x30>
-.*:	c0 74 00 00 00 00 [	 ]*jgne	36 \<foo\+0x36>
-.*:	c0 74 00 00 00 00 [	 ]*jgne	3c \<foo\+0x3c>
-.*:	c0 84 00 00 00 00 [	 ]*jge	42 \<foo\+0x42>
-.*:	c0 84 00 00 00 00 [	 ]*jge	48 \<foo\+0x48>
-.*:	c0 94 00 00 00 00 [	 ]*jgnlh	4e \<foo\+0x4e>
-.*:	c0 a4 00 00 00 00 [	 ]*jghe	54 \<foo\+0x54>
-.*:	c0 b4 00 00 00 00 [	 ]*jgnl	5a \<foo\+0x5a>
-.*:	c0 b4 00 00 00 00 [	 ]*jgnl	60 \<foo\+0x60>
-.*:	c0 c4 00 00 00 00 [	 ]*jgle	66 \<foo\+0x66>
-.*:	c0 d4 00 00 00 00 [	 ]*jgnh	6c \<foo\+0x6c>
-.*:	c0 d4 00 00 00 00 [	 ]*jgnh	72 \<foo\+0x72>
-.*:	c0 e4 00 00 00 00 [	 ]*jgno	78 \<foo\+0x78>
-.*:	c0 f4 00 00 00 00 [	 ]*jg	7e \<foo\+0x7e>
-.*:	c0 65 00 00 00 00 [	 ]*brasl	%r6,84 \<foo\+0x84>
+.*:	c0 f4 00 00 00 00 [	 ]*jg	0 <foo>
+.*:	c0 04 00 00 00 00 [	 ]*jgnop	6 <foo\+0x6>
+.*:	c0 14 00 00 00 00 [	 ]*jgo	c <foo\+0xc>
+.*:	c0 24 00 00 00 00 [	 ]*jgh	12 <foo\+0x12>
+.*:	c0 24 00 00 00 00 [	 ]*jgh	18 <foo\+0x18>
+.*:	c0 34 00 00 00 00 [	 ]*jgnle	1e <foo\+0x1e>
+.*:	c0 44 00 00 00 00 [	 ]*jgl	24 <foo\+0x24>
+.*:	c0 44 00 00 00 00 [	 ]*jgl	2a <foo\+0x2a>
+.*:	c0 54 00 00 00 00 [	 ]*jgnhe	30 <foo\+0x30>
+.*:	c0 64 00 00 00 00 [	 ]*jglh	36 <foo\+0x36>
+.*:	c0 74 00 00 00 00 [	 ]*jgne	3c <foo\+0x3c>
+.*:	c0 74 00 00 00 00 [	 ]*jgne	42 <foo\+0x42>
+.*:	c0 84 00 00 00 00 [	 ]*jge	48 <foo\+0x48>
+.*:	c0 84 00 00 00 00 [	 ]*jge	4e <foo\+0x4e>
+.*:	c0 94 00 00 00 00 [	 ]*jgnlh	54 <foo\+0x54>
+.*:	c0 a4 00 00 00 00 [	 ]*jghe	5a <foo\+0x5a>
+.*:	c0 b4 00 00 00 00 [	 ]*jgnl	60 <foo\+0x60>
+.*:	c0 b4 00 00 00 00 [	 ]*jgnl	66 <foo\+0x66>
+.*:	c0 c4 00 00 00 00 [	 ]*jgle	6c <foo\+0x6c>
+.*:	c0 d4 00 00 00 00 [	 ]*jgnh	72 <foo\+0x72>
+.*:	c0 d4 00 00 00 00 [	 ]*jgnh	78 <foo\+0x78>
+.*:	c0 e4 00 00 00 00 [	 ]*jgno	7e <foo\+0x7e>
+.*:	c0 f4 00 00 00 00 [	 ]*jg	84 <foo\+0x84>
+.*:	c0 14 00 00 00 00 [	 ]*jgo	8a <foo\+0x8a>
+.*:	c0 24 00 00 00 00 [	 ]*jgh	90 <foo\+0x90>
+.*:	c0 24 00 00 00 00 [	 ]*jgh	96 <foo\+0x96>
+.*:	c0 34 00 00 00 00 [	 ]*jgnle	9c <foo\+0x9c>
+.*:	c0 44 00 00 00 00 [	 ]*jgl	a2 <foo\+0xa2>
+.*:	c0 44 00 00 00 00 [	 ]*jgl	a8 <foo\+0xa8>
+.*:	c0 54 00 00 00 00 [	 ]*jgnhe	ae <foo\+0xae>
+.*:	c0 64 00 00 00 00 [	 ]*jglh	b4 <foo\+0xb4>
+.*:	c0 74 00 00 00 00 [	 ]*jgne	ba <foo\+0xba>
+.*:	c0 74 00 00 00 00 [	 ]*jgne	c0 <foo\+0xc0>
+.*:	c0 84 00 00 00 00 [	 ]*jge	c6 <foo\+0xc6>
+.*:	c0 84 00 00 00 00 [	 ]*jge	cc <foo\+0xcc>
+.*:	c0 94 00 00 00 00 [	 ]*jgnlh	d2 <foo\+0xd2>
+.*:	c0 a4 00 00 00 00 [	 ]*jghe	d8 <foo\+0xd8>
+.*:	c0 b4 00 00 00 00 [	 ]*jgnl	de <foo\+0xde>
+.*:	c0 b4 00 00 00 00 [	 ]*jgnl	e4 <foo\+0xe4>
+.*:	c0 c4 00 00 00 00 [	 ]*jgle	ea <foo\+0xea>
+.*:	c0 d4 00 00 00 00 [	 ]*jgnh	f0 <foo\+0xf0>
+.*:	c0 d4 00 00 00 00 [	 ]*jgnh	f6 <foo\+0xf6>
+.*:	c0 e4 00 00 00 00 [	 ]*jgno	fc <foo\+0xfc>
+.*:	c0 f4 00 00 00 00 [	 ]*jg	102 <foo\+0x102>
+.*:	c0 65 00 00 00 00 [	 ]*brasl	%r6,108 <foo\+0x108>
+.*:	c0 65 00 00 00 00 [	 ]*brasl	%r6,10e <foo\+0x10e>
 .*:	01 0b [	 ]*tam
 .*:	01 0c [	 ]*sam24
 .*:	01 0d [	 ]*sam31
@@ -39,7 +62,7 @@ Disassembly of section .text:
 .*:	b9 97 00 69 [	 ]*dlr	%r6,%r9
 .*:	b9 98 00 69 [	 ]*alcr	%r6,%r9
 .*:	b9 99 00 69 [	 ]*slbr	%r6,%r9
-.*:	c0 60 00 00 00 00 [	 ]*larl	%r6,ac \<foo\+0xac\>
+.*:	c0 60 00 00 00 00 [	 ]*larl	%r6,136 <foo\+0x136>
 .*:	e3 65 af ff 00 1e [	 ]*lrv	%r6,4095\(%r5,%r10\)
 .*:	e3 65 af ff 00 1f [	 ]*lrvh	%r6,4095\(%r5,%r10\)
 .*:	e3 65 af ff 00 3e [	 ]*strv	%r6,4095\(%r5,%r10\)
@@ -49,3 +72,4 @@ Disassembly of section .text:
 .*:	e3 65 af ff 00 98 [	 ]*alc	%r6,4095\(%r5,%r10\)
 .*:	e3 65 af ff 00 99 [	 ]*slb	%r6,4095\(%r5,%r10\)
 .*:	eb 69 5f ff 00 1d [	 ]*rll	%r6,%r9,4095\(%r5\)
+.*:	07 07 [	 ]*nopr	%r7
diff --git a/gas/testsuite/gas/s390/esa-z900.s b/gas/testsuite/gas/s390/esa-z900.s
index 815732d..7a00616 100644
--- a/gas/testsuite/gas/s390/esa-z900.s
+++ b/gas/testsuite/gas/s390/esa-z900.s
@@ -1,6 +1,7 @@
 .text
 foo:
 	brcl	15,.
+	jgnop	.
 	jgo	.
 	jgh	.
 	jgp	.
@@ -22,7 +23,29 @@ foo:
 	jgnp	.
 	jgno	.
 	jg	.
+	brol	.
+	brhl	.
+	brpl	.
+	brnlel	.
+	brll	.
+	brml	.
+	brnhel	.
+	brlhl	.
+	brnel	.
+	brnzl	.
+	brel	.
+	brzl	.
+	brnlhl	.
+	brhel	.
+	brnll	.
+	brnml	.
+	brlel	.
+	brnhl	.
+	brnpl	.
+	brnol	.
+	brul	.
 	brasl	%r6,.
+	jasl	%r6,.
 	tam
 	sam24
 	sam31
diff --git a/gas/testsuite/gas/s390/zarch-z900.d b/gas/testsuite/gas/s390/zarch-z900.d
index 8491a8f..8d292df 100644
--- a/gas/testsuite/gas/s390/zarch-z900.d
+++ b/gas/testsuite/gas/s390/zarch-z900.d
@@ -20,8 +20,11 @@ Disassembly of section .text:
 .*:	e3 95 af ff 00 46 [ 	]*bctg	%r9,4095\(%r5,%r10\)
 .*:	b9 46 00 96 [ 	]*bctgr	%r9,%r6
 .*:	a7 97 00 00 [	 ]*brctg	%r9,40 \<foo\+0x40\>
-.*:	ec 96 00 00 00 44 [ 	]*brxhg	%r9,%r6,44 <foo\+0x44>
-.*:	ec 96 00 00 00 45 [ 	]*brxlg	%r9,%r6,4a <foo\+0x4a>
+.*:	a7 67 00 00 [	 ]*brctg	%r6,44 <foo\+0x44>
+.*:	ec 96 00 00 00 44 [ 	]*brxhg	%r9,%r6,48 <foo\+0x48>
+.*:	ec 69 00 00 00 44 [	 ]*brxhg	%r6,%r9,4e <foo\+0x4e>
+.*:	ec 96 00 00 00 45 [ 	]*brxlg	%r9,%r6,54 <foo\+0x54>
+.*:	ec 69 00 00 00 45 [	 ]*brxlg	%r6,%r9,5a <foo\+0x5a>
 .*:	eb 96 5f ff 00 44 [ 	]*bxhg	%r9,%r6,4095\(%r5\)
 .*:	eb 96 5f ff 00 45 [ 	]*bxleg	%r9,%r6,4095\(%r5\)
 .*:	b3 a5 00 96 [ 	]*cdgbr	%f9,%r6
diff --git a/gas/testsuite/gas/s390/zarch-z900.s b/gas/testsuite/gas/s390/zarch-z900.s
index a175cca..96d27e7 100644
--- a/gas/testsuite/gas/s390/zarch-z900.s
+++ b/gas/testsuite/gas/s390/zarch-z900.s
@@ -14,8 +14,11 @@ foo:
 	bctg	%r9,4095(%r5,%r10)
 	bctgr	%r9,%r6
 	brctg	%r9,.
+	jctg	%r6,.
 	brxhg	%r9,%r6,.
+	jxhg	%r6,%r9,.
 	brxlg	%r9,%r6,.
+	jxleg	%r6,%r9,.
 	bxhg	%r9,%r6,4095(%r5)
 	bxleg	%r9,%r6,4095(%r5)
 	cdgbr	%f9,%r6