x86: drop redundant i.operands checks from output_disp()

The opcode space, major opcode, and - where applicable - opcode
extension checks fully qualify the insns we're after; operand matching
has been done far earlier, so wrong operand counts cannot occur here.

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index d648158b19cd5f73d0f5a9e579f864aa175de86b..9cfc4df1e10f13dd12d3490c9e2a958494c40cb8 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -12943,17 +12943,14 @@ output_disp (fragS *insn_start_frag, offsetT insn_start_off)
                  && (i.rm.mode == 2
                      || (i.rm.mode == 0 && i.rm.regmem == 5))
                  && ((space == SPACE_BASE
-                      && i.operands == 1
                       && i.tm.base_opcode == 0xff
                       && (i.rm.reg == 2 || i.rm.reg == 4))
                      || ((space == SPACE_BASE
                           || space == SPACE_0F38
                           || space == SPACE_MAP4)
-                         && i.operands == 2
                          && i.tm.base_opcode == 0x8b)
                      || ((space == SPACE_BASE
                           || space == SPACE_MAP4)
-                         && i.operands >= 2
                          && (i.tm.base_opcode == 0x85
                              || (i.tm.base_opcode
                                  | (i.operands > 2 ? 0x3a : 0x38)) == 0x3b))))