replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix PR4567. Thumb1 target was using the wrong instruction to handle sp = sub fp, #c. 

llvm-svn: 76401
This commit is contained in:
Evan Cheng 2009-07-20 06:59:32 +00:00
parent 58f9bb2ccd
commit fa60698c29
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Target/ARM/README-Thumb.txt
View File

@ -244,3 +244,7 @@ to toggle the 's' bit since they do not set CPSR when they are inside IT blocks.
Make use of hi register variants of cmp: tCMPhir / tCMPZhir. Make use of hi register variants of cmp: tCMPhir / tCMPZhir.
//===---------------------------------------------------------------------===// //===---------------------------------------------------------------------===//
Thumb1 immediate field sometimes keep pre-scaled values. See
Thumb1RegisterInfo::eliminateFrameIndex. This is inconsistent from ARM and
Thumb2.

14
llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp
View File

@ -231,8 +231,16 @@ void emitThumbRegPlusImmediate(MachineBasicBlock &MBB,
if (DestReg != BaseReg) if (DestReg != BaseReg)
DstNotEqBase = true; DstNotEqBase = true;
NumBits = 8; NumBits = 8;
Opc = isSub ? ARM::tSUBi8 : ARM::tADDi8; if (DestReg == ARM::SP) {
NeedPred = NeedCC = true; Opc = isSub ? ARM::tSUBspi : ARM::tADDspi;
assert(isMul4 && "Thumb sp inc / dec size must be multiple of 4!");
NumBits = 7;
Scale = 4;
} else {
Opc = isSub ? ARM::tSUBi8 : ARM::tADDi8;
NumBits = 8;
NeedPred = NeedCC = true;
}
isTwoAddr = true; isTwoAddr = true;
} }
@ -447,7 +455,7 @@ void Thumb1RegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
removeOperands(MI, i); removeOperands(MI, i);
MachineInstrBuilder MIB(&MI); MachineInstrBuilder MIB(&MI);
AddDefaultPred(AddDefaultT1CC(MIB).addReg(FrameReg) AddDefaultPred(AddDefaultT1CC(MIB).addReg(FrameReg)
.addImm(Offset/Scale)); .addImm(Offset / Scale));
} else { } else {
MI.getOperand(i).ChangeToRegister(FrameReg, false); MI.getOperand(i).ChangeToRegister(FrameReg, false);
MI.getOperand(i+1).ChangeToImmediate(Offset / Scale); MI.getOperand(i+1).ChangeToImmediate(Offset / Scale);