diff options
| -rw-r--r-- | lib/Target/Sparc/Sparc.h | 1 | ||||
| -rw-r--r-- | lib/Target/Sparc/SparcTargetMachine.cpp | 24 | ||||
| -rw-r--r-- | lib/Target/SparcV8/SparcV8.h | 1 | ||||
| -rw-r--r-- | lib/Target/SparcV8/SparcV8TargetMachine.cpp | 24 |
4 files changed, 48 insertions, 2 deletions
diff --git a/lib/Target/Sparc/Sparc.h b/lib/Target/Sparc/Sparc.h index 1cade3cd85..44ee15aeae 100644 --- a/lib/Target/Sparc/Sparc.h +++ b/lib/Target/Sparc/Sparc.h @@ -25,6 +25,7 @@ namespace llvm { FunctionPass *createSparcV8SimpleInstructionSelector(TargetMachine &TM); FunctionPass *createSparcV8CodePrinterPass(std::ostream &OS, TargetMachine &TM); + FunctionPass *createSparcV8DelaySlotFillerPass(TargetMachine &TM); } // end namespace llvm; diff --git a/lib/Target/Sparc/SparcTargetMachine.cpp b/lib/Target/Sparc/SparcTargetMachine.cpp index 1b5b80abdb..9cd97ee496 100644 --- a/lib/Target/Sparc/SparcTargetMachine.cpp +++ b/lib/Target/Sparc/SparcTargetMachine.cpp @@ -54,6 +54,12 @@ bool SparcV8TargetMachine::addPassesToEmitAssembly(PassManager &PM, if (PrintMachineCode) PM.add(createMachineFunctionPrinterPass(&std::cerr)); + PM.add(createSparcV8DelaySlotFillerPass(*this)); + + // Print machine instructions after filling delay slots. + if (PrintMachineCode) + PM.add(createMachineFunctionPrinterPass(&std::cerr)); + // Output assembly language. PM.add(createSparcV8CodePrinterPass(Out, *this)); @@ -66,7 +72,23 @@ bool SparcV8TargetMachine::addPassesToEmitAssembly(PassManager &PM, /// implement a fast dynamic compiler for this target. /// void SparcV8JITInfo::addPassesToJITCompile(FunctionPassManager &PM) { - // <insert instruction selector passes here> + PM.add(createSparcV8SimpleInstructionSelector(TM)); + + // Print machine instructions as they were initially generated. + if (PrintMachineCode) + PM.add(createMachineFunctionPrinterPass(&std::cerr)); + PM.add(createRegisterAllocator()); PM.add(createPrologEpilogCodeInserter()); + + // Print machine instructions after register allocation and prolog/epilog + // insertion. + if (PrintMachineCode) + PM.add(createMachineFunctionPrinterPass(&std::cerr)); + + PM.add(createSparcV8DelaySlotFillerPass(TM)); + + // Print machine instructions after filling delay slots. + if (PrintMachineCode) + PM.add(createMachineFunctionPrinterPass(&std::cerr)); } diff --git a/lib/Target/SparcV8/SparcV8.h b/lib/Target/SparcV8/SparcV8.h index 1cade3cd85..44ee15aeae 100644 --- a/lib/Target/SparcV8/SparcV8.h +++ b/lib/Target/SparcV8/SparcV8.h @@ -25,6 +25,7 @@ namespace llvm { FunctionPass *createSparcV8SimpleInstructionSelector(TargetMachine &TM); FunctionPass *createSparcV8CodePrinterPass(std::ostream &OS, TargetMachine &TM); + FunctionPass *createSparcV8DelaySlotFillerPass(TargetMachine &TM); } // end namespace llvm; diff --git a/lib/Target/SparcV8/SparcV8TargetMachine.cpp b/lib/Target/SparcV8/SparcV8TargetMachine.cpp index 1b5b80abdb..9cd97ee496 100644 --- a/lib/Target/SparcV8/SparcV8TargetMachine.cpp +++ b/lib/Target/SparcV8/SparcV8TargetMachine.cpp @@ -54,6 +54,12 @@ bool SparcV8TargetMachine::addPassesToEmitAssembly(PassManager &PM, if (PrintMachineCode) PM.add(createMachineFunctionPrinterPass(&std::cerr)); + PM.add(createSparcV8DelaySlotFillerPass(*this)); + + // Print machine instructions after filling delay slots. + if (PrintMachineCode) + PM.add(createMachineFunctionPrinterPass(&std::cerr)); + // Output assembly language. PM.add(createSparcV8CodePrinterPass(Out, *this)); @@ -66,7 +72,23 @@ bool SparcV8TargetMachine::addPassesToEmitAssembly(PassManager &PM, /// implement a fast dynamic compiler for this target. /// void SparcV8JITInfo::addPassesToJITCompile(FunctionPassManager &PM) { - // <insert instruction selector passes here> + PM.add(createSparcV8SimpleInstructionSelector(TM)); + + // Print machine instructions as they were initially generated. + if (PrintMachineCode) + PM.add(createMachineFunctionPrinterPass(&std::cerr)); + PM.add(createRegisterAllocator()); PM.add(createPrologEpilogCodeInserter()); + + // Print machine instructions after register allocation and prolog/epilog + // insertion. + if (PrintMachineCode) + PM.add(createMachineFunctionPrinterPass(&std::cerr)); + + PM.add(createSparcV8DelaySlotFillerPass(TM)); + + // Print machine instructions after filling delay slots. + if (PrintMachineCode) + PM.add(createMachineFunctionPrinterPass(&std::cerr)); } |