binutils/ChangeLog:

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

diff --git a/opcodes/s390-mkopc.c b/opcodes/s390-mkopc.c
index 126d5a94bca72a3f9b84e296d8a9faeeab107137..6aed72b8182a64d7328df4dee86a0b7db52f7e52 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,9 @@ 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,
+    S390_OPCODE_ZEC12
   };
 
 struct op_struct
@@ -48,7 +50,7 @@ struct op_struct
     char  format[16];
     int   mode_bits;
     int   min_cpu;
-    
+
     unsigned long long sort_value;
     int   no_nibbles;
   };
@@ -274,7 +276,7 @@ insertExpandedMnemonic (char *opcode, char *mnemonic, char *format,
   fprintf (stderr, "Malformed mnemonic: %s\n", mnemonic);
 }
 
-static char file_header[] =
+static const char file_header[] =
   "/* The opcode table. This file was generated by s390-mkopc.\n\n"
   "   The format of the opcode table is:\n\n"
   "   NAME          OPCODE     MASK    OPERANDS\n\n"
@@ -304,7 +306,7 @@ dumpTable (void)
       for (str = op_array[ix].opcode; *str != 0; str++)
        if (*str == '?')
          *str = '0';
-      printf ("OP%i(0x%sLL), ", 
+      printf ("OP%i(0x%sLL), ",
              op_array[ix].no_nibbles*4, op_array[ix].opcode);
       printf ("MASK_%s, INSTR_%s, ",
              op_array[ix].format, op_array[ix].format);
@@ -324,7 +326,7 @@ int
 main (void)
 {
   char currentLine[256];
-  
+
   createTable ();
 
   /*  Read opcode descriptions from `stdin'.  For each mnemonic,
@@ -334,17 +336,17 @@ 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;
       int   mode_bits;
       char  *str;
 
-      if (currentLine[0] == '#')
+      if (currentLine[0] == '#' || currentLine[0] == '\n')
         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 +364,10 @@ 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 if (strcmp (cpu_string, "zEC12") == 0)
+           min_cpu = S390_OPCODE_ZEC12;
          else {
            fprintf (stderr, "Couldn't parse cpu string %s\n", cpu_string);
            exit (1);
@@ -390,7 +396,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 ();