projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some simple copy-paste errors in MBlaze ASM Parser and Makefile.
[oota-llvm.git]
/
lib
/
Target
/
TargetInstrInfo.cpp
diff --git
a/lib/Target/TargetInstrInfo.cpp
b/lib/Target/TargetInstrInfo.cpp
index 2cb89f4440174666790da756a2f0f16f6851f1ad..d52ecb32cf752e98faa30aa34aa4aa286fb503ac 100644
(file)
--- a/
lib/Target/TargetInstrInfo.cpp
+++ b/
lib/Target/TargetInstrInfo.cpp
@@
-12,10
+12,10
@@
//===----------------------------------------------------------------------===//
#include "llvm/Target/TargetInstrInfo.h"
//===----------------------------------------------------------------------===//
#include "llvm/Target/TargetInstrInfo.h"
-#include "llvm/Target/TargetInstrItineraries.h"
#include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/CodeGen/SelectionDAGNodes.h"
#include "llvm/MC/MCAsmInfo.h"
#include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/CodeGen/SelectionDAGNodes.h"
#include "llvm/MC/MCAsmInfo.h"
+#include "llvm/MC/MCInstrItineraries.h"
#include "llvm/Support/ErrorHandling.h"
#include <cctype>
using namespace llvm;
#include "llvm/Support/ErrorHandling.h"
#include <cctype>
using namespace llvm;
@@
-24,22
+24,17
@@
using namespace llvm;
// TargetInstrInfo
//===----------------------------------------------------------------------===//
// TargetInstrInfo
//===----------------------------------------------------------------------===//
-TargetInstrInfo::TargetInstrInfo(const TargetInstrDesc* Desc,
- unsigned numOpcodes)
- : Descriptors(Desc), NumOpcodes(numOpcodes) {
-}
-
TargetInstrInfo::~TargetInstrInfo() {
}
const TargetRegisterClass*
TargetInstrInfo::~TargetInstrInfo() {
}
const TargetRegisterClass*
-TargetInstrInfo::getRegClass(const
TargetInstrDesc &T
ID, unsigned OpNum,
+TargetInstrInfo::getRegClass(const
MCInstrDesc &MC
ID, unsigned OpNum,
const TargetRegisterInfo *TRI) const {
const TargetRegisterInfo *TRI) const {
- if (OpNum >=
T
ID.getNumOperands())
+ if (OpNum >=
MC
ID.getNumOperands())
return 0;
return 0;
- short RegClass =
T
ID.OpInfo[OpNum].RegClass;
- if (
T
ID.OpInfo[OpNum].isLookupPtrRegClass())
+ short RegClass =
MC
ID.OpInfo[OpNum].RegClass;
+ if (
MC
ID.OpInfo[OpNum].isLookupPtrRegClass())
return TRI->getPointerRegClass(RegClass);
// Instructions like INSERT_SUBREG do not have fixed register classes.
return TRI->getPointerRegClass(RegClass);
// Instructions like INSERT_SUBREG do not have fixed register classes.
@@
-135,13
+130,13
@@
void TargetInstrInfo::insertNoop(MachineBasicBlock &MBB,
bool TargetInstrInfo::isUnpredicatedTerminator(const MachineInstr *MI) const {
bool TargetInstrInfo::isUnpredicatedTerminator(const MachineInstr *MI) const {
- const
TargetInstrDesc &T
ID = MI->getDesc();
- if (!
T
ID.isTerminator()) return false;
+ const
MCInstrDesc &MC
ID = MI->getDesc();
+ if (!
MC
ID.isTerminator()) return false;
// Conditional branch is a special case.
// Conditional branch is a special case.
- if (
TID.isBranch() && !T
ID.isBarrier())
+ if (
MCID.isBranch() && !MC
ID.isBarrier())
return true;
return true;
- if (!
T
ID.isPredicable())
+ if (!
MC
ID.isPredicable())
return true;
return !isPredicated(MI);
}
return true;
return !isPredicated(MI);
}