RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-13 00:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Thumb eliminateFrameIndex fixes.

Browse Source 
llvm-svn: 33652
This commit is contained in:
Evan Cheng 2007-01-30 02:36:01 +00:00
parent 99a2f7d598
commit 36f03730d0
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Target/ARM/ARMRegisterInfo.cpp
View File

@ -336,22 +336,27 @@ void emitThumbRegPlusImmediate(MachineBasicBlock &MBB,
bool isMul4 = (Bytes & 3) == 0; bool isMul4 = (Bytes & 3) == 0;
bool isTwoAddr = false; bool isTwoAddr = false;
unsigned NumBits = 1; unsigned NumBits = 1;
unsigned Scale = 1;
unsigned Opc = 0; unsigned Opc = 0;
unsigned ExtraOpc = 0; unsigned ExtraOpc = 0;
if (DestReg == BaseReg && BaseReg == ARM::SP) { if (DestReg == BaseReg && BaseReg == ARM::SP) {
assert(isMul4 && "Thumb sp inc / dec size must be multiple of 4!"); assert(isMul4 && "Thumb sp inc / dec size must be multiple of 4!");
Bytes >>= 2; // Implicitly multiplied by 4.
NumBits = 7; NumBits = 7;
Scale = 4;
Opc = isSub ? ARM::tSUBspi : ARM::tADDspi; Opc = isSub ? ARM::tSUBspi : ARM::tADDspi;
isTwoAddr = true; isTwoAddr = true;
} else if (!isSub && BaseReg == ARM::SP) { } else if (!isSub && BaseReg == ARM::SP) {
// r1 = add sp, 403
// =>
// r1 = add sp, 100 * 4
// r1 = add r1, 3
if (!isMul4) { if (!isMul4) {
Bytes &= ~3; Bytes &= ~3;
ExtraOpc = ARM::tADDi3; ExtraOpc = ARM::tADDi3;
} }
Bytes >>= 2; // Implicitly multiplied by 4.
NumBits = 8; NumBits = 8;
Scale = 4;
Opc = ARM::tADDrSPi; Opc = ARM::tADDrSPi;
} else { } else {
if (DestReg != BaseReg) { if (DestReg != BaseReg) {
@ -372,10 +377,11 @@ void emitThumbRegPlusImmediate(MachineBasicBlock &MBB,
isTwoAddr = true; isTwoAddr = true;
} }
unsigned Chunk = (1 << NumBits) - 1; unsigned Chunk = ((1 << NumBits) - 1) * Scale;
while (Bytes) { while (Bytes) {
unsigned ThisVal = (Bytes > Chunk) ? Chunk : Bytes; unsigned ThisVal = (Bytes > Chunk) ? Chunk : Bytes;
Bytes -= ThisVal; Bytes -= ThisVal;
ThisVal /= Scale;
// Build the new tADD / tSUB. // Build the new tADD / tSUB.
if (isTwoAddr) if (isTwoAddr)
BuildMI(MBB, MBBI, TII.get(Opc), DestReg).addReg(DestReg).addImm(ThisVal); BuildMI(MBB, MBBI, TII.get(Opc), DestReg).addReg(DestReg).addImm(ThisVal);
@ -388,6 +394,8 @@ void emitThumbRegPlusImmediate(MachineBasicBlock &MBB,
// r4 = add r4, imm // r4 = add r4, imm
// ... // ...
NumBits = 8; NumBits = 8;
Scale = 1;
Chunk = ((1 << NumBits) - 1) * Scale;
Opc = isSub ? ARM::tSUBi8 : ARM::tADDi8; Opc = isSub ? ARM::tSUBi8 : ARM::tADDi8;
isTwoAddr = true; isTwoAddr = true;
} }
@ -636,6 +644,13 @@ void ARMRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II) const{
} }
// Otherwise, it didn't fit. Pull in what we can to simplify the immediate. // Otherwise, it didn't fit. Pull in what we can to simplify the immediate.
if (AddrMode == ARMII::AddrModeTs) {
// Thumb tLDRspi, tSTRspi. These will change to instructions that use a
// different base register.
NumBits = 5;
Mask = (1 << NumBits) - 1;
}
ImmedOffset = ImmedOffset & Mask; ImmedOffset = ImmedOffset & Mask;
if (isSub) if (isSub)
ImmedOffset |= 1 << NumBits; ImmedOffset |= 1 << NumBits;
@ -654,7 +669,9 @@ void ARMRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II) const{
unsigned TmpReg = MI.getOperand(0).getReg(); unsigned TmpReg = MI.getOperand(0).getReg();
emitThumbRegPlusImmediate(MBB, II, TmpReg, FrameReg, emitThumbRegPlusImmediate(MBB, II, TmpReg, FrameReg,
isSub ? -Offset : Offset, TII); isSub ? -Offset : Offset, TII);
MI.setInstrDescriptor(TII.get(ARM::tLDR));
MI.getOperand(i).ChangeToRegister(TmpReg, false); MI.getOperand(i).ChangeToRegister(TmpReg, false);
MI.addRegOperand(0, false); // tLDR has an extra register operand.
} else if (TII.isStore(Opcode)) { } else if (TII.isStore(Opcode)) {
// FIXME! This is horrific!!! We need register scavenging. // FIXME! This is horrific!!! We need register scavenging.
// Our temporary workaround has marked r3 unavailable. Of course, r3 is // Our temporary workaround has marked r3 unavailable. Of course, r3 is
@ -664,16 +681,18 @@ void ARMRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II) const{
// Use r2 to materialize sp + offset // Use r2 to materialize sp + offset
// str r12, r2 // str r12, r2
// r2 = r12 // r2 = r12
unsigned DestReg = MI.getOperand(0).getReg(); unsigned ValReg = MI.getOperand(0).getReg();
unsigned TmpReg = ARM::R3; unsigned TmpReg = ARM::R3;
if (DestReg == ARM::R3) { if (ValReg == ARM::R3) {
BuildMI(MBB, II, TII.get(ARM::tMOVrr), ARM::R12).addReg(ARM::R2); BuildMI(MBB, II, TII.get(ARM::tMOVrr), ARM::R12).addReg(ARM::R2);
TmpReg = ARM::R2; TmpReg = ARM::R2;
} }
emitThumbRegPlusImmediate(MBB, II, TmpReg, FrameReg, emitThumbRegPlusImmediate(MBB, II, TmpReg, FrameReg,
isSub ? -Offset : Offset, TII); isSub ? -Offset : Offset, TII);
MI.getOperand(i).ChangeToRegister(DestReg, false); MI.setInstrDescriptor(TII.get(ARM::tSTR));
if (DestReg == ARM::R3) MI.getOperand(i).ChangeToRegister(TmpReg, false);
MI.addRegOperand(0, false); // tSTR has an extra register operand.
if (ValReg == ARM::R3)
BuildMI(MBB, II, TII.get(ARM::tMOVrr), ARM::R2).addReg(ARM::R12); BuildMI(MBB, II, TII.get(ARM::tMOVrr), ARM::R2).addReg(ARM::R12);
} else } else
assert(false && "Unexpected opcode!"); assert(false && "Unexpected opcode!");