diff options
| author | Chris Lattner <sabre@nondot.org> | 2002-10-29 15:45:20 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2002-10-29 15:45:20 +0000 |
| commit | 047bbafb99a353ed68e60eab147f5822a09a99ea (patch) | |
| tree | 94b28ebd2d43396a312bacbebc63b0d28bb64988 | |
| parent | d020801aeaacbee4dc139bb08f81e44bc53b872e (diff) | |
MachineInstrInfo doesn't need a TargetMachine
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4372 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/SparcV9/SparcV9InstrInfo.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/SparcV9/SparcV9Internals.h | 2 | ||||
| -rw-r--r-- | lib/Target/SparcV9/SparcV9TargetMachine.cpp | 1 | ||||
| -rw-r--r-- | lib/Target/TargetInstrInfo.cpp | 5 |
4 files changed, 5 insertions, 7 deletions
diff --git a/lib/Target/SparcV9/SparcV9InstrInfo.cpp b/lib/Target/SparcV9/SparcV9InstrInfo.cpp index fbabe93316..134bdacae0 100644 --- a/lib/Target/SparcV9/SparcV9InstrInfo.cpp +++ b/lib/Target/SparcV9/SparcV9InstrInfo.cpp @@ -324,8 +324,8 @@ InitializeMaxConstantsTable() //--------------------------------------------------------------------------- /*ctor*/ -UltraSparcInstrInfo::UltraSparcInstrInfo(const TargetMachine& tgt) - : MachineInstrInfo(tgt, SparcMachineInstrDesc, +UltraSparcInstrInfo::UltraSparcInstrInfo() + : MachineInstrInfo(SparcMachineInstrDesc, /*descSize = */ NUM_TOTAL_OPCODES, /*numRealOpCodes = */ NUM_REAL_OPCODES) { diff --git a/lib/Target/SparcV9/SparcV9Internals.h b/lib/Target/SparcV9/SparcV9Internals.h index 6f283001c9..9be6b7fe58 100644 --- a/lib/Target/SparcV9/SparcV9Internals.h +++ b/lib/Target/SparcV9/SparcV9Internals.h @@ -76,7 +76,7 @@ extern const MachineInstrDescriptor SparcMachineInstrDesc[]; //--------------------------------------------------------------------------- struct UltraSparcInstrInfo : public MachineInstrInfo { - UltraSparcInstrInfo(const TargetMachine& tgt); + UltraSparcInstrInfo(); // // All immediate constants are in position 1 except the diff --git a/lib/Target/SparcV9/SparcV9TargetMachine.cpp b/lib/Target/SparcV9/SparcV9TargetMachine.cpp index 42ffd433f0..f04fcf5285 100644 --- a/lib/Target/SparcV9/SparcV9TargetMachine.cpp +++ b/lib/Target/SparcV9/SparcV9TargetMachine.cpp @@ -126,7 +126,6 @@ UltraSparcFrameInfo::getDynamicAreaOffset(MachineFunction& mcInfo, UltraSparc::UltraSparc() : TargetMachine("UltraSparc-Native"), - instrInfo(*this), schedInfo(*this), regInfo(*this), frameInfo(*this), diff --git a/lib/Target/TargetInstrInfo.cpp b/lib/Target/TargetInstrInfo.cpp index ca26718708..a911116f7b 100644 --- a/lib/Target/TargetInstrInfo.cpp +++ b/lib/Target/TargetInstrInfo.cpp @@ -15,11 +15,10 @@ //--------------------------------------------------------------------------- -MachineInstrInfo::MachineInstrInfo(const TargetMachine& tgt, - const MachineInstrDescriptor* Desc, +MachineInstrInfo::MachineInstrInfo(const MachineInstrDescriptor* Desc, unsigned DescSize, unsigned NumRealOpCodes) - : target(tgt), desc(Desc), descSize(DescSize), numRealOpCodes(NumRealOpCodes) { + : desc(Desc), descSize(DescSize), numRealOpCodes(NumRealOpCodes) { // FIXME: TargetInstrDescriptors should not be global assert(TargetInstrDescriptors == NULL && desc != NULL); TargetInstrDescriptors = desc; // initialize global variable |