- Rename Instruction::First*Op to *OpsBegin, and Num*Ops to *OpsEnd to
reflect the fact that it's a range being defined.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4147 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/SparcV9/SparcV9InstrInfo.cpp b/lib/Target/SparcV9/SparcV9InstrInfo.cpp
index 148b76e..662c80a 100644
--- a/lib/Target/SparcV9/SparcV9InstrInfo.cpp
+++ b/lib/Target/SparcV9/SparcV9InstrInfo.cpp
@@ -266,15 +266,15 @@
// Entry == 0 ==> no immediate constant field exists at all.
// Entry > 0 ==> abs(immediate constant) <= Entry
//
-vector<int> MaxConstantsTable(Instruction::NumOtherOps);
+vector<int> MaxConstantsTable(Instruction::OtherOpsEnd);
static int
MaxConstantForInstr(unsigned llvmOpCode)
{
int modelOpCode = -1;
- if (llvmOpCode >= Instruction::FirstBinaryOp &&
- llvmOpCode < Instruction::NumBinaryOps)
+ if (llvmOpCode >= Instruction::BinaryOpsBegin &&
+ llvmOpCode < Instruction::BinaryOpsEnd)
modelOpCode = ADD;
else
switch(llvmOpCode) {
@@ -300,15 +300,15 @@
InitializeMaxConstantsTable()
{
unsigned op;
- assert(MaxConstantsTable.size() == Instruction::NumOtherOps &&
+ assert(MaxConstantsTable.size() == Instruction::OtherOpsEnd &&
"assignments below will be illegal!");
- for (op = Instruction::FirstTermOp; op < Instruction::NumTermOps; ++op)
+ for (op = Instruction::TermOpsBegin; op < Instruction::TermOpsEnd; ++op)
MaxConstantsTable[op] = MaxConstantForInstr(op);
- for (op = Instruction::FirstBinaryOp; op < Instruction::NumBinaryOps; ++op)
+ for (op = Instruction::BinaryOpsBegin; op < Instruction::BinaryOpsEnd; ++op)
MaxConstantsTable[op] = MaxConstantForInstr(op);
- for (op = Instruction::FirstMemoryOp; op < Instruction::NumMemoryOps; ++op)
+ for (op = Instruction::MemoryOpsBegin; op < Instruction::MemoryOpsEnd; ++op)
MaxConstantsTable[op] = MaxConstantForInstr(op);
- for (op = Instruction::FirstOtherOp; op < Instruction::NumOtherOps; ++op)
+ for (op = Instruction::OtherOpsBegin; op < Instruction::OtherOpsEnd; ++op)
MaxConstantsTable[op] = MaxConstantForInstr(op);
}
diff --git a/lib/Target/SparcV9/SparcV9PreSelection.cpp b/lib/Target/SparcV9/SparcV9PreSelection.cpp
index 916938d..56c34ed 100644
--- a/lib/Target/SparcV9/SparcV9PreSelection.cpp
+++ b/lib/Target/SparcV9/SparcV9PreSelection.cpp
@@ -214,8 +214,8 @@
"constantGEP", &insertBefore);
default: // must be a binary operator
- assert(CE->getOpcode() >= Instruction::FirstBinaryOp &&
- CE->getOpcode() < Instruction::NumBinaryOps &&
+ assert(CE->getOpcode() >= Instruction::BinaryOpsBegin &&
+ CE->getOpcode() < Instruction::BinaryOpsEnd &&
"Unrecognized opcode in ConstantExpr");
getArg1 = CE->getOperand(0);
if (ConstantExpr* CEarg = dyn_cast<ConstantExpr>(getArg1))