Lump the base opcode in with the X86 TargetSpecific flags

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7540 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/Target/X86/X86InstrInfo.h b/lib/Target/X86/X86InstrInfo.h
index 1482b14005..f03f29cba5 100644
--- a/lib/Target/X86/X86InstrInfo.h
+++ b/lib/Target/X86/X86InstrInfo.h
@@ -134,9 +134,11 @@ namespace X86II {
     FPTypeMask = 7 << 14,
 
     // PrintImplUses - Print out implicit uses in the assembly output.
-    PrintImplUses = 1 << 17
+    PrintImplUses = 1 << 17,
 
-    // Bits 18 -> 31 are unused
+    OpcodeMask    = 0xFF << 18,
+    OpcodeShift   = 18,
+    // Bits 26 -> 31 are unused
   };
 }
 
@@ -166,8 +168,9 @@ public:
   // getBaseOpcodeFor - This function returns the "base" X86 opcode for the
   // specified opcode number.
   //
-  unsigned char getBaseOpcodeFor(unsigned Opcode) const;
+  unsigned char getBaseOpcodeFor(unsigned Opcode) const {
+    return get(Opcode).TSFlags >> X86II::OpcodeShift;
+  }
 };
 
-
 #endif