[gem5-dev] changeset in gem5: ruby: controller: slight code refactoring

[Nilay Vaish]

changeset 9400a90ec5d1 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=9400a90ec5d1
description:
        ruby: controller: slight code refactoring

diffstat:

 src/mem/ruby/network/Topology.cc                   |  3 +--
 src/mem/ruby/slicc_interface/AbstractController.hh |  6 +++---
 src/mem/slicc/symbols/StateMachine.py              |  6 ++----
 3 files changed, 6 insertions(+), 9 deletions(-)

diffs (62 lines):

diff -r 552db6109dd3 -r 9400a90ec5d1 src/mem/ruby/network/Topology.cc
--- a/src/mem/ruby/network/Topology.cc  Thu Feb 20 17:27:17 2014 -0600
+++ b/src/mem/ruby/network/Topology.cc  Thu Feb 20 17:27:45 2014 -0600
@@ -89,8 +89,7 @@
         // Store the ExtLink pointers for later
         m_ext_link_vector.push_back(ext_link);
 
-        int machine_base_idx = MachineType_base_number(
-                string_to_MachineType(abs_cntrl->getName()));
+        int machine_base_idx = MachineType_base_number(abs_cntrl->getType());
         int ext_idx1 = machine_base_idx + abs_cntrl->getVersion();
         int ext_idx2 = ext_idx1 + m_nodes;
         int int_idx = router->params()->router_id + 2*m_nodes;
diff -r 552db6109dd3 -r 9400a90ec5d1 
src/mem/ruby/slicc_interface/AbstractController.hh
--- a/src/mem/ruby/slicc_interface/AbstractController.hh        Thu Feb 20 
17:27:17 2014 -0600
+++ b/src/mem/ruby/slicc_interface/AbstractController.hh        Thu Feb 20 
17:27:45 2014 -0600
@@ -56,11 +56,12 @@
     void init();
     const Params *params() const { return (const Params *)_params; }
 
-    const NodeID getVersion() const { return m_version; }
+    const NodeID getVersion() const { return m_machineID.getNum(); }
+    const MachineType getType() const { return m_machineID.getType(); }
+
     void initNetworkPtr(Network* net_ptr) { m_net_ptr = net_ptr; }
 
     // return instance name
-    const std::string getName() const { return m_name; }
     void blockOnQueue(Address, MessageBuffer*);
     void unblock(Address);
 
@@ -129,7 +130,6 @@
     void wakeUpAllBuffers();
 
   protected:
-    std::string m_name;
     NodeID m_version;
     MachineID m_machineID;
     NodeID m_clusterID;
diff -r 552db6109dd3 -r 9400a90ec5d1 src/mem/slicc/symbols/StateMachine.py
--- a/src/mem/slicc/symbols/StateMachine.py     Thu Feb 20 17:27:17 2014 -0600
+++ b/src/mem/slicc/symbols/StateMachine.py     Thu Feb 20 17:27:45 2014 -0600
@@ -458,7 +458,8 @@
 $c_ident::$c_ident(const Params *p)
     : AbstractController(p)
 {
-    m_name = "${ident}";
+    m_machineID.type = MachineType_${ident};
+    m_machineID.num = m_version;
 ''')
         num_in_ports = len(self.in_ports)
         code('    m_in_ports = $num_in_ports;')
@@ -545,9 +546,6 @@
     MachineType machine_type = string_to_MachineType("${{var.machine.ident}}");
     int base M5_VAR_USED = MachineType_base_number(machine_type);
 
-    m_machineID.type = MachineType_${ident};
-    m_machineID.num = m_version;
-
     // initialize objects
 
 ''')
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev