From 219c423f1fb0f9a559bfa87f9812426d5e2c3e29 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Tue, 15 Oct 2013 14:22:43 -0400 Subject: 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; --- src/arch/sparc/isa/base.isa | 10 +++++----- src/arch/sparc/registers.hh | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/arch/sparc') diff --git a/src/arch/sparc/isa/base.isa b/src/arch/sparc/isa/base.isa index 3b3974cbf..3ff1d22b0 100644 --- a/src/arch/sparc/isa/base.isa +++ b/src/arch/sparc/isa/base.isa @@ -290,7 +290,7 @@ output decoder {{ const int MaxLocal = 24; const int MaxInput = 32; const int MaxMicroReg = 40; - if (reg < FP_Base_DepTag) { + if (reg < FP_Reg_Base) { // If we used a register from the next or previous window, // take out the offset. while (reg >= MaxMicroReg) @@ -335,10 +335,10 @@ output decoder {{ break; } } - } else if (reg < Ctrl_Base_DepTag) { - ccprintf(os, "%%f%d", reg - FP_Base_DepTag); + } else if (reg < Misc_Reg_Base) { + ccprintf(os, "%%f%d", reg - FP_Reg_Base); } else { - switch (reg - Ctrl_Base_DepTag) { + switch (reg - Misc_Reg_Base) { case MISCREG_ASI: ccprintf(os, "%%asi"); break; @@ -430,7 +430,7 @@ output decoder {{ ccprintf(os, "%%fsr"); break; default: - ccprintf(os, "%%ctrl%d", reg - Ctrl_Base_DepTag); + ccprintf(os, "%%ctrl%d", reg - Misc_Reg_Base); } } } diff --git a/src/arch/sparc/registers.hh b/src/arch/sparc/registers.hh index ffcfafcba..0e774b69e 100644 --- a/src/arch/sparc/registers.hh +++ b/src/arch/sparc/registers.hh @@ -75,9 +75,9 @@ const int TotalNumRegs = NumIntRegs + NumFloatRegs + NumMiscRegs; // These enumerate all the registers for dependence tracking. enum DependenceTags { - FP_Base_DepTag = NumIntRegs, - Ctrl_Base_DepTag = FP_Base_DepTag + NumFloatRegs, - Max_DepTag = Ctrl_Base_DepTag + NumMiscRegs + FP_Reg_Base = NumIntRegs, + Misc_Reg_Base = FP_Reg_Base + NumFloatRegs, + Max_Reg_Index = Misc_Reg_Base + NumMiscRegs }; } // namespace SparcISA -- cgit v1.2.3