From 143e0ea43d042f1fe1bbe7130aa981a1a0d04386 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 2 Jun 2004 05:47:26 +0000 Subject: [PATCH] Adjust to new TM interfaces git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13949 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Sparc/SparcAsmPrinter.cpp | 2 +- lib/Target/Sparc/SparcTargetMachine.h | 7 ++----- lib/Target/SparcV8/SparcV8AsmPrinter.cpp | 2 +- lib/Target/SparcV8/SparcV8TargetMachine.h | 7 ++----- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/lib/Target/Sparc/SparcAsmPrinter.cpp b/lib/Target/Sparc/SparcAsmPrinter.cpp index 06e11b0057a..0808575e788 100644 --- a/lib/Target/Sparc/SparcAsmPrinter.cpp +++ b/lib/Target/Sparc/SparcAsmPrinter.cpp @@ -464,7 +464,7 @@ void V8Printer::printBaseOffsetPair (const MachineInstr *MI, int i) { /// void V8Printer::printMachineInstruction(const MachineInstr *MI) { unsigned Opcode = MI->getOpcode(); - const TargetInstrInfo &TII = TM.getInstrInfo(); + const TargetInstrInfo &TII = *TM.getInstrInfo(); const TargetInstrDescriptor &Desc = TII.get(Opcode); O << Desc.Name << " "; diff --git a/lib/Target/Sparc/SparcTargetMachine.h b/lib/Target/Sparc/SparcTargetMachine.h index 13f655ab1f1..cbb8e043dd1 100644 --- a/lib/Target/Sparc/SparcTargetMachine.h +++ b/lib/Target/Sparc/SparcTargetMachine.h @@ -31,8 +31,8 @@ class SparcV8TargetMachine : public TargetMachine { public: SparcV8TargetMachine(const Module &M, IntrinsicLowering *IL); - virtual const SparcV8InstrInfo &getInstrInfo() const { return InstrInfo; } - virtual const TargetFrameInfo &getFrameInfo() const { return FrameInfo; } + virtual const SparcV8InstrInfo *getInstrInfo() const { return &InstrInfo; } + virtual const TargetFrameInfo *getFrameInfo() const { return &FrameInfo; } virtual const MRegisterInfo *getRegisterInfo() const { return &InstrInfo.getRegisterInfo(); } @@ -40,9 +40,6 @@ public: return &JITInfo; } - virtual const TargetSchedInfo &getSchedInfo() const { abort(); } - virtual const TargetRegInfo &getRegInfo() const { abort(); } - /// addPassesToEmitMachineCode - Add passes to the specified pass manager to /// get machine code emitted. This uses a MachineCodeEmitter object to handle /// actually outputting the machine code and resolving things like the address diff --git a/lib/Target/SparcV8/SparcV8AsmPrinter.cpp b/lib/Target/SparcV8/SparcV8AsmPrinter.cpp index 06e11b0057a..0808575e788 100644 --- a/lib/Target/SparcV8/SparcV8AsmPrinter.cpp +++ b/lib/Target/SparcV8/SparcV8AsmPrinter.cpp @@ -464,7 +464,7 @@ void V8Printer::printBaseOffsetPair (const MachineInstr *MI, int i) { /// void V8Printer::printMachineInstruction(const MachineInstr *MI) { unsigned Opcode = MI->getOpcode(); - const TargetInstrInfo &TII = TM.getInstrInfo(); + const TargetInstrInfo &TII = *TM.getInstrInfo(); const TargetInstrDescriptor &Desc = TII.get(Opcode); O << Desc.Name << " "; diff --git a/lib/Target/SparcV8/SparcV8TargetMachine.h b/lib/Target/SparcV8/SparcV8TargetMachine.h index 13f655ab1f1..cbb8e043dd1 100644 --- a/lib/Target/SparcV8/SparcV8TargetMachine.h +++ b/lib/Target/SparcV8/SparcV8TargetMachine.h @@ -31,8 +31,8 @@ class SparcV8TargetMachine : public TargetMachine { public: SparcV8TargetMachine(const Module &M, IntrinsicLowering *IL); - virtual const SparcV8InstrInfo &getInstrInfo() const { return InstrInfo; } - virtual const TargetFrameInfo &getFrameInfo() const { return FrameInfo; } + virtual const SparcV8InstrInfo *getInstrInfo() const { return &InstrInfo; } + virtual const TargetFrameInfo *getFrameInfo() const { return &FrameInfo; } virtual const MRegisterInfo *getRegisterInfo() const { return &InstrInfo.getRegisterInfo(); } @@ -40,9 +40,6 @@ public: return &JITInfo; } - virtual const TargetSchedInfo &getSchedInfo() const { abort(); } - virtual const TargetRegInfo &getRegInfo() const { abort(); } - /// addPassesToEmitMachineCode - Add passes to the specified pass manager to /// get machine code emitted. This uses a MachineCodeEmitter object to handle /// actually outputting the machine code and resolving things like the address