* s390-mkopc.c (main): Exit with error 1 if sscanf fails

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

diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
index 7274bdce08e7f03148a3cd126e3f0d8e6f405846..b3f13ab5368590a559b705a4814bf8e951122d1b 100644 (file)
--- a/opcodes/s390-mkopc.c
+++ b/opcodes/s390-mkopc.c
@@ -1,5 +1,5 @@
 /* s390-mkopc.c -- Generates opcode table out of s390-opc.txt
-   Copyright 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2003, 2005, 2007, 2008 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of the GNU opcodes library.
@@ -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
@@ -177,9 +178,9 @@ insertExpandedMnemonic (char *opcode, char *mnemonic, char *format,
                        int min_cpu, int mode_bits)
 {
   char *tag;
-  char prefix[5];
-  char suffix[5];
-  char number[5];
+  char prefix[15];
+  char suffix[15];
+  char number[15];
   int mask_start, i = 0, tag_found = 0, reading_number = 0;
   int number_p = 0, suffix_p = 0, prefix_p = 0;
   const struct s390_cond_ext_format *ext_table;
@@ -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 ();