6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

ARMLoadStoreOptimizer: Code cleanup; NFC

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238289 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matthias Braun 2015-05-27 05:12:40 +00:00
parent f5b4273058
commit 63e9bfa72b
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/Target/ARM/ARMLoadStoreOptimizer.cpp
View File

@ -447,8 +447,7 @@ ARMLoadStoreOpt::UpdateBaseRegUses(MachineBasicBlock &MBB,
if (InsertSub) { if (InsertSub) {
// An instruction above couldn't be updated, so insert a sub. // An instruction above couldn't be updated, so insert a sub.
AddDefaultT1CC(BuildMI(MBB, MBBI, dl, TII->get(ARM::tSUBi8), Base), true) AddDefaultT1CC(BuildMI(MBB, MBBI, dl, TII->get(ARM::tSUBi8), Base), true)
.addReg(Base, getKillRegState(false)).addImm(WordOffset * 4) .addReg(Base).addImm(WordOffset * 4).addImm(Pred).addReg(PredReg);
.addImm(Pred).addReg(PredReg);
return; return;
} }
@ -466,8 +465,7 @@ ARMLoadStoreOpt::UpdateBaseRegUses(MachineBasicBlock &MBB,
if (MBBI != MBB.end()) --MBBI; if (MBBI != MBB.end()) --MBBI;
AddDefaultT1CC( AddDefaultT1CC(
BuildMI(MBB, MBBI, dl, TII->get(ARM::tSUBi8), Base), true) BuildMI(MBB, MBBI, dl, TII->get(ARM::tSUBi8), Base), true)
.addReg(Base, getKillRegState(false)).addImm(WordOffset * 4) .addReg(Base).addImm(WordOffset * 4).addImm(Pred).addReg(PredReg);
.addImm(Pred).addReg(PredReg);
} }
} }
@ -499,8 +497,8 @@ ARMLoadStoreOpt::MergeOps(MachineBasicBlock &MBB,
// non-writeback. // non-writeback.
// It's also not possible to merge an STR of the base register in Thumb1. // It's also not possible to merge an STR of the base register in Thumb1.
if (isThumb1) if (isThumb1)
for (unsigned I = 0; I < NumRegs; ++I) for (const std::pair<unsigned, bool> &R : Regs)
if (Base == Regs[I].first) { if (Base == R.first) {
assert(Base != ARM::SP && "Thumb1 does not allow SP in register list"); assert(Base != ARM::SP && "Thumb1 does not allow SP in register list");
if (Opcode == ARM::tLDRi) { if (Opcode == ARM::tLDRi) {
Writeback = false; Writeback = false;
@ -656,13 +654,13 @@ ARMLoadStoreOpt::MergeOps(MachineBasicBlock &MBB,
MIB.addImm(Pred).addReg(PredReg); MIB.addImm(Pred).addReg(PredReg);
for (unsigned i = 0; i != NumRegs; ++i) for (const std::pair<unsigned, bool> &R : Regs)
MIB = MIB.addReg(Regs[i].first, getDefRegState(isDef) MIB = MIB.addReg(R.first, getDefRegState(isDef)
| getKillRegState(Regs[i].second)); | getKillRegState(R.second));
// Add implicit defs for super-registers. // Add implicit defs for super-registers.
for (unsigned i = 0, e = ImpDefs.size(); i != e; ++i) for (unsigned ImpDef : ImpDefs)
MIB.addReg(ImpDefs[i], RegState::ImplicitDefine); MIB.addReg(ImpDef, RegState::ImplicitDefine);
return true; return true;
} }
@ -919,7 +917,7 @@ static bool isMatchingDecrement(MachineInstr *MI, unsigned Base,
case ARM::t2SUBri: case ARM::t2SUBri:
case ARM::SUBri: case ARM::SUBri:
CheckCPSRDef = true; CheckCPSRDef = true;
// fallthrough break;
case ARM::tSUBspi: case ARM::tSUBspi:
break; break;
} }
@ -954,7 +952,7 @@ static bool isMatchingIncrement(MachineInstr *MI, unsigned Base,
case ARM::t2ADDri: case ARM::t2ADDri:
case ARM::ADDri: case ARM::ADDri:
CheckCPSRDef = true; CheckCPSRDef = true;
// fallthrough break;
case ARM::tADDspi: case ARM::tADDspi:
break; break;
} }
@ -1612,7 +1610,6 @@ bool ARMLoadStoreOpt::LoadStoreMultipleOpti(MachineBasicBlock &MBB) {
bool Advance = false; bool Advance = false;
bool TryMerge = false; bool TryMerge = false;
bool Clobber = false;
bool isMemOp = isMemoryOp(MBBI); bool isMemOp = isMemoryOp(MBBI);
if (isMemOp) { if (isMemOp) {
@ -1634,7 +1631,7 @@ bool ARMLoadStoreOpt::LoadStoreMultipleOpti(MachineBasicBlock &MBB) {
// looks like the later ldr(s) use the same base register. Try to // looks like the later ldr(s) use the same base register. Try to
// merge the ldr's so far, including this one. But don't try to // merge the ldr's so far, including this one. But don't try to
// combine the following ldr(s). // combine the following ldr(s).
Clobber = (isi32Load(Opcode) && Base == MBBI->getOperand(0).getReg()); bool Clobber = isi32Load(Opcode) && Base == MBBI->getOperand(0).getReg();
// Watch out for: // Watch out for:
// r4 := ldr [r0, #8] // r4 := ldr [r0, #8]