maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Make sure we emit the 'movw' and 'movt' only if it's supported. Otherwise, use a constant pool. 

llvm-svn: 142485
This commit is contained in:
Bill Wendling 2011-10-19 09:24:02 +00:00
parent 7c1634556d
commit 2977a15ab1
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
llvm/lib/Target/ARM/ARMISelLowering.cpp
View File

@ -5820,10 +5820,14 @@ EmitSjLjDispatchBlock(MachineInstr *MI, MachineBasicBlock *MBB) const {
.addImm(NumLPads)); .addImm(NumLPads));
} else { } else {
MachineConstantPool *ConstantPool = MF->getConstantPool(); MachineConstantPool *ConstantPool = MF->getConstantPool();
const Constant *C = Type *Int32Ty = Type::getInt32Ty(MF->getFunction()->getContext());
ConstantInt::get(Type::getInt32Ty(MF->getFunction()->getContext()), const Constant *C = ConstantInt::get(Int32Ty, NumLPads);
NumLPads);
unsigned Idx = ConstantPool->getConstantPoolIndex(C, 4); // MachineConstantPool wants an explicit alignment.
unsigned Align = getTargetData()->getPrefTypeAlignment(Int32Ty);
if (Align == 0)
Align = getTargetData()->getTypeAllocSize(C->getType());
unsigned Idx = ConstantPool->getConstantPoolIndex(C, Align);
unsigned VReg1 = MRI->createVirtualRegister(TRC); unsigned VReg1 = MRI->createVirtualRegister(TRC);
AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::tLDRpci)) AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::tLDRpci))
@ -5887,7 +5891,7 @@ EmitSjLjDispatchBlock(MachineInstr *MI, MachineBasicBlock *MBB) const {
AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::CMPri)) AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::CMPri))
.addReg(NewVReg1) .addReg(NewVReg1)
.addImm(NumLPads)); .addImm(NumLPads));
} else { } else if (Subtarget->hasV6T2Ops() && isUInt<16>(NumLPads)) {
unsigned VReg1 = MRI->createVirtualRegister(TRC); unsigned VReg1 = MRI->createVirtualRegister(TRC);
AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::MOVi16), VReg1) AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::MOVi16), VReg1)
.addImm(NumLPads & 0xFFFF)); .addImm(NumLPads & 0xFFFF));
@ -5903,6 +5907,24 @@ EmitSjLjDispatchBlock(MachineInstr *MI, MachineBasicBlock *MBB) const {
AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::CMPrr)) AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::CMPrr))
.addReg(NewVReg1) .addReg(NewVReg1)
.addReg(VReg2)); .addReg(VReg2));
} else {
MachineConstantPool *ConstantPool = MF->getConstantPool();
Type *Int32Ty = Type::getInt32Ty(MF->getFunction()->getContext());
const Constant *C = ConstantInt::get(Int32Ty, NumLPads);
// MachineConstantPool wants an explicit alignment.
unsigned Align = getTargetData()->getPrefTypeAlignment(Int32Ty);
if (Align == 0)
Align = getTargetData()->getTypeAllocSize(C->getType());
unsigned Idx = ConstantPool->getConstantPoolIndex(C, Align);
unsigned VReg1 = MRI->createVirtualRegister(TRC);
AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::LDRcp))
.addReg(VReg1, RegState::Define)
.addConstantPoolIndex(Idx));
AddDefaultPred(BuildMI(DispatchBB, dl, TII->get(ARM::CMPrr))
.addReg(NewVReg1)
.addReg(VReg1, RegState::Kill));
} }
BuildMI(DispatchBB, dl, TII->get(ARM::Bcc)) BuildMI(DispatchBB, dl, TII->get(ARM::Bcc))