cpu: rename *_DepTag constants to *_Reg_Base

Make these names more meaningful.

Specifically, made these substitutions:

s/FP_Base_DepTag/FP_Reg_Base/g;
s/Ctrl_Base_DepTag/Misc_Reg_Base/g;
s/Max_DepTag/Max_Reg_Index/g;

3 files changed, 16 insertions, 16 deletions

diff --git a/src/arch/arm/insts/misc.cc b/src/arch/arm/insts/misc.cc
index c40b6711f..6320bb6da 100644
--- a/src/arch/arm/insts/misc.cc
+++ b/src/arch/arm/insts/misc.cc
@@ -80,10 +80,10 @@ MsrBase::printMsrBase(std::ostream &os) const
     bool foundPsr = false;
     for (unsigned i = 0; i < numDestRegs(); i++) {
         int idx = destRegIdx(i);
-        if (idx < Ctrl_Base_DepTag) {
+        if (idx < Misc_Reg_Base) {
             continue;
         }
-        idx -= Ctrl_Base_DepTag;
+        idx -= Misc_Reg_Base;
         if (idx == MISCREG_CPSR) {
             os << "cpsr_";
             foundPsr = true;
diff --git a/src/arch/arm/insts/vfp.cc b/src/arch/arm/insts/vfp.cc
index 015247d68..ca0f58226 100644
--- a/src/arch/arm/insts/vfp.cc
+++ b/src/arch/arm/insts/vfp.cc
@@ -50,9 +50,9 @@ FpRegRegOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
 {
     std::stringstream ss;
     printMnemonic(ss);
-    printReg(ss, dest + FP_Base_DepTag);
+    printReg(ss, dest + FP_Reg_Base);
     ss << ", ";
-    printReg(ss, op1 + FP_Base_DepTag);
+    printReg(ss, op1 + FP_Reg_Base);
     return ss.str();
 }
 
@@ -61,7 +61,7 @@ FpRegImmOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
 {
     std::stringstream ss;
     printMnemonic(ss);
-    printReg(ss, dest + FP_Base_DepTag);
+    printReg(ss, dest + FP_Reg_Base);
     ccprintf(ss, ", #%d", imm);
     return ss.str();
 }
@@ -71,9 +71,9 @@ FpRegRegImmOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
 {
     std::stringstream ss;
     printMnemonic(ss);
-    printReg(ss, dest + FP_Base_DepTag);
+    printReg(ss, dest + FP_Reg_Base);
     ss << ", ";
-    printReg(ss, op1 + FP_Base_DepTag);
+    printReg(ss, op1 + FP_Reg_Base);
     ccprintf(ss, ", #%d", imm);
     return ss.str();
 }
@@ -83,11 +83,11 @@ FpRegRegRegOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
 {
     std::stringstream ss;
     printMnemonic(ss);
-    printReg(ss, dest + FP_Base_DepTag);
+    printReg(ss, dest + FP_Reg_Base);
     ss << ", ";
-    printReg(ss, op1 + FP_Base_DepTag);
+    printReg(ss, op1 + FP_Reg_Base);
     ss << ", ";
-    printReg(ss, op2 + FP_Base_DepTag);
+    printReg(ss, op2 + FP_Reg_Base);
     return ss.str();
 }
 
@@ -96,11 +96,11 @@ FpRegRegRegImmOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
 {
     std::stringstream ss;
     printMnemonic(ss);
-    printReg(ss, dest + FP_Base_DepTag);
+    printReg(ss, dest + FP_Reg_Base);
     ss << ", ";
-    printReg(ss, op1 + FP_Base_DepTag);
+    printReg(ss, op1 + FP_Reg_Base);
     ss << ", ";
-    printReg(ss, op2 + FP_Base_DepTag);
+    printReg(ss, op2 + FP_Reg_Base);
     ccprintf(ss, ", #%d", imm);
     return ss.str();
 }
diff --git a/src/arch/arm/registers.hh b/src/arch/arm/registers.hh
index cd2f1f9b8..cc4fac824 100644
--- a/src/arch/arm/registers.hh
+++ b/src/arch/arm/registers.hh
@@ -101,9 +101,9 @@ const int SyscallPseudoReturnReg = ReturnValueReg;
 const int SyscallSuccessReg = ReturnValueReg;
 
 // These help enumerate all the registers for dependence tracking.
-const int FP_Base_DepTag = NumIntRegs * (MODE_MAXMODE + 1);
-const int Ctrl_Base_DepTag = FP_Base_DepTag + NumFloatRegs;
-const int Max_DepTag = Ctrl_Base_DepTag + NumMiscRegs;
+const int FP_Reg_Base = NumIntRegs * (MODE_MAXMODE + 1);
+const int Misc_Reg_Base = FP_Reg_Base + NumFloatRegs;
+const int Max_Reg_Index = Misc_Reg_Base + NumMiscRegs;
 
 typedef union {
     IntReg   intreg;