Implement printing more, implement opcode output more

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

diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp
index f7185348ef96adf3d50c4f071bcca08e6ae0f8b7..fa3537c6482c2064f9c90adebac3e68b71ebeee1 100644 (file)
--- a/lib/Target/X86/X86InstrInfo.cpp
+++ b/lib/Target/X86/X86InstrInfo.cpp
@@ -1,29 +1,40 @@
-//===- X86InstructionInfo.cpp - X86 Instruction Information ---------------===//
+//===- X86InstrInfo.cpp - X86 Instruction Information ---------------===//
 //
-// This file contains the X86 implementation of the MInstructionInfo class.
+// This file contains the X86 implementation of the MachineInstrInfo class.
 //
 //===----------------------------------------------------------------------===//
 
-#include "X86InstructionInfo.h"
-#include "llvm/CodeGen/MInstruction.h"
-#include <ostream>
+#include "X86InstrInfo.h"
+#include "llvm/CodeGen/MachineInstr.h"
+#include <iostream>
 
-// X86Insts - Turn the InstructionInfo.def file into a bunch of instruction
+// X86Insts - Turn the InstrInfo.def file into a bunch of instruction
 // descriptors
 //
-static const MInstructionDesc X86Insts[] = {
-#define I(ENUM, NAME, FLAGS, TSFLAGS) { NAME, FLAGS, TSFLAGS },
-#include "X86InstructionInfo.def"
+static const MachineInstrDescriptor X86Insts[] = {
+#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS)   \
+             { NAME,                    \
+               -1, /* Always vararg */  \
+               ((TSFLAGS) & X86II::Void) ? -1 : 0,  /* Result is in 0 */ \
+               0, false, 0, 0, TSFLAGS, FLAGS, TSFLAGS },
+#include "X86InstrInfo.def"
 };
 
-X86InstructionInfo::X86InstructionInfo()
-  : MInstructionInfo(X86Insts, sizeof(X86Insts)/sizeof(X86Insts[0])) {
+X86InstrInfo::X86InstrInfo()
+  : 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 {
-  // FIXME: This sucks.
-  O << get(MI->getOpcode()).Name << "\n";
-}
+static unsigned char BaseOpcodes[] = {
+#define I(ENUM, NAME, BASEOPCODE, FLAGS, TSFLAGS) BASEOPCODE,
+#include "X86InstrInfo.def"
+};
 
+// getBaseOpcodeFor - This function returns the "base" X86 opcode for the
+// specified opcode number.
+//
+unsigned char X86InstrInfo::getBaseOpcodeFor(unsigned Opcode) const {
+  assert(Opcode < sizeof(BaseOpcodes)/sizeof(BaseOpcodes[0]) &&
+         "Opcode out of range!");
+  return BaseOpcodes[Opcode];
+}