llvm.org GIT mirror llvm / acf2077
Replace uses of ARMBaseInstrInfo and ARMTargetMachine with the Base versions. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153421 91177308-0d34-0410-b5e6-96231b3b80d8 Craig Topper 8 years ago
8 changed file(s) with 12 addition(s) and 18 deletion(s). Raw diff Collapse all Expand all
1414 #include "ARM.h"
1515 #include "ARMBaseInstrInfo.h"
1616 #include "ARMFrameLowering.h"
17 #include "ARMInstrInfo.h"
1817 #include "ARMMachineFunctionInfo.h"
1918 #include "ARMSubtarget.h"
2019 #include "MCTargetDesc/ARMAddressingModes.h"
1414 #define DEBUG_TYPE "jit"
1515 #include "ARM.h"
1616 #include "ARMConstantPoolValue.h"
17 #include "ARMInstrInfo.h"
17 #include "ARMBaseInstrInfo.h"
1818 #include "ARMRelocations.h"
1919 #include "ARMSubtarget.h"
2020 #include "ARMTargetMachine.h"
4545
4646 class ARMCodeEmitter : public MachineFunctionPass {
4747 ARMJITInfo *JTI;
48 const ARMInstrInfo *II;
48 const ARMBaseInstrInfo *II;
4949 const TargetData *TD;
5050 const ARMSubtarget *Subtarget;
5151 TargetMachine &TM;
6565 public:
6666 ARMCodeEmitter(TargetMachine &tm, JITCodeEmitter &mce)
6767 : MachineFunctionPass(ID), JTI(0),
68 II((const ARMInstrInfo *)tm.getInstrInfo()),
68 II((const ARMBaseInstrInfo *)tm.getInstrInfo()),
6969 TD(tm.getTargetData()), TM(tm),
7070 MCE(mce), MCPEs(0), MJTEs(0),
7171 IsPIC(TM.getRelocationModel() == Reloc::PIC_), IsThumb(false) {}
367367 assert((MF.getTarget().getRelocationModel() != Reloc::Default ||
368368 MF.getTarget().getRelocationModel() != Reloc::Static) &&
369369 "JIT relocation model must be set to static or default!");
370 JTI = ((ARMTargetMachine &)MF.getTarget()).getJITInfo();
371 II = ((const ARMTargetMachine &)MF.getTarget()).getInstrInfo();
372 TD = ((const ARMTargetMachine &)MF.getTarget()).getTargetData();
370 JTI = ((ARMBaseTargetMachine &)MF.getTarget()).getJITInfo();
371 II = (const ARMBaseInstrInfo *)MF.getTarget().getInstrInfo();
372 TD = MF.getTarget().getTargetData();
373373 Subtarget = &TM.getSubtarget();
374374 MCPEs = &MF.getConstantPool()->getConstants();
375375 MJTEs = 0;
1515 #define DEBUG_TYPE "arm-cp-islands"
1616 #include "ARM.h"
1717 #include "ARMMachineFunctionInfo.h"
18 #include "ARMInstrInfo.h"
1918 #include "Thumb2InstrInfo.h"
2019 #include "MCTargetDesc/ARMAddressingModes.h"
2120 #include "llvm/CodeGen/MachineConstantPool.h"
265264
266265 MachineFunction *MF;
267266 MachineConstantPool *MCP;
268 const ARMInstrInfo *TII;
267 const ARMBaseInstrInfo *TII;
269268 const ARMSubtarget *STI;
270269 ARMFunctionInfo *AFI;
271270 bool isThumb;
382381 << MCP->getConstants().size() << " CP entries, aligned to "
383382 << MCP->getConstantPoolAlignment() << " bytes *****\n");
384383
385 TII = (const ARMInstrInfo*)MF->getTarget().getInstrInfo();
384 TII = (const ARMBaseInstrInfo*)MF->getTarget().getInstrInfo();
386385 AFI = MF->getInfo();
387386 STI = &MF->getTarget().getSubtarget();
388387
16711671 static
16721672 bool MatchingStackOffset(SDValue Arg, unsigned Offset, ISD::ArgFlagsTy Flags,
16731673 MachineFrameInfo *MFI, const MachineRegisterInfo *MRI,
1674 const ARMInstrInfo *TII) {
1674 const TargetInstrInfo *TII) {
16751675 unsigned Bytes = Arg.getValueType().getSizeInBits() / 8;
16761676 int FI = INT_MAX;
16771677 if (Arg.getOpcode() == ISD::CopyFromReg) {
18061806 // the caller's fixed stack objects.
18071807 MachineFrameInfo *MFI = MF.getFrameInfo();
18081808 const MachineRegisterInfo *MRI = &MF.getRegInfo();
1809 const ARMInstrInfo *TII =
1810 ((ARMTargetMachine&)getTargetMachine()).getInstrInfo();
1809 const TargetInstrInfo *TII = getTargetMachine().getInstrInfo();
18111810 for (unsigned i = 0, realArgIdx = 0, e = ArgLocs.size();
18121811 i != e;
18131812 ++i, ++realArgIdx) {
1717 #include "ARMBaseInstrInfo.h"
1818 #include "ARMRegisterInfo.h"
1919 #include "ARMSubtarget.h"
20 #include "llvm/Target/TargetInstrInfo.h"
2120
2221 namespace llvm {
2322 class ARMSubtarget;
1212
1313 #define DEBUG_TYPE "jit"
1414 #include "ARMJITInfo.h"
15 #include "ARMInstrInfo.h"
15 #include "ARM.h"
1616 #include "ARMConstantPoolValue.h"
1717 #include "ARMRelocations.h"
1818 #include "ARMSubtarget.h"
1616 #include "ARM.h"
1717 #include "ARMBaseInstrInfo.h"
1818 #include "Thumb1RegisterInfo.h"
19 #include "llvm/Target/TargetInstrInfo.h"
2019
2120 namespace llvm {
2221 class ARMSubtarget;
1414 #define THUMB2INSTRUCTIONINFO_H
1515
1616 #include "ARM.h"
17 #include "ARMInstrInfo.h"
17 #include "ARMBaseInstrInfo.h"
1818 #include "Thumb2RegisterInfo.h"
19 #include "llvm/Target/TargetInstrInfo.h"
2019
2120 namespace llvm {
2221 class ARMSubtarget;