Initial stab at MachineInstr'ication
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4367 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/X86/Printer.cpp b/lib/Target/X86/Printer.cpp
index 88aa89c..1a42ed8 100644
--- a/lib/Target/X86/Printer.cpp
+++ b/lib/Target/X86/Printer.cpp
@@ -13,7 +13,7 @@
/// the function is in SSA form or not, although when in SSA form, we obviously
/// don't care about being consumable by an assembler.
///
-void X86PrintCode(const MFunction *MF, std::ostream &O) {
+void X86PrintCode(const MachineFunction *MF, std::ostream &O) {
O << "x86 printing not implemented yet!\n";
// This should use the X86InstructionInfo::print method to print assembly for
diff --git a/lib/Target/X86/X86.h b/lib/Target/X86/X86.h
index 135e55a..aa4508a 100644
--- a/lib/Target/X86/X86.h
+++ b/lib/Target/X86/X86.h
@@ -11,32 +11,32 @@
#define TARGET_X86_H
#include <iosfwd>
-class MFunction;
+class MachineFunction;
class Function;
/// X86PrintCode - Print out the specified machine code function to the
/// specified stream. This function should work regardless of whether or not
/// the function is in SSA form or not.
///
-void X86PrintCode(const MFunction *MF, std::ostream &O);
+void X86PrintCode(const MachineFunction *MF, std::ostream &O);
/// X86SimpleInstructionSelection - This function converts an LLVM function into
/// a machine code representation is a very simple peep-hole fashion. The
/// generated code sucks but the implementation is nice and simple.
///
-MFunction *X86SimpleInstructionSelection(Function &F);
+MachineFunction *X86SimpleInstructionSelection(Function &F);
/// X86SimpleRegisterAllocation - This function converts the specified machine
/// code function from SSA form to use explicit registers by spilling every
/// register. Wow, great policy huh?
///
-inline void X86SimpleRegisterAllocation(MFunction *MF) {}
+inline void X86SimpleRegisterAllocation(MachineFunction *MF) {}
/// X86EmitCodeToMemory - This function converts a register allocated function
/// into raw machine code in a dynamically allocated chunk of memory. A pointer
/// to the start of the function is returned.
///
-inline void *X86EmitCodeToMemory(MFunction *MF) { return 0; }
+inline void *X86EmitCodeToMemory(MachineFunction *MF) { return 0; }
// Put symbolic names in a namespace to avoid causing these to clash with all
diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp
index 88aa89c..1a42ed8 100644
--- a/lib/Target/X86/X86AsmPrinter.cpp
+++ b/lib/Target/X86/X86AsmPrinter.cpp
@@ -13,7 +13,7 @@
/// the function is in SSA form or not, although when in SSA form, we obviously
/// don't care about being consumable by an assembler.
///
-void X86PrintCode(const MFunction *MF, std::ostream &O) {
+void X86PrintCode(const MachineFunction *MF, std::ostream &O) {
O << "x86 printing not implemented yet!\n";
// This should use the X86InstructionInfo::print method to print assembly for
diff --git a/lib/Target/X86/X86InstrInfo.h b/lib/Target/X86/X86InstrInfo.h
index 116e6b1..95c2925 100644
--- a/lib/Target/X86/X86InstrInfo.h
+++ b/lib/Target/X86/X86InstrInfo.h
@@ -7,7 +7,7 @@
#ifndef X86INSTRUCTIONINFO_H
#define X86INSTRUCTIONINFO_H
-#include "llvm/Target/MInstructionInfo.h"
+#include "llvm/Target/InstructionInfo.h"
#include "X86RegisterInfo.h"
class X86InstructionInfo : public MInstructionInfo {