From 85015a0891d4d23d0215511c7b302747e1438ad2 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 16 Aug 2004 21:55:02 +0000 Subject: [PATCH] Move MachineCodeForInstruction.h and MachineFunctionInfo.h into lib/Target/SparcV9 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15830 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/InstrSched/InstrScheduling.cpp | 6 +++--- lib/CodeGen/InstrSched/SchedGraph.cpp | 2 +- lib/CodeGen/MachineCodeForInstruction.cpp | 4 ++-- lib/CodeGen/MachineFunction.cpp | 2 +- lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp | 3 +-- lib/Target/SparcV9/InstrSched/InstrScheduling.cpp | 6 +++--- lib/Target/SparcV9/InstrSched/SchedGraph.cpp | 2 +- lib/Target/SparcV9/MachineCodeForInstruction.h | 6 +++--- lib/Target/SparcV9/MachineFunctionInfo.h | 8 ++++---- lib/Target/SparcV9/MappingInfo.cpp | 2 +- lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp | 3 +-- lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp | 4 ++-- lib/Target/SparcV9/SparcV9AsmPrinter.cpp | 2 +- lib/Target/SparcV9/SparcV9BurgISel.cpp | 3 +-- lib/Target/SparcV9/SparcV9CodeEmitter.cpp | 2 +- lib/Target/SparcV9/SparcV9FrameInfo.cpp | 2 +- lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp | 4 ++-- lib/Target/SparcV9/SparcV9RegInfo.cpp | 4 ++-- lib/Target/SparcV9/SparcV9StackSlots.cpp | 8 +++----- lib/Target/SparcV9/SparcV9TargetMachine.cpp | 4 ++-- lib/Target/SparcV9/SparcV9TmpInstr.h | 2 +- 21 files changed, 37 insertions(+), 42 deletions(-) diff --git a/lib/CodeGen/InstrSched/InstrScheduling.cpp b/lib/CodeGen/InstrSched/InstrScheduling.cpp index 240bdefe94e..13b629c1b83 100644 --- a/lib/CodeGen/InstrSched/InstrScheduling.cpp +++ b/lib/CodeGen/InstrSched/InstrScheduling.cpp @@ -13,12 +13,12 @@ //===----------------------------------------------------------------------===// #include "SchedPriorities.h" +#include "llvm/BasicBlock.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" #include "llvm/CodeGen/MachineFunction.h" -#include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "llvm/Target/TargetMachine.h" -#include "llvm/BasicBlock.h" +#include "../../Target/SparcV9/MachineCodeForInstruction.h" +#include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "Support/CommandLine.h" #include #include diff --git a/lib/CodeGen/InstrSched/SchedGraph.cpp b/lib/CodeGen/InstrSched/SchedGraph.cpp index 4913c2bfd45..03771fe01d1 100644 --- a/lib/CodeGen/InstrSched/SchedGraph.cpp +++ b/lib/CodeGen/InstrSched/SchedGraph.cpp @@ -16,10 +16,10 @@ #include "SchedGraph.h" #include "llvm/Function.h" #include "llvm/Instructions.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" +#include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/SparcV9RegInfo.h" #include "Support/STLExtras.h" #include diff --git a/lib/CodeGen/MachineCodeForInstruction.cpp b/lib/CodeGen/MachineCodeForInstruction.cpp index c4b2ee5c9f6..dee1cb91206 100644 --- a/lib/CodeGen/MachineCodeForInstruction.cpp +++ b/lib/CodeGen/MachineCodeForInstruction.cpp @@ -22,13 +22,13 @@ // //===----------------------------------------------------------------------===// -#include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "../Target/SparcV9/MachineCodeForInstruction.h" #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Type.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" +#include "../Target/SparcV9/MachineFunctionInfo.h" #include "../Target/SparcV9/MachineInstrAnnot.h" #include "../Target/SparcV9/SparcV9TmpInstr.h" using namespace llvm; diff --git a/lib/CodeGen/MachineFunction.cpp b/lib/CodeGen/MachineFunction.cpp index c1699f04c6d..dd55a9ad735 100644 --- a/lib/CodeGen/MachineFunction.cpp +++ b/lib/CodeGen/MachineFunction.cpp @@ -16,7 +16,6 @@ #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/SSARegMap.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/Passes.h" @@ -25,6 +24,7 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Type.h" +#include "../Target/SparcV9/MachineFunctionInfo.h" // FIXME #include "Support/LeakDetector.h" #include "Support/GraphWriter.h" #include diff --git a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp index 8af926c0e7d..8e11dd1da5c 100644 --- a/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp +++ b/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp @@ -18,10 +18,8 @@ #include "llvm/Instructions.h" #include "llvm/Function.h" #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" #include "llvm/CodeGen/Passes.h" #include "llvm/Support/CFG.h" -#include "Support/Casting.h" #include "llvm/Target/TargetSchedInfo.h" #include "Support/Debug.h" #include "Support/GraphWriter.h" @@ -31,6 +29,7 @@ #include #include #include +#include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/SparcV9TmpInstr.h" #include "../../Target/SparcV9/SparcV9Internals.h" #include "../../Target/SparcV9/SparcV9RegisterInfo.h" diff --git a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp index 240bdefe94e..13b629c1b83 100644 --- a/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp +++ b/lib/Target/SparcV9/InstrSched/InstrScheduling.cpp @@ -13,12 +13,12 @@ //===----------------------------------------------------------------------===// #include "SchedPriorities.h" +#include "llvm/BasicBlock.h" #include "llvm/CodeGen/MachineInstr.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" #include "llvm/CodeGen/MachineFunction.h" -#include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "llvm/Target/TargetMachine.h" -#include "llvm/BasicBlock.h" +#include "../../Target/SparcV9/MachineCodeForInstruction.h" +#include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h" #include "Support/CommandLine.h" #include #include diff --git a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp index 4913c2bfd45..03771fe01d1 100644 --- a/lib/Target/SparcV9/InstrSched/SchedGraph.cpp +++ b/lib/Target/SparcV9/InstrSched/SchedGraph.cpp @@ -16,10 +16,10 @@ #include "SchedGraph.h" #include "llvm/Function.h" #include "llvm/Instructions.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetMachine.h" +#include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/SparcV9RegInfo.h" #include "Support/STLExtras.h" #include diff --git a/lib/Target/SparcV9/MachineCodeForInstruction.h b/lib/Target/SparcV9/MachineCodeForInstruction.h index 32935bba280..fc36267cb9e 100644 --- a/lib/Target/SparcV9/MachineCodeForInstruction.h +++ b/lib/Target/SparcV9/MachineCodeForInstruction.h @@ -1,4 +1,4 @@ -//===-- llvm/CodeGen/MachineCodeForInstruction.h ----------------*- C++ -*-===// +//===-- MachineCodeForInstruction.h -----------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -25,8 +25,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H -#define LLVM_CODEGEN_MACHINECODE_FOR_INSTRUCTION_H +#ifndef MACHINECODE_FOR_INSTRUCTION_H +#define MACHINECODE_FOR_INSTRUCTION_H #include diff --git a/lib/Target/SparcV9/MachineFunctionInfo.h b/lib/Target/SparcV9/MachineFunctionInfo.h index 8afdc719e22..74a75e8e483 100644 --- a/lib/Target/SparcV9/MachineFunctionInfo.h +++ b/lib/Target/SparcV9/MachineFunctionInfo.h @@ -1,4 +1,4 @@ -//===-- llvm/CodeGen/MachineFunctionInfo.h ----------------------*- C++ -*-===// +//===-- MachineFunctionInfo.h -----------------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -15,10 +15,10 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CODEGEN_MACHINEFUNCTIONINFO_H -#define LLVM_CODEGEN_MACHINEFUNCTIONINFO_H +#ifndef MACHINEFUNCTIONINFO_H +#define MACHINEFUNCTIONINFO_H -#include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "MachineCodeForInstruction.h" #include "Support/HashExtras.h" #include "Support/hash_set" diff --git a/lib/Target/SparcV9/MappingInfo.cpp b/lib/Target/SparcV9/MappingInfo.cpp index 3aa23592888..e8c7581ed7b 100644 --- a/lib/Target/SparcV9/MappingInfo.cpp +++ b/lib/Target/SparcV9/MappingInfo.cpp @@ -46,7 +46,7 @@ #include "llvm/Pass.h" #include "llvm/Module.h" #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "MachineCodeForInstruction.h" #include "Support/StringExtras.h" namespace llvm { diff --git a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp index 8af926c0e7d..8e11dd1da5c 100644 --- a/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp +++ b/lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp @@ -18,10 +18,8 @@ #include "llvm/Instructions.h" #include "llvm/Function.h" #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" #include "llvm/CodeGen/Passes.h" #include "llvm/Support/CFG.h" -#include "Support/Casting.h" #include "llvm/Target/TargetSchedInfo.h" #include "Support/Debug.h" #include "Support/GraphWriter.h" @@ -31,6 +29,7 @@ #include #include #include +#include "../../Target/SparcV9/MachineCodeForInstruction.h" #include "../../Target/SparcV9/SparcV9TmpInstr.h" #include "../../Target/SparcV9/SparcV9Internals.h" #include "../../Target/SparcV9/SparcV9RegisterInfo.h" diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp index 74834f0cdc9..6a68a0b0b37 100644 --- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp +++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp @@ -26,6 +26,8 @@ #include "RegAllocCommon.h" #include "RegClass.h" #include "../LiveVar/FunctionLiveVarInfo.h" +#include "../MachineCodeForInstruction.h" +#include "../MachineFunctionInfo.h" #include "../SparcV9InstrInfo.h" #include "../SparcV9TmpInstr.h" #include "llvm/Constants.h" @@ -34,9 +36,7 @@ #include "llvm/Module.h" #include "llvm/Type.h" #include "llvm/Analysis/LoopInfo.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "../MachineInstrAnnot.h" diff --git a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp index 0be404d6539..fcdb5e07726 100644 --- a/lib/Target/SparcV9/SparcV9AsmPrinter.cpp +++ b/lib/Target/SparcV9/SparcV9AsmPrinter.cpp @@ -25,12 +25,12 @@ #include "llvm/Assembly/Writer.h" #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Support/Mangler.h" #include "Support/StringExtras.h" #include "Support/Statistic.h" #include "SparcV9Internals.h" +#include "MachineFunctionInfo.h" #include using namespace llvm; diff --git a/lib/Target/SparcV9/SparcV9BurgISel.cpp b/lib/Target/SparcV9/SparcV9BurgISel.cpp index 037cb32c20d..050599b83d0 100644 --- a/lib/Target/SparcV9/SparcV9BurgISel.cpp +++ b/lib/Target/SparcV9/SparcV9BurgISel.cpp @@ -21,15 +21,14 @@ #include "SparcV9TmpInstr.h" #include "SparcV9FrameInfo.h" #include "SparcV9RegisterInfo.h" +#include "MachineFunctionInfo.h" #include "llvm/CodeGen/IntrinsicLowering.h" #include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/Constants.h" #include "llvm/DerivedTypes.h" -#include "llvm/GlobalValue.h" #include "llvm/Instructions.h" #include "llvm/Intrinsics.h" #include "llvm/Module.h" diff --git a/lib/Target/SparcV9/SparcV9CodeEmitter.cpp b/lib/Target/SparcV9/SparcV9CodeEmitter.cpp index 65edfb1cf7e..e870a15e86a 100644 --- a/lib/Target/SparcV9/SparcV9CodeEmitter.cpp +++ b/lib/Target/SparcV9/SparcV9CodeEmitter.cpp @@ -26,7 +26,6 @@ #include "llvm/PassManager.h" #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/CodeGen/MachineConstantPool.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/CodeGen/MachineInstr.h" #include "llvm/Target/TargetMachine.h" @@ -38,6 +37,7 @@ #include "SparcV9TargetMachine.h" #include "SparcV9RegInfo.h" #include "SparcV9CodeEmitter.h" +#include "MachineFunctionInfo.h" #include "Config/alloca.h" namespace llvm { diff --git a/lib/Target/SparcV9/SparcV9FrameInfo.cpp b/lib/Target/SparcV9/SparcV9FrameInfo.cpp index 26d92ebb983..59e8113b8a7 100644 --- a/lib/Target/SparcV9/SparcV9FrameInfo.cpp +++ b/lib/Target/SparcV9/SparcV9FrameInfo.cpp @@ -12,8 +12,8 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" #include "llvm/Target/TargetFrameInfo.h" +#include "MachineFunctionInfo.h" #include "SparcV9FrameInfo.h" using namespace llvm; diff --git a/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp b/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp index 4f5214dd214..419b1108a7c 100644 --- a/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp +++ b/lib/Target/SparcV9/SparcV9PrologEpilogInserter.cpp @@ -20,9 +20,9 @@ #include "SparcV9RegClassInfo.h" #include "SparcV9RegisterInfo.h" #include "SparcV9FrameInfo.h" +#include "MachineFunctionInfo.h" +#include "MachineCodeForInstruction.h" #include "llvm/CodeGen/MachineFunctionPass.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" #include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/Pass.h" #include "llvm/Function.h" diff --git a/lib/Target/SparcV9/SparcV9RegInfo.cpp b/lib/Target/SparcV9/SparcV9RegInfo.cpp index b01c4fcfc72..41c17e0f200 100644 --- a/lib/Target/SparcV9/SparcV9RegInfo.cpp +++ b/lib/Target/SparcV9/SparcV9RegInfo.cpp @@ -13,9 +13,9 @@ //===----------------------------------------------------------------------===// #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" #include "llvm/CodeGen/MachineInstrBuilder.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "MachineFunctionInfo.h" +#include "MachineCodeForInstruction.h" #include "MachineInstrAnnot.h" #include "RegAlloc/LiveRangeInfo.h" #include "RegAlloc/LiveRange.h" diff --git a/lib/Target/SparcV9/SparcV9StackSlots.cpp b/lib/Target/SparcV9/SparcV9StackSlots.cpp index c21defbd4df..693d29e50d9 100644 --- a/lib/Target/SparcV9/SparcV9StackSlots.cpp +++ b/lib/Target/SparcV9/SparcV9StackSlots.cpp @@ -17,10 +17,9 @@ #include "llvm/Constant.h" #include "llvm/DerivedTypes.h" #include "llvm/Function.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" #include "llvm/CodeGen/MachineFunctionPass.h" - -namespace llvm { +#include "MachineFunctionInfo.h" +using namespace llvm; namespace { class StackSlots : public MachineFunctionPass { @@ -47,8 +46,7 @@ namespace { }; } -Pass *createStackSlotsPass(const TargetMachine &Target) { +Pass *llvm::createStackSlotsPass(const TargetMachine &Target) { return new StackSlots(Target); } -} // End llvm namespace diff --git a/lib/Target/SparcV9/SparcV9TargetMachine.cpp b/lib/Target/SparcV9/SparcV9TargetMachine.cpp index bf4188f4b2a..bca50ab083d 100644 --- a/lib/Target/SparcV9/SparcV9TargetMachine.cpp +++ b/lib/Target/SparcV9/SparcV9TargetMachine.cpp @@ -19,13 +19,13 @@ #include "llvm/CodeGen/InstrScheduling.h" #include "llvm/CodeGen/IntrinsicLowering.h" #include "llvm/CodeGen/MachineFunction.h" -#include "llvm/CodeGen/MachineFunctionInfo.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" #include "llvm/CodeGen/Passes.h" #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetMachineRegistry.h" #include "llvm/Transforms/Scalar.h" #include "MappingInfo.h" +#include "MachineFunctionInfo.h" +#include "MachineCodeForInstruction.h" #include "SparcV9Internals.h" #include "SparcV9TargetMachine.h" #include "SparcV9BurgISel.h" diff --git a/lib/Target/SparcV9/SparcV9TmpInstr.h b/lib/Target/SparcV9/SparcV9TmpInstr.h index b4a7d4935cd..fa718656623 100644 --- a/lib/Target/SparcV9/SparcV9TmpInstr.h +++ b/lib/Target/SparcV9/SparcV9TmpInstr.h @@ -16,7 +16,7 @@ #define SPARCV9TMPINSTR_H #include "llvm/Instruction.h" -#include "llvm/CodeGen/MachineCodeForInstruction.h" +#include "MachineCodeForInstruction.h" namespace llvm { -- 2.34.1