6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-20 09:30:43 +00:00
Code Issues Projects Releases Wiki Activity

Whoops. Committed the headers for r81605 - 'Moved some more index operations over to LiveIntervals.'

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81609 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lang Hames 2009-09-12 04:54:18 +00:00
parent 35f291d2c5
commit 4a39ba9926
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/llvm/CodeGen/LiveInterval.h
View File

@ -155,25 +155,25 @@ namespace llvm {
index |= PHI_BIT; index |= PHI_BIT;
} }
MachineInstrIndex nextSlot() const { MachineInstrIndex nextSlot_() const {
assert((index & PHI_BIT) == ((index + 1) & PHI_BIT) && assert((index & PHI_BIT) == ((index + 1) & PHI_BIT) &&
"Index out of bounds."); "Index out of bounds.");
return MachineInstrIndex(index + 1); return MachineInstrIndex(index + 1);
} }
MachineInstrIndex nextIndex() const { MachineInstrIndex nextIndex_() const {
assert((index & PHI_BIT) == ((index + NUM) & PHI_BIT) && assert((index & PHI_BIT) == ((index + NUM) & PHI_BIT) &&
"Index out of bounds."); "Index out of bounds.");
return MachineInstrIndex(index + NUM); return MachineInstrIndex(index + NUM);
} }
MachineInstrIndex prevSlot() const { MachineInstrIndex prevSlot_() const {
assert((index & PHI_BIT) == ((index - 1) & PHI_BIT) && assert((index & PHI_BIT) == ((index - 1) & PHI_BIT) &&
"Index out of bounds."); "Index out of bounds.");
return MachineInstrIndex(index - 1); return MachineInstrIndex(index - 1);
} }
MachineInstrIndex prevIndex() const { MachineInstrIndex prevIndex_() const {
assert((index & PHI_BIT) == ((index - NUM) & PHI_BIT) && assert((index & PHI_BIT) == ((index - NUM) & PHI_BIT) &&
"Index out of bounds."); "Index out of bounds.");
return MachineInstrIndex(index - NUM); return MachineInstrIndex(index - NUM);

24
include/llvm/CodeGen/LiveIntervalAnalysis.h
View File

@ -122,24 +122,22 @@ namespace llvm {
} }
MachineInstrIndex getStoreIndex(MachineInstrIndex index) { MachineInstrIndex getStoreIndex(MachineInstrIndex index) {
return MachineInstrIndex(index, MachineInstrIndex::STORE); return MachineInstrIndex(index, MachineInstrIndex::STORE);
} }
MachineInstrIndex getNextSlot(MachineInstrIndex m) const { MachineInstrIndex getNextSlot(MachineInstrIndex m) const {
return m.nextSlot(); return m.nextSlot_();
} }
MachineInstrIndex getNextIndex(MachineInstrIndex m) const { MachineInstrIndex getNextIndex(MachineInstrIndex m) const {
return m.nextIndex(); return m.nextIndex_();
} }
MachineInstrIndex getPrevSlot(MachineInstrIndex m) const { MachineInstrIndex getPrevSlot(MachineInstrIndex m) const {
return m.prevSlot(); return m.prevSlot_();
} }
MachineInstrIndex getPrevIndex(MachineInstrIndex m) const { MachineInstrIndex getPrevIndex(MachineInstrIndex m) const {
return m.prevIndex(); return m.prevIndex_();
} }
static float getSpillWeight(bool isDef, bool isUse, unsigned loopDepth) { static float getSpillWeight(bool isDef, bool isUse, unsigned loopDepth) {
@ -240,14 +238,14 @@ namespace llvm {
/// hasGapBeforeInstr - Return true if the previous instruction slot, /// hasGapBeforeInstr - Return true if the previous instruction slot,
/// i.e. Index - InstrSlots::NUM, is not occupied. /// i.e. Index - InstrSlots::NUM, is not occupied.
bool hasGapBeforeInstr(MachineInstrIndex Index) { bool hasGapBeforeInstr(MachineInstrIndex Index) {
Index = getBaseIndex(Index.prevIndex()); Index = getBaseIndex(getPrevIndex(Index));
return getInstructionFromIndex(Index) == 0; return getInstructionFromIndex(Index) == 0;
} }
/// hasGapAfterInstr - Return true if the successive instruction slot, /// hasGapAfterInstr - Return true if the successive instruction slot,
/// i.e. Index + InstrSlots::Num, is not occupied. /// i.e. Index + InstrSlots::Num, is not occupied.
bool hasGapAfterInstr(MachineInstrIndex Index) { bool hasGapAfterInstr(MachineInstrIndex Index) {
Index = getBaseIndex(Index.nextIndex()); Index = getBaseIndex(getNextIndex(Index));
return getInstructionFromIndex(Index) == 0; return getInstructionFromIndex(Index) == 0;
} }
@ -256,15 +254,15 @@ namespace llvm {
/// away from the index (but before any index that's occupied). /// away from the index (but before any index that's occupied).
MachineInstrIndex findGapBeforeInstr(MachineInstrIndex Index, MachineInstrIndex findGapBeforeInstr(MachineInstrIndex Index,
bool Furthest = false) { bool Furthest = false) {
Index = getBaseIndex(Index.prevIndex()); Index = getBaseIndex(getPrevIndex(Index));
if (getInstructionFromIndex(Index)) if (getInstructionFromIndex(Index))
return MachineInstrIndex(); // No gap! return MachineInstrIndex(); // No gap!
if (!Furthest) if (!Furthest)
return Index; return Index;
MachineInstrIndex PrevIndex = getBaseIndex(Index.prevIndex()); MachineInstrIndex PrevIndex = getBaseIndex(getPrevIndex(Index));
while (getInstructionFromIndex(Index)) { while (getInstructionFromIndex(Index)) {
Index = PrevIndex; Index = PrevIndex;
PrevIndex = getBaseIndex(Index.prevIndex()); PrevIndex = getBaseIndex(getPrevIndex(Index));
} }
return Index; return Index;
} }
@ -272,7 +270,7 @@ namespace llvm {
/// InsertMachineInstrInMaps - Insert the specified machine instruction /// InsertMachineInstrInMaps - Insert the specified machine instruction
/// into the instruction index map at the given index. /// into the instruction index map at the given index.
void InsertMachineInstrInMaps(MachineInstr *MI, MachineInstrIndex Index) { void InsertMachineInstrInMaps(MachineInstr *MI, MachineInstrIndex Index) {
i2miMap_[Index.index / MachineInstrIndex::NUM] = MI; i2miMap_[Index.getVecIndex()] = MI;
Mi2IndexMap::iterator it = mi2iMap_.find(MI); Mi2IndexMap::iterator it = mi2iMap_.find(MI);
assert(it == mi2iMap_.end() && "Already in map!"); assert(it == mi2iMap_.end() && "Already in map!");
mi2iMap_[MI] = Index; mi2iMap_[MI] = Index;