-#include <string.h>
-
-#define INSTRUCTION_SPECIFIER_FIELDS \
- struct OperandSpecifier operands[X86_MAX_OPERANDS]; \
- bool filtered; \
- InstructionContext insnContext; \
- std::string name; \
- \
- InstructionSpecifier() { \
- filtered = false; \
- insnContext = IC; \
- name = ""; \
- modifierType = MODIFIER_NONE; \
- modifierBase = 0; \
- memset(operands, 0, sizeof(operands)); \
+
+#include "../../lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h"
+
+struct InstructionSpecifier {
+ llvm::X86Disassembler::OperandSpecifier
+ operands[llvm::X86Disassembler::X86_MAX_OPERANDS];
+ llvm::X86Disassembler::InstructionContext insnContext;
+ std::string name;
+
+ InstructionSpecifier() {
+ insnContext = llvm::X86Disassembler::IC;
+ name = "";
+ memset(operands, 0, sizeof(operands));