Revert r109901. The implementation of <rdar://problem/7405933> (r110423) doesn't

need the Compare flag after all.

--- Reverse-merging r109901 into '.':
U    include/llvm/Target/TargetInstrDesc.h
U    include/llvm/Target/Target.td
U    utils/TableGen/InstrInfoEmitter.cpp
U    utils/TableGen/CodeGenInstruction.cpp
U    utils/TableGen/CodeGenInstruction.h

llvm-svn: 110424
This commit is contained in:
Bill Wendling 2010-08-06 01:36:09 +00:00
parent 7de9d52c13
commit e8bb340203
5 changed files with 1 additions and 11 deletions

View File

@ -198,7 +198,6 @@ class Instruction {
bit isReturn = 0; // Is this instruction a return instruction? bit isReturn = 0; // Is this instruction a return instruction?
bit isBranch = 0; // Is this instruction a branch instruction? bit isBranch = 0; // Is this instruction a branch instruction?
bit isIndirectBranch = 0; // Is this instruction an indirect branch? bit isIndirectBranch = 0; // Is this instruction an indirect branch?
bit isCompare = 0; // Is this instruction a comparison instruction?
bit isBarrier = 0; // Can control flow fall through this instruction? bit isBarrier = 0; // Can control flow fall through this instruction?
bit isCall = 0; // Is this instruction a call instruction? bit isCall = 0; // Is this instruction a call instruction?
bit canFoldAsLoad = 0; // Can this be folded as a simple memory operand? bit canFoldAsLoad = 0; // Can this be folded as a simple memory operand?

View File

@ -105,7 +105,6 @@ namespace TID {
IndirectBranch, IndirectBranch,
Predicable, Predicable,
NotDuplicable, NotDuplicable,
Compare,
DelaySlot, DelaySlot,
FoldableAsLoad, FoldableAsLoad,
MayLoad, MayLoad,
@ -341,11 +340,6 @@ public:
return Flags & (1 << TID::Predicable); return Flags & (1 << TID::Predicable);
} }
/// isCompare - Return true if this instruction is a comparison.
bool isCompare() const {
return Flags & (1 << TID::Compare);
}
/// isNotDuplicable - Return true if this instruction cannot be safely /// isNotDuplicable - Return true if this instruction cannot be safely
/// duplicated. For example, if the instruction has a unique labels attached /// duplicated. For example, if the instruction has a unique labels attached
/// to it, duplicating it would cause multiple definition errors. /// to it, duplicating it would cause multiple definition errors.

View File

@ -102,7 +102,6 @@ CodeGenInstruction::CodeGenInstruction(Record *R, const std::string &AsmStr)
isReturn = R->getValueAsBit("isReturn"); isReturn = R->getValueAsBit("isReturn");
isBranch = R->getValueAsBit("isBranch"); isBranch = R->getValueAsBit("isBranch");
isIndirectBranch = R->getValueAsBit("isIndirectBranch"); isIndirectBranch = R->getValueAsBit("isIndirectBranch");
isCompare = R->getValueAsBit("isCompare");
isBarrier = R->getValueAsBit("isBarrier"); isBarrier = R->getValueAsBit("isBarrier");
isCall = R->getValueAsBit("isCall"); isCall = R->getValueAsBit("isCall");
canFoldAsLoad = R->getValueAsBit("canFoldAsLoad"); canFoldAsLoad = R->getValueAsBit("canFoldAsLoad");

View File

@ -123,7 +123,6 @@ namespace llvm {
bool isReturn; bool isReturn;
bool isBranch; bool isBranch;
bool isIndirectBranch; bool isIndirectBranch;
bool isCompare;
bool isBarrier; bool isBarrier;
bool isCall; bool isCall;
bool canFoldAsLoad; bool canFoldAsLoad;

View File

@ -270,7 +270,6 @@ void InstrInfoEmitter::emitRecord(const CodeGenInstruction &Inst, unsigned Num,
if (Inst.isReturn) OS << "|(1<<TID::Return)"; if (Inst.isReturn) OS << "|(1<<TID::Return)";
if (Inst.isBranch) OS << "|(1<<TID::Branch)"; if (Inst.isBranch) OS << "|(1<<TID::Branch)";
if (Inst.isIndirectBranch) OS << "|(1<<TID::IndirectBranch)"; if (Inst.isIndirectBranch) OS << "|(1<<TID::IndirectBranch)";
if (Inst.isCompare) OS << "|(1<<TID::Compare)";
if (Inst.isBarrier) OS << "|(1<<TID::Barrier)"; if (Inst.isBarrier) OS << "|(1<<TID::Barrier)";
if (Inst.hasDelaySlot) OS << "|(1<<TID::DelaySlot)"; if (Inst.hasDelaySlot) OS << "|(1<<TID::DelaySlot)";
if (Inst.isCall) OS << "|(1<<TID::Call)"; if (Inst.isCall) OS << "|(1<<TID::Call)";