6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-25 16:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Expand GEP handling for constant offsets.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@116594 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher 2010-10-15 18:02:07 +00:00
parent 824c10ece2
commit 2896df897c
1 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
lib/Target/ARM/ARMFastISel.cpp
View File

@ -138,7 +138,7 @@ class ARMFastISel : public FastISel {
bool ARMEmitLoad(EVT VT, unsigned &ResultReg, unsigned Reg, int Offset); bool ARMEmitLoad(EVT VT, unsigned &ResultReg, unsigned Reg, int Offset);
bool ARMEmitStore(EVT VT, unsigned SrcReg, unsigned Reg, int Offset); bool ARMEmitStore(EVT VT, unsigned SrcReg, unsigned Reg, int Offset);
bool ARMComputeRegOffset(const Value *Obj, unsigned &Reg, int &Offset); bool ARMComputeRegOffset(const Value *Obj, unsigned &Reg, int &Offset);
unsigned ARMSimplifyRegOffset(unsigned Reg, int &Offset); void ARMSimplifyRegOffset(unsigned &Reg, int &Offset, EVT VT);
unsigned ARMMaterializeFP(const ConstantFP *CFP, EVT VT); unsigned ARMMaterializeFP(const ConstantFP *CFP, EVT VT);
unsigned ARMMaterializeInt(const Constant *C, EVT VT); unsigned ARMMaterializeInt(const Constant *C, EVT VT);
unsigned ARMMaterializeGV(const GlobalValue *GV, EVT VT); unsigned ARMMaterializeGV(const GlobalValue *GV, EVT VT);
@ -605,8 +605,9 @@ bool ARMFastISel::ARMComputeRegOffset(const Value *Obj, unsigned &Reg,
} }
case Instruction::GetElementPtr: { case Instruction::GetElementPtr: {
int SavedOffset = Offset; int SavedOffset = Offset;
unsigned SavedReg = Reg;
int TmpOffset = Offset; int TmpOffset = Offset;
// Iterate through the GEP folding the constants into offsets where // Iterate through the GEP folding the constants into offsets where
// we can. // we can.
gep_type_iterator GTI = gep_type_begin(U); gep_type_iterator GTI = gep_type_begin(U);
@ -618,24 +619,43 @@ bool ARMFastISel::ARMComputeRegOffset(const Value *Obj, unsigned &Reg,
unsigned Idx = cast<ConstantInt>(Op)->getZExtValue(); unsigned Idx = cast<ConstantInt>(Op)->getZExtValue();
TmpOffset += SL->getElementOffset(Idx); TmpOffset += SL->getElementOffset(Idx);
} else { } else {
goto unsupported_gep; uint64_t S = TD.getTypeAllocSize(GTI.getIndexedType());
SmallVector<const Value *, 4> Worklist;
Worklist.push_back(Op);
do {
Op = Worklist.pop_back_val();
if (const ConstantInt *CI = dyn_cast<ConstantInt>(Op)) {
// Constant-offset addressing.
TmpOffset += CI->getSExtValue() * S;
} else if (0 && isa<AddOperator>(Op) &&
isa<ConstantInt>(cast<AddOperator>(Op)->getOperand(1))) {
// An add with a constant operand. Fold the constant.
ConstantInt *CI =
cast<ConstantInt>(cast<AddOperator>(Op)->getOperand(1));
TmpOffset += CI->getSExtValue() * S;
// Add the other operand back to the work list.
Worklist.push_back(cast<AddOperator>(Op)->getOperand(0));
} else
goto unsupported_gep;
} while (!Worklist.empty());
} }
} }
// Try to grab the base operand now.
Offset = TmpOffset; Offset = TmpOffset;
if (ARMComputeRegOffset(U->getOperand(0), Reg, Offset)) return true; if (ARMComputeRegOffset(U->getOperand(0), Reg, Offset)) return true;
// We failed, restore everything and try the other options.
Offset = SavedOffset; Offset = SavedOffset;
break; Reg = SavedReg;
unsupported_gep: unsupported_gep:
// errs() << "GEP: " << *U << "\n";
break; break;
} }
case Instruction::Alloca: { case Instruction::Alloca: {
// TODO: Fix this to do intermediate loads, etc. // TODO: Fix this to do intermediate loads, etc.
if (Offset != 0) return false; if (Offset != 0) return false;
const AllocaInst *AI = cast<AllocaInst>(Obj); const AllocaInst *AI = cast<AllocaInst>(Obj);
DenseMap<const AllocaInst*, int>::iterator SI = DenseMap<const AllocaInst*, int>::iterator SI =
FuncInfo.StaticAllocaMap.find(AI); FuncInfo.StaticAllocaMap.find(AI);
@ -656,18 +676,17 @@ bool ARMFastISel::ARMComputeRegOffset(const Value *Obj, unsigned &Reg,
if (const GlobalValue *GV = dyn_cast<GlobalValue>(Obj)) { if (const GlobalValue *GV = dyn_cast<GlobalValue>(Obj)) {
unsigned Tmp = ARMMaterializeGV(GV, TLI.getValueType(Obj->getType())); unsigned Tmp = ARMMaterializeGV(GV, TLI.getValueType(Obj->getType()));
if (Tmp == 0) return false; if (Tmp == 0) return false;
Reg = Tmp; Reg = Tmp;
return true; return true;
} }
// Try to get this in a register if nothing else has worked. // Try to get this in a register if nothing else has worked.
if (Reg == 0) Reg = getRegForValue(Obj); if (Reg == 0) Reg = getRegForValue(Obj);
return Reg != 0; return Reg != 0;
} }
unsigned ARMFastISel::ARMSimplifyRegOffset(unsigned Reg, int &Offset) { void ARMFastISel::ARMSimplifyRegOffset(unsigned &Reg, int &Offset, EVT VT) {
// Since the offset may be too large for the load instruction // Since the offset may be too large for the load instruction
// get the reg+offset into a register. // get the reg+offset into a register.
@ -675,21 +694,23 @@ unsigned ARMFastISel::ARMSimplifyRegOffset(unsigned Reg, int &Offset) {
ARMCC::CondCodes Pred = ARMCC::AL; ARMCC::CondCodes Pred = ARMCC::AL;
unsigned PredReg = 0; unsigned PredReg = 0;
TargetRegisterClass *RC = isThumb ? ARM::tGPRRegisterClass :
ARM::GPRRegisterClass;
unsigned BaseReg = createResultReg(RC);
if (!isThumb) if (!isThumb)
emitARMRegPlusImmediate(*FuncInfo.MBB, FuncInfo.InsertPt, DL, emitARMRegPlusImmediate(*FuncInfo.MBB, FuncInfo.InsertPt, DL,
Reg, Reg, Offset, Pred, PredReg, BaseReg, Reg, Offset, Pred, PredReg,
static_cast<const ARMBaseInstrInfo&>(TII)); static_cast<const ARMBaseInstrInfo&>(TII));
else { else {
assert(AFI->isThumb2Function()); assert(AFI->isThumb2Function());
emitT2RegPlusImmediate(*FuncInfo.MBB, FuncInfo.InsertPt, DL, emitT2RegPlusImmediate(*FuncInfo.MBB, FuncInfo.InsertPt, DL,
Reg, Reg, Offset, Pred, PredReg, BaseReg, Reg, Offset, Pred, PredReg,
static_cast<const ARMBaseInstrInfo&>(TII)); static_cast<const ARMBaseInstrInfo&>(TII));
} }
Offset = 0; Offset = 0;
Reg = BaseReg;
} }
return Reg;
} }
bool ARMFastISel::ARMEmitLoad(EVT VT, unsigned &ResultReg, bool ARMFastISel::ARMEmitLoad(EVT VT, unsigned &ResultReg,
@ -767,10 +788,10 @@ bool ARMFastISel::SelectLoad(const Instruction *I) {
if (!ARMComputeRegOffset(I->getOperand(0), Reg, Offset)) if (!ARMComputeRegOffset(I->getOperand(0), Reg, Offset))
return false; return false;
unsigned BaseReg = ARMSimplifyRegOffset(Reg, Offset); ARMSimplifyRegOffset(Reg, Offset, VT);
unsigned ResultReg; unsigned ResultReg;
if (!ARMEmitLoad(VT, ResultReg, BaseReg, Offset)) return false; if (!ARMEmitLoad(VT, ResultReg, Reg, Offset)) return false;
UpdateValueMap(I, ResultReg); UpdateValueMap(I, ResultReg);
return true; return true;
@ -785,7 +806,7 @@ bool ARMFastISel::ARMEmitStore(EVT VT, unsigned SrcReg,
switch (VT.getSimpleVT().SimpleTy) { switch (VT.getSimpleVT().SimpleTy) {
default: return false; default: return false;
case MVT::i1: case MVT::i1:
case MVT::i8: case MVT::i8:
VT = MVT::i32; VT = MVT::i32;
StrOpc = isThumb ? ARM::t2STRBi8 : ARM::STRB; StrOpc = isThumb ? ARM::t2STRBi8 : ARM::STRB;
break; break;
@ -846,9 +867,9 @@ bool ARMFastISel::SelectStore(const Instruction *I) {
if (!ARMComputeRegOffset(I->getOperand(1), Reg, Offset)) if (!ARMComputeRegOffset(I->getOperand(1), Reg, Offset))
return false; return false;
unsigned BaseReg = ARMSimplifyRegOffset(Reg, Offset); ARMSimplifyRegOffset(Reg, Offset, VT);
if (!ARMEmitStore(VT, SrcReg, BaseReg, Offset)) return false; if (!ARMEmitStore(VT, SrcReg, Reg, Offset)) return false;
return true; return true;
} }
@ -1167,7 +1188,7 @@ bool ARMFastISel::SelectSRem(const Instruction *I) {
else if (VT == MVT::i128) else if (VT == MVT::i128)
LC = RTLIB::SREM_I128; LC = RTLIB::SREM_I128;
assert(LC != RTLIB::UNKNOWN_LIBCALL && "Unsupported SREM!"); assert(LC != RTLIB::UNKNOWN_LIBCALL && "Unsupported SREM!");
return ARMEmitLibcall(I, LC); return ARMEmitLibcall(I, LC);
} }