projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge alignment of common GlobalValue.
[oota-llvm.git]
/
lib
/
Target
/
ARM
/
ARMInstrInfo.h
diff --git
a/lib/Target/ARM/ARMInstrInfo.h
b/lib/Target/ARM/ARMInstrInfo.h
index d4199d1267fd8c12120601b0356b7b91be4774a3..90f34ea08401397a6d2f97d0f49b916e8d5d254a 100644
(file)
--- a/
lib/Target/ARM/ARMInstrInfo.h
+++ b/
lib/Target/ARM/ARMInstrInfo.h
@@
-1,4
+1,4
@@
-//===-
ARMInstrInfo.h - ARM Instruction Information -
------------*- C++ -*-===//
+//===-
- ARMInstrInfo.h - ARM Instruction Information
------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
//
// The LLVM Compiler Infrastructure
//
@@
-11,14
+11,11
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
-#ifndef
ARMINSTRUCTION
INFO_H
-#define
ARMINSTRUCTION
INFO_H
+#ifndef
LLVM_LIB_TARGET_ARM_ARMINSTR
INFO_H
+#define
LLVM_LIB_TARGET_ARM_ARMINSTR
INFO_H
-#include "llvm/Target/TargetInstrInfo.h"
#include "ARMBaseInstrInfo.h"
#include "ARMRegisterInfo.h"
#include "ARMBaseInstrInfo.h"
#include "ARMRegisterInfo.h"
-#include "ARMSubtarget.h"
-#include "ARM.h"
namespace llvm {
class ARMSubtarget;
namespace llvm {
class ARMSubtarget;
@@
-28,20
+25,22
@@
class ARMInstrInfo : public ARMBaseInstrInfo {
public:
explicit ARMInstrInfo(const ARMSubtarget &STI);
public:
explicit ARMInstrInfo(const ARMSubtarget &STI);
+ /// getNoopForMachoTarget - Return the noop instruction to use for a noop.
+ void getNoopForMachoTarget(MCInst &NopInst) const override;
+
// Return the non-pre/post incrementing version of 'Opc'. Return 0
// if there is not such an opcode.
// Return the non-pre/post incrementing version of 'Opc'. Return 0
// if there is not such an opcode.
- unsigned getUnindexedOpcode(unsigned Opc) const;
-
- void reMaterialize(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
- unsigned DestReg, unsigned SubIdx,
- const MachineInstr *Orig,
- const TargetRegisterInfo *TRI) const;
+ unsigned getUnindexedOpcode(unsigned Opc) const override;
/// getRegisterInfo - TargetInstrInfo is a superset of MRegister info. As
/// such, whenever a client has an instance of instruction info, it should
/// always be able to get register info as well (through this method).
///
/// getRegisterInfo - TargetInstrInfo is a superset of MRegister info. As
/// such, whenever a client has an instance of instruction info, it should
/// always be able to get register info as well (through this method).
///
- const ARMRegisterInfo &getRegisterInfo() const { return RI; }
+ const ARMRegisterInfo &getRegisterInfo() const override { return RI; }
+
+private:
+ void expandLoadStackGuard(MachineBasicBlock::iterator MI,
+ Reloc::Model RM) const override;
};
}
};
}