X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Fopcode%2Fs390.h;h=c4af871ae0b66ca973a8198cc4c62e522a55a145;hb=5233f39b8b999f2675fb9493149e878c281e1d60;hp=399904c04f76209387e620dc9a1c70a519c8ed06;hpb=d9aee5d7f73be87d56ac14e0179afbd0dd59cb75;p=deliverable%2Fbinutils-gdb.git

diff --git a/include/opcode/s390.h b/include/opcode/s390.h
index 399904c04f..c4af871ae0 100644
--- a/include/opcode/s390.h
+++ b/include/opcode/s390.h
@@ -1,5 +1,5 @@
 /* s390.h -- Header file for S390 opcode table
-   Copyright 2000, 2001, 2003, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2000-2020 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -39,9 +39,22 @@ enum s390_opcode_cpu_val
     S390_OPCODE_Z9_109,
     S390_OPCODE_Z9_EC,
     S390_OPCODE_Z10,
-    S390_OPCODE_Z196
+    S390_OPCODE_Z196,
+    S390_OPCODE_ZEC12,
+    S390_OPCODE_Z13,
+    S390_OPCODE_ARCH12,
+    S390_OPCODE_ARCH13,
+    S390_OPCODE_MAXCPU
   };
 
+/* Instruction specific flags.  */
+#define S390_INSTR_FLAG_OPTPARM 0x1
+#define S390_INSTR_FLAG_OPTPARM2 0x2
+
+#define S390_INSTR_FLAG_HTM 0x4
+#define S390_INSTR_FLAG_VX 0x8
+#define S390_INSTR_FLAG_FACILITY_MASK 0xc
+
 /* The opcode table is an array of struct s390_opcode.  */
 
 struct s390_opcode
@@ -72,6 +85,9 @@ struct s390_opcode
 
     /* First cpu this opcode is available for.  */
     enum s390_opcode_cpu_val min_cpu;
+
+    /* Instruction specific flags.  */
+    unsigned int flags;
   };
 
 /* The table itself is sorted by major opcode number, and is otherwise
@@ -84,7 +100,7 @@ extern const int                s390_num_opcodes;
 extern const struct s390_opcode s390_opformats[];
 extern const int                s390_num_opformats;
 
-/* Values defined for the flags field of a struct powerpc_opcode.  */
+/* Values defined for the flags field of a struct s390_opcode.  */
 
 /* The operands table is an array of struct s390_operand.  */
 
@@ -101,7 +117,7 @@ struct s390_operand
   };
 
 /* Elements in the table are retrieved by indexing with values from
-   the operands field of the powerpc_opcodes table.  */
+   the operands field of the s390_opcodes table.  */
 
 extern const struct s390_operand s390_operands[];
 
@@ -142,8 +158,17 @@ extern const struct s390_operand s390_operands[];
 /* This operand is a length.  */
 #define S390_OPERAND_LENGTH 0x200
 
-/* This operand is optional. Only a single operand at the end of
-   the instruction may be optional.  */
-#define S390_OPERAND_OPTIONAL 0x400
+/* The operand needs to be a valid GP or FP register pair.  */
+#define S390_OPERAND_REG_PAIR 0x400
+
+/* This operand names a vector register.  The disassembler uses this
+   to print register names with a leading 'v'.  */
+#define S390_OPERAND_VR 0x800
+
+#define S390_OPERAND_CP16 0x1000
+
+#define S390_OPERAND_OR1 0x2000
+#define S390_OPERAND_OR2 0x4000
+#define S390_OPERAND_OR8 0x8000
 
-	#endif /* S390_H */
+#endif /* S390_H */