mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-22 10:29:35 +00:00
Have ARMSelectionDAGInfo take a DataLayout as it's argument as the
DAG has access to the subtarget and TargetSelectionDAGInfo only needs a DataLayout. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210859 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
4eddf94a14
commit
9a81e28056
@ -18,9 +18,8 @@ using namespace llvm;
|
||||
|
||||
#define DEBUG_TYPE "arm-selectiondag-info"
|
||||
|
||||
ARMSelectionDAGInfo::ARMSelectionDAGInfo(const TargetMachine &TM)
|
||||
: TargetSelectionDAGInfo(TM.getDataLayout()),
|
||||
Subtarget(&TM.getSubtarget<ARMSubtarget>()) {}
|
||||
ARMSelectionDAGInfo::ARMSelectionDAGInfo(const DataLayout &DL)
|
||||
: TargetSelectionDAGInfo(&DL) {}
|
||||
|
||||
ARMSelectionDAGInfo::~ARMSelectionDAGInfo() {
|
||||
}
|
||||
@ -33,6 +32,7 @@ ARMSelectionDAGInfo::EmitTargetCodeForMemcpy(SelectionDAG &DAG, SDLoc dl,
|
||||
bool isVolatile, bool AlwaysInline,
|
||||
MachinePointerInfo DstPtrInfo,
|
||||
MachinePointerInfo SrcPtrInfo) const {
|
||||
const ARMSubtarget &Subtarget = DAG.getTarget().getSubtarget<ARMSubtarget>();
|
||||
// Do repeated 4-byte loads and stores. To be improved.
|
||||
// This requires 4-byte alignment.
|
||||
if ((Align & 3) != 0)
|
||||
@ -43,7 +43,7 @@ ARMSelectionDAGInfo::EmitTargetCodeForMemcpy(SelectionDAG &DAG, SDLoc dl,
|
||||
if (!ConstantSize)
|
||||
return SDValue();
|
||||
uint64_t SizeVal = ConstantSize->getZExtValue();
|
||||
if (!AlwaysInline && SizeVal > Subtarget->getMaxInlineSizeThreshold())
|
||||
if (!AlwaysInline && SizeVal > Subtarget.getMaxInlineSizeThreshold())
|
||||
return SDValue();
|
||||
|
||||
unsigned BytesLeft = SizeVal & 3;
|
||||
@ -53,7 +53,7 @@ ARMSelectionDAGInfo::EmitTargetCodeForMemcpy(SelectionDAG &DAG, SDLoc dl,
|
||||
unsigned VTSize = 4;
|
||||
unsigned i = 0;
|
||||
// Emit a maximum of 4 loads in Thumb1 since we have fewer registers
|
||||
const unsigned MAX_LOADS_IN_LDM = Subtarget->isThumb1Only() ? 4 : 6;
|
||||
const unsigned MAX_LOADS_IN_LDM = Subtarget.isThumb1Only() ? 4 : 6;
|
||||
SDValue TFOps[6];
|
||||
SDValue Loads[6];
|
||||
uint64_t SrcOff = 0, DstOff = 0;
|
||||
@ -150,9 +150,10 @@ EmitTargetCodeForMemset(SelectionDAG &DAG, SDLoc dl,
|
||||
SDValue Src, SDValue Size,
|
||||
unsigned Align, bool isVolatile,
|
||||
MachinePointerInfo DstPtrInfo) const {
|
||||
const ARMSubtarget &Subtarget = DAG.getTarget().getSubtarget<ARMSubtarget>();
|
||||
// Use default for non-AAPCS (or MachO) subtargets
|
||||
if (!Subtarget->isAAPCS_ABI() || Subtarget->isTargetMachO() ||
|
||||
Subtarget->isTargetWindows())
|
||||
if (!Subtarget.isAAPCS_ABI() || Subtarget.isTargetMachO() ||
|
||||
Subtarget.isTargetWindows())
|
||||
return SDValue();
|
||||
|
||||
const ARMTargetLowering &TLI =
|
||||
|
@ -36,12 +36,8 @@ namespace ARM_AM {
|
||||
} // end namespace ARM_AM
|
||||
|
||||
class ARMSelectionDAGInfo : public TargetSelectionDAGInfo {
|
||||
/// Subtarget - Keep a pointer to the ARMSubtarget around so that we can
|
||||
/// make the right decision when generating code for different targets.
|
||||
const ARMSubtarget *Subtarget;
|
||||
|
||||
public:
|
||||
explicit ARMSelectionDAGInfo(const TargetMachine &TM);
|
||||
explicit ARMSelectionDAGInfo(const DataLayout &DL);
|
||||
~ARMSelectionDAGInfo();
|
||||
|
||||
SDValue EmitTargetCodeForMemcpy(SelectionDAG &DAG, SDLoc dl,
|
||||
|
@ -139,7 +139,7 @@ ARMTargetMachine::ARMTargetMachine(const Target &T, StringRef TT,
|
||||
InstrInfo(Subtarget),
|
||||
DL(computeDataLayout(Subtarget)),
|
||||
TLInfo(*this),
|
||||
TSInfo(*this),
|
||||
TSInfo(DL),
|
||||
FrameLowering(Subtarget) {
|
||||
initAsmInfo();
|
||||
if (!Subtarget.hasARMOps())
|
||||
@ -179,7 +179,7 @@ ThumbTargetMachine::ThumbTargetMachine(const Target &T, StringRef TT,
|
||||
: ((ARMBaseInstrInfo*)new Thumb1InstrInfo(Subtarget))),
|
||||
DL(computeDataLayout(Subtarget)),
|
||||
TLInfo(*this),
|
||||
TSInfo(*this),
|
||||
TSInfo(DL),
|
||||
FrameLowering(Subtarget.hasThumb2()
|
||||
? new ARMFrameLowering(Subtarget)
|
||||
: (ARMFrameLowering*)new Thumb1FrameLowering(Subtarget)) {
|
||||
|
Loading…
Reference in New Issue
Block a user