From 52f8f56ef4efaceee7535d804bf0a844cf530c57 Mon Sep 17 00:00:00 2001 From: Alkis Evlogimenos Date: Wed, 18 Feb 2004 23:14:52 +0000 Subject: [PATCH] Move unused typedefs in private section. Add method to return interval given a register. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11608 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/LiveIntervalAnalysis.h | 8 ++++++-- include/llvm/CodeGen/LiveIntervals.h | 8 ++++++-- lib/CodeGen/LiveIntervalAnalysis.h | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/llvm/CodeGen/LiveIntervalAnalysis.h b/include/llvm/CodeGen/LiveIntervalAnalysis.h index 82cf91c2572..5aea679b571 100644 --- a/include/llvm/CodeGen/LiveIntervalAnalysis.h +++ b/include/llvm/CodeGen/LiveIntervalAnalysis.h @@ -85,8 +85,6 @@ namespace llvm { }; typedef std::list Intervals; - typedef std::map Reg2RegMap; - typedef std::vector MachineBasicBlockPtrs; private: MachineFunction* mf_; @@ -108,6 +106,7 @@ namespace llvm { typedef std::map Reg2IntervalMap; Reg2IntervalMap r2iMap_; + typedef std::map Reg2RegMap; Reg2RegMap r2rMap_; Intervals intervals_; @@ -119,6 +118,11 @@ namespace llvm { /// runOnMachineFunction - pass entry point virtual bool runOnMachineFunction(MachineFunction&); + Interval& getInterval(unsigned reg) { + assert(r2iMap_.count(reg)&& "Interval does not exist for register"); + return *r2iMap_.find(reg)->second; + } + unsigned getInstructionIndex(MachineInstr* instr) const; MachineInstr* getInstructionFromIndex(unsigned index) const; diff --git a/include/llvm/CodeGen/LiveIntervals.h b/include/llvm/CodeGen/LiveIntervals.h index 82cf91c2572..5aea679b571 100644 --- a/include/llvm/CodeGen/LiveIntervals.h +++ b/include/llvm/CodeGen/LiveIntervals.h @@ -85,8 +85,6 @@ namespace llvm { }; typedef std::list Intervals; - typedef std::map Reg2RegMap; - typedef std::vector MachineBasicBlockPtrs; private: MachineFunction* mf_; @@ -108,6 +106,7 @@ namespace llvm { typedef std::map Reg2IntervalMap; Reg2IntervalMap r2iMap_; + typedef std::map Reg2RegMap; Reg2RegMap r2rMap_; Intervals intervals_; @@ -119,6 +118,11 @@ namespace llvm { /// runOnMachineFunction - pass entry point virtual bool runOnMachineFunction(MachineFunction&); + Interval& getInterval(unsigned reg) { + assert(r2iMap_.count(reg)&& "Interval does not exist for register"); + return *r2iMap_.find(reg)->second; + } + unsigned getInstructionIndex(MachineInstr* instr) const; MachineInstr* getInstructionFromIndex(unsigned index) const; diff --git a/lib/CodeGen/LiveIntervalAnalysis.h b/lib/CodeGen/LiveIntervalAnalysis.h index 82cf91c2572..5aea679b571 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.h +++ b/lib/CodeGen/LiveIntervalAnalysis.h @@ -85,8 +85,6 @@ namespace llvm { }; typedef std::list Intervals; - typedef std::map Reg2RegMap; - typedef std::vector MachineBasicBlockPtrs; private: MachineFunction* mf_; @@ -108,6 +106,7 @@ namespace llvm { typedef std::map Reg2IntervalMap; Reg2IntervalMap r2iMap_; + typedef std::map Reg2RegMap; Reg2RegMap r2rMap_; Intervals intervals_; @@ -119,6 +118,11 @@ namespace llvm { /// runOnMachineFunction - pass entry point virtual bool runOnMachineFunction(MachineFunction&); + Interval& getInterval(unsigned reg) { + assert(r2iMap_.count(reg)&& "Interval does not exist for register"); + return *r2iMap_.find(reg)->second; + } + unsigned getInstructionIndex(MachineInstr* instr) const; MachineInstr* getInstructionFromIndex(unsigned index) const;