2011-12-19 Chung-Lin Tang <cltang@codesourcery.com>

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

diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
index 1c1803e1c993b0f0145b4b2b0145757e5d2cda05..b3f13ab5368590a559b705a4814bf8e951122d1b 100644 (file)
--- a/opcodes/s390-mkopc.c
+++ b/opcodes/s390-mkopc.c
@@ -38,7 +38,8 @@ enum s390_opcode_cpu_val
     S390_OPCODE_Z990,
     S390_OPCODE_Z9_109,
     S390_OPCODE_Z9_EC,
-    S390_OPCODE_Z10
+    S390_OPCODE_Z10,
+    S390_OPCODE_Z196
   };
 
 struct op_struct
@@ -334,7 +335,7 @@ main (void)
       char  opcode[16];
       char  mnemonic[16];
       char  format[16];
-      char  description[64];
+      char  description[80];
       char  cpu_string[16];
       char  modes_string[16];
       int   min_cpu;
@@ -344,7 +345,7 @@ main (void)
       if (currentLine[0] == '#')
         continue;
       memset (opcode, 0, 8);
-      if (sscanf (currentLine, "%15s %15s %15s \"%[^\"]\" %15s %15s",
+      if (sscanf (currentLine, "%15s %15s %15s \"%79[^\"]\" %15s %15s",
                  opcode, mnemonic, format, description,
                  cpu_string, modes_string) == 6)
        {
@@ -362,6 +363,8 @@ main (void)
            min_cpu = S390_OPCODE_Z9_EC;
          else if (strcmp (cpu_string, "z10") == 0)
            min_cpu = S390_OPCODE_Z10;
+         else if (strcmp (cpu_string, "z196") == 0)
+           min_cpu = S390_OPCODE_Z196;
          else {
            fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);
            exit (1);
@@ -390,7 +393,10 @@ main (void)
          insertExpandedMnemonic (opcode, mnemonic, format, min_cpu, mode_bits);
        }
       else
-        fprintf (stderr, "Couldn't scan line %s\n", currentLine);
+       {
+         fprintf (stderr, "Couldn't scan line %s\n", currentLine);
+         exit (1);
+       }
     }
 
   dumpTable ();