6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-15 05:24:01 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Refactor UpdatePredRedefs and StepForward to avoid duplication. NFC"

Browse Source 
This reverts commit 963cdbccf6e5578822836fd9b2ebece0ba9a60b7 (ie r236514)

This is to get the bots green while i investigate.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@236518 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Pete Cooper
2015-05-05 18:49:08 +00:00
parent 5ffc7bfc9a
commit 2c04d158ce
3 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/CodeGen/LivePhysRegs.cpp
View File

@ -22,17 +22,12 @@ using namespace llvm;
/// \brief Remove all registers from the set that get clobbered by the register
/// mask.
/// The clobbers set will be the list of live registers clobbered
/// by the regmask.
void LivePhysRegs::removeRegsInMask(const MachineOperand &MO,
SmallVectorImpl<std::pair<unsigned, const MachineOperand*>> *Clobbers) {
void LivePhysRegs::removeRegsInMask(const MachineOperand &MO) {
SparseSet<unsigned>::iterator LRI = LiveRegs.begin();
while (LRI != LiveRegs.end()) {
if (MO.clobbersPhysReg(*LRI)) {
if (Clobbers)
Clobbers->push_back(std::make_pair(*LRI, &MO));
if (MO.clobbersPhysReg(*LRI))
LRI = LiveRegs.erase(LRI);
} else
else
++LRI;
}
}
@ -50,7 +45,7 @@ void LivePhysRegs::stepBackward(const MachineInstr &MI) {
continue;
removeReg(Reg);
} else if (O->isRegMask())
removeRegsInMask(*O, nullptr);
removeRegsInMask(*O);
}
// Add uses to the set.
@ -68,8 +63,8 @@ void LivePhysRegs::stepBackward(const MachineInstr &MI) {
/// killed-uses, add defs. This is the not recommended way, because it depends
/// on accurate kill flags. If possible use stepBackwards() instead of this
/// function.
void LivePhysRegs::stepForward(const MachineInstr &MI,
SmallVectorImpl<std::pair<unsigned, const MachineOperand*>> &Clobbers) {
void LivePhysRegs::stepForward(const MachineInstr &MI) {
SmallVector<unsigned, 4> Defs;
// Remove killed registers from the set.
for (ConstMIBundleOperands O(&MI); O.isValid(); ++O) {
if (O->isReg()) {
@ -78,7 +73,7 @@ void LivePhysRegs::stepForward(const MachineInstr &MI,
continue;
if (O->isDef()) {
if (!O->isDead())
Clobbers.push_back(std::make_pair(Reg, &*O));
Defs.push_back(Reg);
} else {
if (!O->isKill())
continue;
@ -86,12 +81,12 @@ void LivePhysRegs::stepForward(const MachineInstr &MI,
removeReg(Reg);
}
} else if (O->isRegMask())
removeRegsInMask(*O, &Clobbers);
removeRegsInMask(*O);
}
// Add defs to the set.
for (auto Reg : Clobbers)
addReg(Reg.first);
for (unsigned i = 0, e = Defs.size(); i != e; ++i)
addReg(Defs[i]);
}
/// Prin the currently live registers to OS.