One more try to make this look nice. I have lots of pseudo lowering

as well as 16/32 bit variants to do and so I want this to look nice
when I do it. I've been experimenting with this. No new test cases
are needed.

llvm-svn: 175369
This commit is contained in:
Reed Kotler 2013-02-16 19:04:29 +00:00
parent ae526d106a
commit 188dad0eeb
2 changed files with 12 additions and 4 deletions

View File

@ -184,7 +184,7 @@ void Mips16InstrInfo::makeFrame(unsigned SP, int64_t FrameSize,
int64_t Remainder = FrameSize - Base; int64_t Remainder = FrameSize - Base;
BuildMI(MBB, I, DL, get(Mips::SaveRaF16)). addImm(Base); BuildMI(MBB, I, DL, get(Mips::SaveRaF16)). addImm(Base);
if (isInt<16>(-Remainder)) if (isInt<16>(-Remainder))
BuildMI(MBB, I, DL, AddiuSpImm(-Remainder)).addImm(-Remainder); BuildAddiuSpImm(MBB, I, -Remainder);
else else
adjustStackPtrBig(SP, -Remainder, MBB, I, Mips::V0, Mips::V1); adjustStackPtrBig(SP, -Remainder, MBB, I, Mips::V0, Mips::V1);
} }
@ -225,7 +225,7 @@ void Mips16InstrInfo::restoreFrame(unsigned SP, int64_t FrameSize,
// returns largest possible n bit unsigned integer // returns largest possible n bit unsigned integer
int64_t Remainder = FrameSize - Base; int64_t Remainder = FrameSize - Base;
if (isInt<16>(Remainder)) if (isInt<16>(Remainder))
BuildMI(MBB, I, DL, AddiuSpImm(Remainder)).addImm(Remainder); BuildAddiuSpImm(MBB, I, Remainder);
else else
adjustStackPtrBig(SP, Remainder, MBB, I, Mips::A0, Mips::A1); adjustStackPtrBig(SP, Remainder, MBB, I, Mips::A0, Mips::A1);
BuildMI(MBB, I, DL, get(Mips::RestoreRaF16)). addImm(Base); BuildMI(MBB, I, DL, get(Mips::RestoreRaF16)). addImm(Base);
@ -297,9 +297,8 @@ void Mips16InstrInfo::adjustStackPtrBigUnrestricted(unsigned SP, int64_t Amount,
void Mips16InstrInfo::adjustStackPtr(unsigned SP, int64_t Amount, void Mips16InstrInfo::adjustStackPtr(unsigned SP, int64_t Amount,
MachineBasicBlock &MBB, MachineBasicBlock &MBB,
MachineBasicBlock::iterator I) const { MachineBasicBlock::iterator I) const {
DebugLoc DL = I != MBB.end() ? I->getDebugLoc() : DebugLoc();
if (isInt<16>(Amount)) // need to change to addiu sp, ....and isInt<16> if (isInt<16>(Amount)) // need to change to addiu sp, ....and isInt<16>
BuildMI(MBB, I, DL, AddiuSpImm(Amount)).addImm(Amount); BuildAddiuSpImm(MBB, I, Amount);
else else
adjustStackPtrBigUnrestricted(SP, Amount, MBB, I); adjustStackPtrBigUnrestricted(SP, Amount, MBB, I);
} }
@ -407,6 +406,12 @@ const MCInstrDesc &Mips16InstrInfo::AddiuSpImm(int64_t Imm) const {
return get(Mips::AddiuSpImmX16); return get(Mips::AddiuSpImmX16);
} }
void Mips16InstrInfo::BuildAddiuSpImm
(MachineBasicBlock &MBB, MachineBasicBlock::iterator I, int64_t Imm) const {
DebugLoc DL = I != MBB.end() ? I->getDebugLoc() : DebugLoc();
BuildMI(MBB, I, DL, AddiuSpImm(Imm)).addImm(Imm);
}
const MipsInstrInfo *llvm::createMips16InstrInfo(MipsTargetMachine &TM) { const MipsInstrInfo *llvm::createMips16InstrInfo(MipsTargetMachine &TM) {
return new Mips16InstrInfo(TM); return new Mips16InstrInfo(TM);
} }

View File

@ -96,6 +96,9 @@ public:
const MCInstrDesc& AddiuSpImm(int64_t Imm) const; const MCInstrDesc& AddiuSpImm(int64_t Imm) const;
void BuildAddiuSpImm
(MachineBasicBlock &MBB, MachineBasicBlock::iterator I, int64_t Imm) const;
private: private:
virtual unsigned GetAnalyzableBrOpc(unsigned Opc) const; virtual unsigned GetAnalyzableBrOpc(unsigned Opc) const;