[llvm-commits] CVS: llvm/lib/Target/X86/Makefile X86.h X86TargetMachine.cpp X86SimpInstrSelector.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

Makefile updated: 1.16 -> 1.17
X86.h updated: 1.26 -> 1.27
X86TargetMachine.cpp updated: 1.62 -> 1.63
X86SimpInstrSelector.cpp (r1.7) removed

---
Log message:

Remove some (LARGE) abandoned code for the release.  If this is ever needed
again in the future, it can be resurrected out of CVS


---
Diffs of the changes:  (+2 -17)

Index: llvm/lib/Target/X86/Makefile
diff -u llvm/lib/Target/X86/Makefile:1.16 llvm/lib/Target/X86/Makefile:1.17
--- llvm/lib/Target/X86/Makefile:1.16	Tue Apr  6 14:33:59 2004
+++ llvm/lib/Target/X86/Makefile	Thu Jul 22 16:30:35 2004
@@ -13,8 +13,7 @@
 # Make sure that tblgen is run, first thing.
 $(SourceDepend): X86GenRegisterInfo.h.inc X86GenRegisterNames.inc \
                  X86GenRegisterInfo.inc X86GenInstrNames.inc \
-                 X86GenInstrInfo.inc X86GenSimpInstrSelector.inc \
-		 X86GenInstrSelector.inc
+                 X86GenInstrInfo.inc X86GenInstrSelector.inc
 
 X86GenRegisterNames.inc::  $(SourceDir)/X86.td $(SourceDir)/X86RegisterInfo.td \
                            $(SourceDir)/../Target.td $(TBLGEN)
@@ -41,10 +40,6 @@
 	@echo "Building X86.td instruction information with tblgen"
 	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-instr-desc -o $@
 
-X86GenSimpInstrSelector.inc:: $(SourceDir)/X86InstrSel.td $(TBLGEN)
-	@echo "Building X86.td simple instruction selector with tblgen"
-	$(VERB) $(TBLGEN) -I $(BUILD_SRC_DIR) $< -gen-simp-instr-sel -o $@
-
 X86GenInstrSelector.inc:: $(SourceDir)/X86.td $(SourceDir)/X86InstrInfo.td \
                           $(SourceDir)/../Target.td $(TBLGEN)
 	@echo "Building X86.td instruction selector with tblgen"


Index: llvm/lib/Target/X86/X86.h
diff -u llvm/lib/Target/X86/X86.h:1.26 llvm/lib/Target/X86/X86.h:1.27
--- llvm/lib/Target/X86/X86.h:1.26	Tue Apr  6 14:33:59 2004
+++ llvm/lib/Target/X86/X86.h	Thu Jul 22 16:30:35 2004
@@ -29,12 +29,6 @@
 ///
 FunctionPass *createX86SimpleInstructionSelector(TargetMachine &TM);
 
-/// createX86ReallySimpleInstructionSelector - This pass converts an LLVM
-/// function into a machine code representation in an even simpler fashion
-/// than above.
-///
-FunctionPass *createX86ReallySimpleInstructionSelector(TargetMachine &TM);
-
 /// createX86PatternInstructionSelector - This pass converts an LLVM function
 /// into a machine code representation using pattern matching and a machine
 /// description file.


Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.62 llvm/lib/Target/X86/X86TargetMachine.cpp:1.63
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.62	Sat Jul 10 23:17:04 2004
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Thu Jul 22 16:30:35 2004
@@ -34,8 +34,6 @@
   cl::opt<bool> DisableOutput("disable-x86-llc-output", cl::Hidden,
                               cl::desc("Disable the X86 asm printer, for use "
                                        "when profiling the code generator."));
-  cl::opt<bool> NoSimpleISel("disable-simple-isel", cl::init(true),
-	     cl::desc("Use the hand coded 'simple' X86 instruction selector"));
 
   // Register the target.
   RegisterTarget<X86TargetMachine> X("x86", "  IA-32 (Pentium and above)");
@@ -85,10 +83,8 @@
   // Make sure that no unreachable blocks are instruction selected.
   PM.add(createUnreachableBlockEliminationPass());
 
-  if (NoPatternISel && NoSimpleISel)
+  if (NoPatternISel)
     PM.add(createX86SimpleInstructionSelector(*this));
-  else if (NoPatternISel)
-    PM.add(createX86ReallySimpleInstructionSelector(*this));
   else
     PM.add(createX86PatternInstructionSelector(*this));