mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-30 02:25:19 +00:00
Make findLastUseBefore handle reg-unit liveness.
findLastUseBefore was previous considering virtreg liveness only, leading to incorrect live intervals for reg units when instrs with physreg operands were moved up. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163685 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -1196,6 +1196,8 @@ private:
|
|||||||
// Return the last use of reg between NewIdx and OldIdx.
|
// Return the last use of reg between NewIdx and OldIdx.
|
||||||
SlotIndex findLastUseBefore(unsigned Reg, SlotIndex OldIdx) {
|
SlotIndex findLastUseBefore(unsigned Reg, SlotIndex OldIdx) {
|
||||||
SlotIndex LastUse = NewIdx;
|
SlotIndex LastUse = NewIdx;
|
||||||
|
|
||||||
|
if (TargetRegisterInfo::isVirtualRegister(Reg)) {
|
||||||
for (MachineRegisterInfo::use_nodbg_iterator
|
for (MachineRegisterInfo::use_nodbg_iterator
|
||||||
UI = MRI.use_nodbg_begin(Reg),
|
UI = MRI.use_nodbg_begin(Reg),
|
||||||
UE = MRI.use_nodbg_end();
|
UE = MRI.use_nodbg_end();
|
||||||
@@ -1205,6 +1207,25 @@ private:
|
|||||||
if (InstSlot > LastUse && InstSlot < OldIdx)
|
if (InstSlot > LastUse && InstSlot < OldIdx)
|
||||||
LastUse = InstSlot;
|
LastUse = InstSlot;
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
MachineInstr* MI = LIS.getSlotIndexes()->getInstructionFromIndex(NewIdx);
|
||||||
|
MachineBasicBlock::iterator MII(MI);
|
||||||
|
++MII;
|
||||||
|
MachineBasicBlock* MBB = MI->getParent();
|
||||||
|
for (; MII != MBB->end() && LIS.getInstructionIndex(MII) < OldIdx; ++MII){
|
||||||
|
for (MachineInstr::mop_iterator MOI = MII->operands_begin(),
|
||||||
|
MOE = MII->operands_end();
|
||||||
|
MOI != MOE; ++MOI) {
|
||||||
|
const MachineOperand& mop = *MOI;
|
||||||
|
if (!mop.isReg() || mop.getReg() == 0 ||
|
||||||
|
TargetRegisterInfo::isVirtualRegister(mop.getReg()))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (TRI.hasRegUnit(mop.getReg(), Reg))
|
||||||
|
LastUse = LIS.getInstructionIndex(MII);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return LastUse;
|
return LastUse;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user