ruby: drop NetworkMessage class

[gem5.git] / src / mem / ruby / common / NetDest.hh

diff --git a/src/mem/ruby/common/NetDest.hh b/src/mem/ruby/common/NetDest.hh
index 8006045d82b5df8fe51ec0c3b482bfde70d9f16d..e09be0c2cb26a74c1a9bb02577665592d0f9dc07 100644 (file)
--- a/src/mem/ruby/common/NetDest.hh
+++ b/src/mem/ruby/common/NetDest.hh
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// NetDest specifies the network destination of a NetworkMessage
+// NetDest specifies the network destination of a Message
 // This is backward compatible with the Set class that was previously
 // used to specify network destinations.
 // NetDest supports both node networks and component networks
@@ -37,12 +37,8 @@
 #include <iostream>
 #include <vector>
 
-#include "debug/RubyMemory.hh"
-#include "mem/protocol/MachineType.hh"
-#include "mem/ruby/common/Global.hh"
 #include "mem/ruby/common/Set.hh"
-#include "mem/ruby/system/MachineID.hh"
-#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/MachineID.hh"
 
 class NetDest
 {
@@ -59,7 +55,6 @@ class NetDest
 
     void add(MachineID newElement);
     void addNetDest(const NetDest& netDest);
-    void addRandom();
     void setNetDest(MachineType machine, const Set& set);
     void remove(MachineID oldElement);
     void removeNetDest(const NetDest& netDest);
@@ -67,7 +62,7 @@ class NetDest
     void broadcast();
     void broadcast(MachineType machine);
     int count() const;
-    bool isEqual(const NetDest& netDest);
+    bool isEqual(const NetDest& netDest) const;
 
     // return the logical OR of this netDest and orNetDest
     NetDest OR(const NetDest& orNetDest) const;
@@ -112,11 +107,7 @@ class NetDest
         return vec_index;
     }
 
-    NodeID
-    bitIndex(NodeID index) const
-    {
-        return index;
-    }
+    NodeID bitIndex(NodeID index) const { return index; }
 
     std::vector<Set> m_bits;  // a vector of bit vectors - i.e. Sets
 };
@@ -130,4 +121,3 @@ operator<<(std::ostream& out, const NetDest& obj)
 }
 
 #endif // __MEM_RUBY_COMMON_NETDEST_HH__
-