diff options
| author | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2010-04-02 11:20:32 -0700 |
| commit | 141f61d83a23096dcff20df704bdd734c520f535 (patch) | |
| tree | ee2383d721a039bb056bd6442a7241aa305d187e /src/mem/ruby/network | |
| parent | f1c3f3044b73d890ffdfdd113b3b37ae2809d21b (diff) | |
| download | gem5-141f61d83a23096dcff20df704bdd734c520f535.tar.xz | |
ruby: get rid of gems_common/util.hh and .cc and use stuff in src/base
Diffstat (limited to 'src/mem/ruby/network')
| -rw-r--r-- | src/mem/ruby/network/garnet/BaseGarnetNetwork.hh | 1 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/PerfectSwitch.cc | 1 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/SimpleNetwork.cc | 8 | ||||
| -rw-r--r-- | src/mem/ruby/network/simple/Topology.cc | 1 |
4 files changed, 4 insertions, 7 deletions
diff --git a/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh b/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh index 1c90c2ca2..a8eca11a4 100644 --- a/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh +++ b/src/mem/ruby/network/garnet/BaseGarnetNetwork.hh @@ -37,7 +37,6 @@ #define BASEGARNETNETWORK_H #include "mem/ruby/network/garnet/NetworkHeader.hh" -#include "mem/gems_common/util.hh" #include "mem/ruby/network/Network.hh" #include "params/BaseGarnetNetwork.hh" diff --git a/src/mem/ruby/network/simple/PerfectSwitch.cc b/src/mem/ruby/network/simple/PerfectSwitch.cc index 4555ef2b3..cf3a5af9c 100644 --- a/src/mem/ruby/network/simple/PerfectSwitch.cc +++ b/src/mem/ruby/network/simple/PerfectSwitch.cc @@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mem/gems_common/util.hh" #include "mem/protocol/Protocol.hh" #include "mem/ruby/buffers/MessageBuffer.hh" #include "mem/ruby/network/simple/PerfectSwitch.hh" diff --git a/src/mem/ruby/network/simple/SimpleNetwork.cc b/src/mem/ruby/network/simple/SimpleNetwork.cc index 2940f19a1..47404ad01 100644 --- a/src/mem/ruby/network/simple/SimpleNetwork.cc +++ b/src/mem/ruby/network/simple/SimpleNetwork.cc @@ -75,10 +75,10 @@ SimpleNetwork::SimpleNetwork(const Params *p) m_toNetQueues[node].setSize(m_virtual_networks); m_fromNetQueues[node].setSize(m_virtual_networks); for (int j = 0; j < m_virtual_networks; j++) { - m_toNetQueues[node][j] = new MessageBuffer( - "toNet node "+int_to_string(node)+" j "+int_to_string(j)); - m_fromNetQueues[node][j] = new MessageBuffer( - "fromNet node "+int_to_string(node)+" j "+int_to_string(j)); + m_toNetQueues[node][j] = + new MessageBuffer(csprintf("toNet node %d j %d", node, j)); + m_fromNetQueues[node][j] = + new MessageBuffer(csprintf("fromNet node %d j %d", node, j)); } } } diff --git a/src/mem/ruby/network/simple/Topology.cc b/src/mem/ruby/network/simple/Topology.cc index f21129255..18618580a 100644 --- a/src/mem/ruby/network/simple/Topology.cc +++ b/src/mem/ruby/network/simple/Topology.cc @@ -26,7 +26,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mem/gems_common/util.hh" #include "mem/protocol/MachineType.hh" #include "mem/protocol/Protocol.hh" #include "mem/protocol/TopologyType.hh" |