include/llvm/CodeGen/MachineInstrBuilder.h: Add addClobber() inline

 convenience method.  Fix typo in comment.
lib/Target/X86/InstSelectSimple.cpp: Explicitly specify some implicit uses.
 Use MOVZX/MOVSX instead of MOV instructions with sign extend instructions.
 Take out LEAVE instructions.
 32-bit IDIV and DIV use CDQ, not CWQ (CWQ is a typo).
 Fix typo in comment and remove some FIXME comments.
lib/Target/X86/Printer.cpp: Include X86InstrInfo.h and llvm/Function.h.
 Add some simple code to Printer::runOnFunction to iterate over
  MachineBasicBlocks and call X86InstrInfo::print().
lib/Target/X86/X86InstrInfo.def: Make some more instructions with
 implicit defs "Void".  Add more sign/zero extending "move" insns
 (movsx, movzx).
lib/Target/X86/X86RegisterInfo.def: Add EFLAGS as a register.


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

1 files changed, 34 insertions, 8 deletions

diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp
index b320e2c..fdb444e 100644
--- a/lib/Target/X86/X86AsmPrinter.cpp
+++ b/lib/Target/X86/X86AsmPrinter.cpp
@@ -6,7 +6,10 @@
 //===----------------------------------------------------------------------===//
 
 #include "X86.h"
+#include "X86InstrInfo.h"
 #include "llvm/Pass.h"
+#include "llvm/Function.h"
+#include "llvm/Target/TargetMachine.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include <iostream>
 
@@ -21,17 +24,40 @@ namespace {
   };
 }
 
-bool Printer::runOnFunction(Function &F) {
-  MachineFunction &MF = MachineFunction::get(&F);
-  O << "x86 printing not implemented yet!\n";
-  
-  // This should use the X86InstructionInfo::print method to print assembly
-  // for each instruction
-  return false;
-}
+/// runOnFunction - This uses the X86InstructionInfo::print method
+/// to print assembly for each instruction.
+bool Printer::runOnFunction (Function & F)
+{
+  static unsigned bbnumber = 0;
+  MachineFunction & MF = MachineFunction::get (&F);
+  const MachineInstrInfo & MII = TM.getInstrInfo ();
+  const X86InstrInfo & x86ii = dynamic_cast <const X86InstrInfo &> (MII);
+
+  O << "# x86 printing not implemented yet!\n";
 
+  // Print out labels for the function.
+  O << "\t.globl\t" << F.getName () << "\n";
+  O << "\t.type\t" << F.getName () << ", @function\n";
+  O << F.getName () << ":\n";
 
+  // Print out code for the function.
+  for (MachineFunction::const_iterator bb_i = MF.begin (), bb_e = MF.end ();
+       bb_i != bb_e; ++bb_i)
+    {
+      // Print a label for the basic block.
+      O << ".BB" << bbnumber++ << ":\n";
+      for (MachineBasicBlock::const_iterator i_i = bb_i->begin (), i_e =
+	   bb_i->end (); i_i != i_e; ++i_i)
+	{
+	  // Print the assembly for the instruction.
+	  O << "\t";
+	  x86ii.print (*i_i, O);
+	}
+    }
 
+  // We didn't modify anything.
+  return false;
+}
 
 /// createX86CodePrinterPass - Print out the specified machine code function to
 /// the specified stream.  This function should work regardless of whether or