MIPS/opcodes: Reorder LSA and DLSA instructions

[deliverable/binutils-gdb.git] / opcodes / s390-mkopc.c

diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
index 8e0b332585338f1f64917ab54f353b9a0771f34f..0d4c9df777a45de0283f24c6a8b9762a8d9ad4d0 100644 (file)
--- a/opcodes/s390-mkopc.c
+++ b/opcodes/s390-mkopc.c
@@ -411,18 +411,18 @@ main (void)
                && (str[7] == 0 || str[7] == ',')) {
              flag_bits |= S390_INSTR_FLAG_OPTPARM;
              str += 7;
+           } else if (strncmp (str, "optparm2", 8) == 0
+                      && (str[8] == 0 || str[8] == ',')) {
+             flag_bits |= S390_INSTR_FLAG_OPTPARM2;
+             str += 8;
            } else if (strncmp (str, "htm", 3) == 0
-               && (str[3] == 0 || str[3] == ',')) {
+                      && (str[3] == 0 || str[3] == ',')) {
              flag_bits |= S390_INSTR_FLAG_HTM;
              str += 3;
            } else if (strncmp (str, "vx", 2) == 0
-               && (str[2] == 0 || str[2] == ',')) {
+                      && (str[2] == 0 || str[2] == ',')) {
              flag_bits |= S390_INSTR_FLAG_VX;
              str += 2;
-           } else if (strncmp (str, "vx2", 3) == 0
-               && (str[3] == 0 || str[3] == ',')) {
-             flag_bits |= S390_INSTR_FLAG_VX2;
-             str += 3;
            } else {
              fprintf (stderr, "Couldn't parse flags string %s\n",
                       flags_string);