x86: consolidate Disp<NN> handling a little

[deliverable/binutils-gdb.git] / opcodes / i386-gen.c

diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index a38513b1cb533a4c2ac884694d032860de30eb57..09fc5f8b827a0ed041e15c37e945453bc64f62f1 100644 (file)
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -615,10 +615,6 @@ static bitfield opcode_modifiers[] =
   BITFIELD (Modrm),
   BITFIELD (ShortForm),
   BITFIELD (Jump),
-  BITFIELD (JumpDword),
-  BITFIELD (JumpByte),
-  BITFIELD (JumpInterSegment),
-  BITFIELD (JumpAbsolute),
   BITFIELD (FloatMF),
   BITFIELD (FloatR),
   BITFIELD (Size),
@@ -1240,7 +1236,8 @@ process_i386_operand_type (FILE *table, char *op, enum stage stage,
          if (!active_cpu_flags.bitfield.cpu64
              && !active_cpu_flags.bitfield.cpumpx)
            set_bitfield("Disp16", types, 1, ARRAY_SIZE (types), lineno);
-         set_bitfield("Disp32", types, 1, ARRAY_SIZE (types), lineno);
+         if (!active_cpu_flags.bitfield.cpu64)
+           set_bitfield("Disp32", types, 1, ARRAY_SIZE (types), lineno);
          if (!active_cpu_flags.bitfield.cpuno64)
            set_bitfield("Disp32S", types, 1, ARRAY_SIZE (types), lineno);
        }