- Rename Instruction::First*Op to *OpsBegin, and Num*Ops to *OpsEnd to

    reflect the fact that it's a range being defined.

llvm-svn: 4147

2 files changed, 10 insertions, 10 deletions

diff --git a/llvm/lib/Target/Sparc/PreSelection.cpp b/llvm/lib/Target/Sparc/PreSelection.cpp
index 916938dabec..56c34edbb7f 100644
--- a/llvm/lib/Target/Sparc/PreSelection.cpp
+++ b/llvm/lib/Target/Sparc/PreSelection.cpp
@@ -214,8 +214,8 @@ static Instruction* DecomposeConstantExpr(ConstantExpr* CE,
                           "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))
diff --git a/llvm/lib/Target/Sparc/SparcInstrInfo.cpp b/llvm/lib/Target/Sparc/SparcInstrInfo.cpp
index 148b76ef5a0..662c80a3577 100644
--- a/llvm/lib/Target/Sparc/SparcInstrInfo.cpp
+++ b/llvm/lib/Target/Sparc/SparcInstrInfo.cpp
@@ -266,15 +266,15 @@ CreateIntSetInstruction(const TargetMachine& target,
 // 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 @@ static void
 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);
 }