From ac15f1cda3d36954d017978f66585ea3dae34472 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sun, 20 Apr 2014 21:52:16 +0000 Subject: Don't provide two different definitions of ModRMDecision, OpcodeDecision, and ContextDecision in different source files (depending on #define magic). llvm-svn: 206720 --- llvm/utils/TableGen/X86DisassemblerShared.h | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'llvm/utils/TableGen') diff --git a/llvm/utils/TableGen/X86DisassemblerShared.h b/llvm/utils/TableGen/X86DisassemblerShared.h index 2d3d3fc1bcb..62da951be93 100644 --- a/llvm/utils/TableGen/X86DisassemblerShared.h +++ b/llvm/utils/TableGen/X86DisassemblerShared.h @@ -13,14 +13,8 @@ #include #include -#define INSTRUCTION_IDS \ - InstrUID instructionIDs[256]; - #include "../../lib/Target/X86/Disassembler/X86DisassemblerDecoderCommon.h" -#undef INSTRUCTION_SPECIFIER_FIELDS -#undef INSTRUCTION_IDS - struct InstructionSpecifier { llvm::X86Disassembler::OperandSpecifier operands[X86_MAX_OPERANDS]; llvm::X86Disassembler::InstructionContext insnContext; @@ -33,4 +27,27 @@ struct InstructionSpecifier { } }; +/// Specifies whether a ModR/M byte is needed and (if so) which +/// instruction each possible value of the ModR/M byte corresponds to. Once +/// this information is known, we have narrowed down to a single instruction. +struct ModRMDecision { + uint8_t modrm_type; + llvm::X86Disassembler::InstrUID instructionIDs[256]; +}; + +/// Specifies which set of ModR/M->instruction tables to look at +/// given a particular opcode. +struct OpcodeDecision { + ModRMDecision modRMDecisions[256]; +}; + +/// Specifies which opcode->instruction tables to look at given +/// a particular context (set of attributes). Since there are many possible +/// contexts, the decoder first uses CONTEXTS_SYM to determine which context +/// applies given a specific set of attributes. Hence there are only IC_max +/// entries in this table, rather than 2^(ATTR_max). +struct ContextDecision { + OpcodeDecision opcodeDecisions[llvm::X86Disassembler::IC_max]; +}; + #endif -- cgit v1.2.3