Changes in directory llvm/lib/Target/ARM:
ARMISelDAGToDAG.cpp updated: 1.28 -> 1.29 --- Log message: select code like ldr rx, [ry, #offset] --- Diffs of the changes: (+34 -1) ARMISelDAGToDAG.cpp | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletion(-) Index: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp diff -u llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.28 llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.29 --- llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.28 Fri Aug 11 12:38:39 2006 +++ llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp Mon Aug 14 14:01:24 2006 @@ -258,7 +258,8 @@ static SDOperand LowerGlobalAddress(SDOperand Op, SelectionDAG &DAG) { GlobalValue *GV = cast<GlobalAddressSDNode>(Op)->getGlobal(); - SDOperand CPAddr = DAG.getConstantPool(GV, MVT::i32, 2); + int alignment = 2; + SDOperand CPAddr = DAG.getConstantPool(GV, MVT::i32, alignment); return DAG.getLoad(MVT::i32, DAG.getEntryNode(), CPAddr, DAG.getSrcValue(NULL)); } @@ -336,9 +337,41 @@ ScheduleAndEmitDAG(DAG); } +static bool isInt12Immediate(SDNode *N, short &Imm) { + if (N->getOpcode() != ISD::Constant) + return false; + + int32_t t = cast<ConstantSDNode>(N)->getValue(); + int max = 2<<12 - 1; + int min = -max; + if (t > min && t < max) { + Imm = t; + return true; + } + else + return false; +} + +static bool isInt12Immediate(SDOperand Op, short &Imm) { + return isInt12Immediate(Op.Val, Imm); +} + //register plus/minus 12 bit offset bool ARMDAGToDAGISel::SelectAddrRegImm(SDOperand N, SDOperand &Offset, SDOperand &Base) { + if (N.getOpcode() == ISD::ADD) { + short imm = 0; + if (isInt12Immediate(N.getOperand(1), imm)) { + Offset = CurDAG->getTargetConstant(imm, MVT::i32); + if (FrameIndexSDNode *FI = dyn_cast<FrameIndexSDNode>(N.getOperand(0))) { + Base = CurDAG->getTargetFrameIndex(FI->getIndex(), N.getValueType()); + } else { + Base = N.getOperand(0); + } + return true; // [r+i] + } + } + Offset = CurDAG->getTargetConstant(0, MVT::i32); if (FrameIndexSDNode *FI = dyn_cast<FrameIndexSDNode>(N)) { Base = CurDAG->getTargetFrameIndex(FI->getIndex(), N.getValueType()); _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits