cpu/inorder: merge register class enums

The previous patch introduced a RegClass enum to clean
up register classification.  The inorder model already
had an equivalent enum (RegType) that was used internally.
This patch replaces RegType with RegClass to get rid
of the now-redundant code.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc
index 233d532dd..32ca2caaf 100644
--- a/src/cpu/inorder/cpu.cc
+++ b/src/cpu/inorder/cpu.cc
@@ -1257,21 +1257,20 @@ InOrderCPU::getPipeStage(int stage_num)
 
 
 RegIndex
-InOrderCPU::flattenRegIdx(RegIndex reg_idx, RegType &reg_type, ThreadID tid)
+InOrderCPU::flattenRegIdx(RegIndex reg_idx, RegClass &reg_type, ThreadID tid)
 {
     RegIndex rel_idx;
 
-    switch (regIdxToClass(reg_idx, &rel_idx)) {
+    reg_type = regIdxToClass(reg_idx, &rel_idx);
+
+    switch (reg_type) {
       case IntRegClass:
-        reg_type = IntType;
         return isa[tid]->flattenIntIndex(rel_idx);
 
       case FloatRegClass:
-        reg_type = FloatType;
         return isa[tid]->flattenFloatIndex(rel_idx);
 
       case MiscRegClass:
-        reg_type = MiscType;
         return rel_idx;
 
       default: