Jan Kratochvil 4f1de05
commit bfcfbe611b4d7e650236f8b8ba7d0706cfe6a0b7
Jan Kratochvil 4f1de05
Author: Andreas Krebbel <krebbel@linux.vnet.ibm.com>
Jan Kratochvil 4f1de05
Date:   Mon May 29 12:33:15 2017 +0200
Jan Kratochvil 4f1de05
Jan Kratochvil 4f1de05
    S/390: Remove optional operand flag.
Jan Kratochvil 4f1de05
    
Jan Kratochvil 4f1de05
    The per operand optional flag hasn't been used for quite some time.
Jan Kratochvil 4f1de05
    Cleanup some remains.
Jan Kratochvil 4f1de05
    
Jan Kratochvil 4f1de05
    include/ChangeLog:
Jan Kratochvil 4f1de05
    
Jan Kratochvil 4f1de05
    2017-05-30  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
Jan Kratochvil 4f1de05
    
Jan Kratochvil 4f1de05
            * opcode/s390.h: Remove S390_OPERAND_OPTIONAL.
Jan Kratochvil 4f1de05
    
Jan Kratochvil 4f1de05
    gas/ChangeLog:
Jan Kratochvil 4f1de05
    
Jan Kratochvil 4f1de05
    2017-05-30  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
Jan Kratochvil 4f1de05
    
Jan Kratochvil 4f1de05
            * config/tc-s390.c (md_gather_operands): Remove code dealing with
Jan Kratochvil 4f1de05
            S390_OPERAND_OPTIONAL.
Jan Kratochvil 4f1de05
Jan Kratochvil 4f1de05
--- a/include/opcode/s390.h
Jan Kratochvil 4f1de05
+++ b/include/opcode/s390.h
Jan Kratochvil 4f1de05
@@ -156,21 +156,17 @@ extern const struct s390_operand s390_operands[];
Jan Kratochvil 4f1de05
 /* This operand is a length.  */
Jan Kratochvil 4f1de05
 #define S390_OPERAND_LENGTH 0x200
Jan Kratochvil 4f1de05
 
Jan Kratochvil 4f1de05
-/* This operand is optional. Only a single operand at the end of
Jan Kratochvil 4f1de05
-   the instruction may be optional.  */
Jan Kratochvil 4f1de05
-#define S390_OPERAND_OPTIONAL 0x400
Jan Kratochvil 4f1de05
-
Jan Kratochvil 4f1de05
 /* The operand needs to be a valid GP or FP register pair.  */
Jan Kratochvil 4f1de05
-#define S390_OPERAND_REG_PAIR 0x800
Jan Kratochvil 4f1de05
+#define S390_OPERAND_REG_PAIR 0x400
Jan Kratochvil 4f1de05
 
Jan Kratochvil 4f1de05
 /* This operand names a vector register.  The disassembler uses this
Jan Kratochvil 4f1de05
    to print register names with a leading 'v'.  */
Jan Kratochvil 4f1de05
-#define S390_OPERAND_VR 0x1000
Jan Kratochvil 4f1de05
+#define S390_OPERAND_VR 0x800
Jan Kratochvil 4f1de05
 
Jan Kratochvil 4f1de05
-#define S390_OPERAND_CP16 0x2000
Jan Kratochvil 4f1de05
+#define S390_OPERAND_CP16 0x1000
Jan Kratochvil 4f1de05
 
Jan Kratochvil 4f1de05
-#define S390_OPERAND_OR1 0x4000
Jan Kratochvil 4f1de05
-#define S390_OPERAND_OR2 0x8000
Jan Kratochvil 4f1de05
-#define S390_OPERAND_OR8 0x10000
Jan Kratochvil 4f1de05
+#define S390_OPERAND_OR1 0x2000
Jan Kratochvil 4f1de05
+#define S390_OPERAND_OR2 0x4000
Jan Kratochvil 4f1de05
+#define S390_OPERAND_OR8 0x8000
Jan Kratochvil 4f1de05
 
Jan Kratochvil 4f1de05
 #endif /* S390_H */