diff options
author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-03-01 01:26:01 +0000 |
---|---|---|
committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2012-03-01 01:26:01 +0000 |
commit | 741981adf3a2bc0c6652c9c4ec846250950f3e68 (patch) | |
tree | ff48140195f34e487c7ea9178a12a397e04b8c37 /include/llvm/CodeGen | |
parent | b519a0fe0ee02804cc77cb9c40ded6604341b71c (diff) | |
download | llvm-741981adf3a2bc0c6652c9c4ec846250950f3e68.tar.gz llvm-741981adf3a2bc0c6652c9c4ec846250950f3e68.tar.bz2 llvm-741981adf3a2bc0c6652c9c4ec846250950f3e68.tar.xz |
Move getBundleStart() into MachineInstrBundle.h.
This allows the function to be inlined, and makes it suitable for use in
getInstructionIndex().
Also provide a const version. C++ is great for touch typing practice.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151782 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/CodeGen')
-rw-r--r-- | include/llvm/CodeGen/MachineInstr.h | 5 | ||||
-rw-r--r-- | include/llvm/CodeGen/MachineInstrBundle.h | 18 | ||||
-rw-r--r-- | include/llvm/CodeGen/SlotIndexes.h | 7 |
3 files changed, 19 insertions, 11 deletions
diff --git a/include/llvm/CodeGen/MachineInstr.h b/include/llvm/CodeGen/MachineInstr.h index cd94abae7e..7f29d316ea 100644 --- a/include/llvm/CodeGen/MachineInstr.h +++ b/include/llvm/CodeGen/MachineInstr.h @@ -234,11 +234,6 @@ public: /// if either itself or its following instruction is marked "InsideBundle". bool isBundled() const; - /// getBundleStart - If this instruction is inside a bundle return the - /// instruction at the start of the bundle. Otherwise just returns the - /// instruction itself. - MachineInstr* getBundleStart(); - /// getDebugLoc - Returns the debug location id of this MachineInstr. /// DebugLoc getDebugLoc() const { return debugLoc; } diff --git a/include/llvm/CodeGen/MachineInstrBundle.h b/include/llvm/CodeGen/MachineInstrBundle.h index 9552e21fca..0fb4969822 100644 --- a/include/llvm/CodeGen/MachineInstrBundle.h +++ b/include/llvm/CodeGen/MachineInstrBundle.h @@ -41,6 +41,22 @@ MachineBasicBlock::instr_iterator finalizeBundle(MachineBasicBlock &MBB, /// MachineFunction. Return true if any bundles are finalized. bool finalizeBundles(MachineFunction &MF); +/// getBundleStart - Returns the first instruction in the bundle containing MI. +/// +static inline MachineInstr *getBundleStart(MachineInstr *MI) { + MachineBasicBlock::instr_iterator I = MI; + while (I->isInsideBundle()) + --I; + return I; +} + +static inline const MachineInstr *getBundleStart(const MachineInstr *MI) { + MachineBasicBlock::const_instr_iterator I = MI; + while (I->isInsideBundle()) + --I; + return I; +} + //===----------------------------------------------------------------------===// // MachineOperand iterator // @@ -82,7 +98,7 @@ protected: /// explicit MachineOperandIteratorBase(MachineInstr *MI, bool WholeBundle) { if (WholeBundle) { - InstrI = MI->getBundleStart(); + InstrI = getBundleStart(MI); InstrE = MI->getParent()->instr_end(); } else { InstrI = InstrE = MI; diff --git a/include/llvm/CodeGen/SlotIndexes.h b/include/llvm/CodeGen/SlotIndexes.h index 6c09526b59..d868cb8dad 100644 --- a/include/llvm/CodeGen/SlotIndexes.h +++ b/include/llvm/CodeGen/SlotIndexes.h @@ -19,7 +19,7 @@ #ifndef LLVM_CODEGEN_SLOTINDEXES_H #define LLVM_CODEGEN_SLOTINDEXES_H -#include "llvm/CodeGen/MachineBasicBlock.h" +#include "llvm/CodeGen/MachineInstrBundle.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineFunctionPass.h" #include "llvm/ADT/PointerIntPair.h" @@ -495,10 +495,7 @@ namespace llvm { /// Returns the base index for the given instruction. SlotIndex getInstructionIndex(const MachineInstr *MI) const { // Instructions inside a bundle have the same number as the bundle itself. - MachineBasicBlock::const_instr_iterator I = MI; - while (I->isInsideBundle()) - --I; - Mi2IndexMap::const_iterator itr = mi2iMap.find(I); + Mi2IndexMap::const_iterator itr = mi2iMap.find(getBundleStart(MI)); assert(itr != mi2iMap.end() && "Instruction not found in maps."); return itr->second; } |