[gem5-dev] Change in gem5/gem5[develop]: cpu: Rename RegClassInfo to RegClass.

[Gabe Black (Gerrit) via gem5-dev]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/49103 )

Change subject: cpu: Rename RegClassInfo to RegClass.
......................................................................

cpu: Rename RegClassInfo to RegClass.

Change-Id: I0456462d5d306fc93a1fe160e45ff6b1b49f3c25
---
M src/arch/generic/isa.hh
M src/cpu/o3/regfile.cc
M src/cpu/o3/rename_map.cc
M src/cpu/o3/rename_map.hh
M src/cpu/reg_class.hh
5 files changed, 9 insertions(+), 11 deletions(-)



diff --git a/src/arch/generic/isa.hh b/src/arch/generic/isa.hh
index 98b80d0..02decf2 100644
--- a/src/arch/generic/isa.hh
+++ b/src/arch/generic/isa.hh
@@ -54,7 +54,7 @@
 class BaseISA : public SimObject
 {
   public:
-    typedef std::vector<RegClassInfo> RegClasses;
+    typedef std::vector<RegClass> RegClasses;

   protected:
     using SimObject::SimObject;
diff --git a/src/cpu/o3/regfile.cc b/src/cpu/o3/regfile.cc
index f2f0111..746c256 100644
--- a/src/cpu/o3/regfile.cc
+++ b/src/cpu/o3/regfile.cc
@@ -42,7 +42,6 @@
 #include "cpu/o3/regfile.hh"

 #include "cpu/o3/free_list.hh"
-#include "cpu/o3/free_list.hh"

 namespace gem5
 {
diff --git a/src/cpu/o3/rename_map.cc b/src/cpu/o3/rename_map.cc
index 5589ff8..95603b1 100644
--- a/src/cpu/o3/rename_map.cc
+++ b/src/cpu/o3/rename_map.cc
@@ -60,15 +60,14 @@


 void
-SimpleRenameMap::init(const RegClassInfo &reg_class_info,
-        SimpleFreeList *_freeList)
+SimpleRenameMap::init(const RegClass &reg_class, SimpleFreeList *_freeList)
 {
     assert(freeList == NULL);
     assert(map.empty());

-    map.resize(reg_class_info.size());
+    map.resize(reg_class.size());
     freeList = _freeList;
-    zeroReg = RegId(IntRegClass, reg_class_info.zeroReg());
+    zeroReg = RegId(IntRegClass, reg_class.zeroReg());
 }

 SimpleRenameMap::RenameInfo
diff --git a/src/cpu/o3/rename_map.hh b/src/cpu/o3/rename_map.hh
index b8c87e7..e390ef6 100644
--- a/src/cpu/o3/rename_map.hh
+++ b/src/cpu/o3/rename_map.hh
@@ -100,7 +100,7 @@
      * it's awkward to initialize this object via the constructor.
      * Instead, this method is used for initialization.
      */
-    void init(const RegClassInfo &reg_class_info, SimpleFreeList  
*_freeList);
+    void init(const RegClass &reg_class, SimpleFreeList *_freeList);

     /**
      * Pair of a physical register and a physical register.  Used to
diff --git a/src/cpu/reg_class.hh b/src/cpu/reg_class.hh
index f7a4d1c..febaa55 100644
--- a/src/cpu/reg_class.hh
+++ b/src/cpu/reg_class.hh
@@ -80,7 +80,7 @@
     std::string regName(const RegId &id) const override;
 };

-class RegClassInfo
+class RegClass
 {
   private:
     size_t _size;
@@ -90,11 +90,11 @@
     RegClassOps *_ops = &defaultOps;

   public:
-    RegClassInfo(size_t new_size, RegIndex new_zero=-1) :
+    RegClass(size_t new_size, RegIndex new_zero=-1) :
         _size(new_size), _zeroReg(new_zero)
     {}
-    RegClassInfo(size_t new_size, RegClassOps &new_ops, RegIndex  
new_zero=-1) :
-        RegClassInfo(new_size, new_zero)
+    RegClass(size_t new_size, RegClassOps &new_ops, RegIndex new_zero=-1) :
+        RegClass(new_size, new_zero)
     {
         _ops = &new_ops;
     }

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49103
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I0456462d5d306fc93a1fe160e45ff6b1b49f3c25
Gerrit-Change-Number: 49103
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s