diff --git a/suite/MC/SystemZ/insn-good-z196.s.cs b/suite/MC/SystemZ/insn-good-z196.s.cs
index eed2d3736..dd8394c17 100644
--- a/suite/MC/SystemZ/insn-good-z196.s.cs
+++ b/suite/MC/SystemZ/insn-good-z196.s.cs
@@ -88,8 +88,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xcd = chf %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xcd = chf %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xcd = chf %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xcd = chf %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xcd = chf %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xcd = chf %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xcd = chf %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xcd = chf %r15, 0
 0xcc,0x0d,0x80,0x00,0x00,0x00 = cih %r0, -2147483648
 0xcc,0x0d,0xff,0xff,0xff,0xff = cih %r0, -1
@@ -140,8 +140,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xcf = clhf %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xcf = clhf %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xcf = clhf %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xcf = clhf %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xcf = clhf %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xcf = clhf %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xcf = clhf %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xcf = clhf %r15, 0
 0xcc,0x0f,0x00,0x00,0x00,0x00 = clih %r0, 0
 0xcc,0x0f,0x00,0x00,0x00,0x01 = clih %r0, 1
@@ -294,8 +294,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xc0 = lbh %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xc0 = lbh %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xc0 = lbh %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xc0 = lbh %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xc0 = lbh %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xc0 = lbh %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xc0 = lbh %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xc0 = lbh %r15, 0
 0xe3,0x00,0x00,0x00,0x80,0xca = lfh %r0, -524288
 0xe3,0x00,0x0f,0xff,0xff,0xca = lfh %r0, -1
@@ -304,8 +304,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xca = lfh %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xca = lfh %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xca = lfh %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xca = lfh %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xca = lfh %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xca = lfh %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xca = lfh %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xca = lfh %r15, 0
 0xe3,0x00,0x00,0x00,0x80,0xc4 = lhh %r0, -524288
 0xe3,0x00,0x0f,0xff,0xff,0xc4 = lhh %r0, -1
@@ -314,8 +314,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xc4 = lhh %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xc4 = lhh %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xc4 = lhh %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xc4 = lhh %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xc4 = lhh %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xc4 = lhh %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xc4 = lhh %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xc4 = lhh %r15, 0
 0xe3,0x00,0x00,0x00,0x80,0xc2 = llch %r0, -524288
 0xe3,0x00,0x0f,0xff,0xff,0xc2 = llch %r0, -1
@@ -324,8 +324,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xc2 = llch %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xc2 = llch %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xc2 = llch %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xc2 = llch %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xc2 = llch %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xc2 = llch %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xc2 = llch %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xc2 = llch %r15, 0
 0xe3,0x00,0x00,0x00,0x80,0xc6 = llhh %r0, -524288
 0xe3,0x00,0x0f,0xff,0xff,0xc6 = llhh %r0, -1
@@ -334,8 +334,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xc6 = llhh %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xc6 = llhh %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xc6 = llhh %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xc6 = llhh %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xc6 = llhh %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xc6 = llhh %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xc6 = llhh %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xc6 = llhh %r15, 0
 0xeb,0x00,0x00,0x00,0x00,0xf2 = loc %r0, 0, 0
 0xeb,0x0f,0x00,0x00,0x00,0xf2 = loc %r0, 0, 15
@@ -510,8 +510,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xc3 = stch %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xc3 = stch %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xc3 = stch %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xc3 = stch %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xc3 = stch %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xc3 = stch %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xc3 = stch %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xc3 = stch %r15, 0
 0xe3,0x00,0x00,0x00,0x80,0xc7 = sthh %r0, -524288
 0xe3,0x00,0x0f,0xff,0xff,0xc7 = sthh %r0, -1
@@ -520,8 +520,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xc7 = sthh %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xc7 = sthh %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xc7 = sthh %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xc7 = sthh %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xc7 = sthh %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xc7 = sthh %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xc7 = sthh %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xc7 = sthh %r15, 0
 0xe3,0x00,0x00,0x00,0x80,0xcb = stfh %r0, -524288
 0xe3,0x00,0x0f,0xff,0xff,0xcb = stfh %r0, -1
@@ -530,8 +530,8 @@
 0xe3,0x00,0x0f,0xff,0x7f,0xcb = stfh %r0, 524287
 0xe3,0x00,0x10,0x00,0x00,0xcb = stfh %r0, 0(%r1)
 0xe3,0x00,0xf0,0x00,0x00,0xcb = stfh %r0, 0(%r15)
-0xe3,0x01,0xff,0xff,0x7f,0xcb = stfh %r0, 524287(%r1,%r15)
-0xe3,0x0f,0x1f,0xff,0x7f,0xcb = stfh %r0, 524287(%r15,%r1)
+0xe3,0x01,0xff,0xff,0x7f,0xcb = stfh %r0, 524287(%r1, %r15)
+0xe3,0x0f,0x1f,0xff,0x7f,0xcb = stfh %r0, 524287(%r15, %r1)
 0xe3,0xf0,0x00,0x00,0x00,0xcb = stfh %r15, 0
 0xeb,0x00,0x00,0x00,0x00,0xf3 = stoc %r0, 0, 0
 0xeb,0x0f,0x00,0x00,0x00,0xf3 = stoc %r0, 0, 15