Implement MachineInstrInfo interface

[oota-llvm.git] / lib / Target / X86 / X86InstrInfo.cpp

diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp
index f7185348ef96adf3d50c4f071bcca08e6ae0f8b7..06abb4dbf7bd6e8f1976965988a05ffeda2f13e9 100644 (file)
--- a/lib/Target/X86/X86InstrInfo.cpp
+++ b/lib/Target/X86/X86InstrInfo.cpp
@@ -5,25 +5,26 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86InstructionInfo.h"
-#include "llvm/CodeGen/MInstruction.h"
-#include <ostream>
+#include "llvm/CodeGen/MachineInstr.h"
+#include <iostream>
 
 // X86Insts - Turn the InstructionInfo.def file into a bunch of instruction
 // descriptors
 //
-static const MInstructionDesc X86Insts[] = {
-#define I(ENUM, NAME, FLAGS, TSFLAGS) { NAME, FLAGS, TSFLAGS },
+static const MachineInstrDescriptor X86Insts[] = {
+#define I(ENUM, NAME, FLAGS, TSFLAGS) \
+             { NAME, -1, -1, 0, false, 0, 0, TSFLAGS, FLAGS },
 #include "X86InstructionInfo.def"
 };
 
 X86InstructionInfo::X86InstructionInfo()
-  : MInstructionInfo(X86Insts, sizeof(X86Insts)/sizeof(X86Insts[0])) {
+  : MachineInstrInfo(X86Insts, sizeof(X86Insts)/sizeof(X86Insts[0]), 0) {
 }
 
 
 // print - Print out an x86 instruction in GAS syntax
-void X86InstructionInfo::print(const MInstruction *MI, std::ostream &O) const {
+void X86InstructionInfo::print(const MachineInstr *MI, std::ostream &O) const {
   // FIXME: This sucks.
-  O << get(MI->getOpcode()).Name << "\n";
+  O << getName(MI->getOpCode()) << "\n";
 }