projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move get[S|U]LEB128Size() to LEB128.h.
[oota-llvm.git]
/
lib
/
Target
/
ARM
/
ARMSelectionDAGInfo.cpp
diff --git
a/lib/Target/ARM/ARMSelectionDAGInfo.cpp
b/lib/Target/ARM/ARMSelectionDAGInfo.cpp
index a3a3d58841db67a06990aff7b4c4b7ba80fa6357..ba3cf4d92ed8cccf49862f17e812951a7f5e6e01 100644
(file)
--- a/
lib/Target/ARM/ARMSelectionDAGInfo.cpp
+++ b/
lib/Target/ARM/ARMSelectionDAGInfo.cpp
@@
-13,8
+13,8
@@
#define DEBUG_TYPE "arm-selectiondag-info"
#include "ARMTargetMachine.h"
#define DEBUG_TYPE "arm-selectiondag-info"
#include "ARMTargetMachine.h"
-#include "llvm/DerivedTypes.h"
#include "llvm/CodeGen/SelectionDAG.h"
#include "llvm/CodeGen/SelectionDAG.h"
+#include "llvm/IR/DerivedTypes.h"
using namespace llvm;
ARMSelectionDAGInfo::ARMSelectionDAGInfo(const TargetMachine &TM)
using namespace llvm;
ARMSelectionDAGInfo::ARMSelectionDAGInfo(const TargetMachine &TM)
@@
-26,7
+26,7
@@
ARMSelectionDAGInfo::~ARMSelectionDAGInfo() {
}
SDValue
}
SDValue
-ARMSelectionDAGInfo::EmitTargetCodeForMemcpy(SelectionDAG &DAG,
Debug
Loc dl,
+ARMSelectionDAGInfo::EmitTargetCodeForMemcpy(SelectionDAG &DAG,
SD
Loc dl,
SDValue Chain,
SDValue Dst, SDValue Src,
SDValue Size, unsigned Align,
SDValue Chain,
SDValue Dst, SDValue Src,
SDValue Size, unsigned Align,
@@
-67,7
+67,7
@@
ARMSelectionDAGInfo::EmitTargetCodeForMemcpy(SelectionDAG &DAG, DebugLoc dl,
DAG.getNode(ISD::ADD, dl, MVT::i32, Src,
DAG.getConstant(SrcOff, MVT::i32)),
SrcPtrInfo.getWithOffset(SrcOff), isVolatile,
DAG.getNode(ISD::ADD, dl, MVT::i32, Src,
DAG.getConstant(SrcOff, MVT::i32)),
SrcPtrInfo.getWithOffset(SrcOff), isVolatile,
- false, 0);
+ false,
false,
0);
TFOps[i] = Loads[i].getValue(1);
SrcOff += VTSize;
}
TFOps[i] = Loads[i].getValue(1);
SrcOff += VTSize;
}
@@
-105,7
+105,8
@@
ARMSelectionDAGInfo::EmitTargetCodeForMemcpy(SelectionDAG &DAG, DebugLoc dl,
Loads[i] = DAG.getLoad(VT, dl, Chain,
DAG.getNode(ISD::ADD, dl, MVT::i32, Src,
DAG.getConstant(SrcOff, MVT::i32)),
Loads[i] = DAG.getLoad(VT, dl, Chain,
DAG.getNode(ISD::ADD, dl, MVT::i32, Src,
DAG.getConstant(SrcOff, MVT::i32)),
- SrcPtrInfo.getWithOffset(SrcOff), false, false, 0);
+ SrcPtrInfo.getWithOffset(SrcOff),
+ false, false, false, 0);
TFOps[i] = Loads[i].getValue(1);
++i;
SrcOff += VTSize;
TFOps[i] = Loads[i].getValue(1);
++i;
SrcOff += VTSize;
@@
-139,13
+140,13
@@
ARMSelectionDAGInfo::EmitTargetCodeForMemcpy(SelectionDAG &DAG, DebugLoc dl,
// GNU library uses (ptr, value, size)
// See RTABI section 4.3.4
SDValue ARMSelectionDAGInfo::
// GNU library uses (ptr, value, size)
// See RTABI section 4.3.4
SDValue ARMSelectionDAGInfo::
-EmitTargetCodeForMemset(SelectionDAG &DAG,
Debug
Loc dl,
+EmitTargetCodeForMemset(SelectionDAG &DAG,
SD
Loc dl,
SDValue Chain, SDValue Dst,
SDValue Src, SDValue Size,
unsigned Align, bool isVolatile,
MachinePointerInfo DstPtrInfo) const {
SDValue Chain, SDValue Dst,
SDValue Src, SDValue Size,
unsigned Align, bool isVolatile,
MachinePointerInfo DstPtrInfo) const {
- // Use default for non
AAPCS
subtargets
- if (!Subtarget->isAAPCS_ABI())
+ // Use default for non
-AAPCS (or MachO)
subtargets
+ if (!Subtarget->isAAPCS_ABI()
|| Subtarget->isTargetMachO()
)
return SDValue();
const ARMTargetLowering &TLI =
return SDValue();
const ARMTargetLowering &TLI =
@@
-154,7
+155,7
@@
EmitTargetCodeForMemset(SelectionDAG &DAG, DebugLoc dl,
TargetLowering::ArgListEntry Entry;
// First argument: data pointer
TargetLowering::ArgListEntry Entry;
// First argument: data pointer
- Type *IntPtrTy = TLI.get
TargetData
()->getIntPtrType(*DAG.getContext());
+ Type *IntPtrTy = TLI.get
DataLayout
()->getIntPtrType(*DAG.getContext());
Entry.Node = Dst;
Entry.Ty = IntPtrTy;
Args.push_back(Entry);
Entry.Node = Dst;
Entry.Ty = IntPtrTy;
Args.push_back(Entry);
@@
-178,8
+179,7
@@
EmitTargetCodeForMemset(SelectionDAG &DAG, DebugLoc dl,
Args.push_back(Entry);
// Emit __eabi_memset call
Args.push_back(Entry);
// Emit __eabi_memset call
- std::pair<SDValue,SDValue> CallResult =
- TLI.LowerCallTo(Chain,
+ TargetLowering::CallLoweringInfo CLI(Chain,
Type::getVoidTy(*DAG.getContext()), // return type
false, // return sign ext
false, // return zero ext
Type::getVoidTy(*DAG.getContext()), // return type
false, // return sign ext
false, // return zero ext
@@
-188,10
+188,13
@@
EmitTargetCodeForMemset(SelectionDAG &DAG, DebugLoc dl,
0, // number of fixed arguments
TLI.getLibcallCallingConv(RTLIB::MEMSET), // call conv
false, // is tail call
0, // number of fixed arguments
TLI.getLibcallCallingConv(RTLIB::MEMSET), // call conv
false, // is tail call
+ false, // does not return
false, // is return val used
DAG.getExternalSymbol(TLI.getLibcallName(RTLIB::MEMSET),
TLI.getPointerTy()), // callee
false, // is return val used
DAG.getExternalSymbol(TLI.getLibcallName(RTLIB::MEMSET),
TLI.getPointerTy()), // callee
- Args, DAG, dl); // arg list, DAG and debug
+ Args, DAG, dl);
+ std::pair<SDValue,SDValue> CallResult =
+ TLI.LowerCallTo(CLI);
return CallResult.second;
}
return CallResult.second;
}