summaryrefslogtreecommitdiff
path: root/src/mem/ruby/network/Network.cc
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2010-12-22 23:15:24 -0600
committerNilay Vaish <nilay@cs.wisc.edu>2010-12-22 23:15:24 -0600
commit58fa2857e123a44b1633628b898847773153c047 (patch)
treeabf6318d961c8bcb31d7a0f5c4aa9bbb4a0db0ed /src/mem/ruby/network/Network.cc
parent2c0e80f96bee8c2ad48cd3fb7a18af149bfe76bc (diff)
downloadgem5-58fa2857e123a44b1633628b898847773153c047.tar.xz
This patch removes the WARN_* and ERROR_* from src/mem/ruby/common/Debug.hh file. These statements have been replaced with warn(), panic() and fatal() defined in src/base/misc.hh
Diffstat (limited to 'src/mem/ruby/network/Network.cc')
-rw-r--r--src/mem/ruby/network/Network.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/ruby/network/Network.cc b/src/mem/ruby/network/Network.cc
index 91800d5bb..3e866907f 100644
--- a/src/mem/ruby/network/Network.cc
+++ b/src/mem/ruby/network/Network.cc
@@ -26,6 +26,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "base/misc.hh"
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/network/Network.hh"
#include "mem/ruby/network/simple/Topology.hh"
@@ -64,7 +65,7 @@ Network::MessageSizeType_to_int(MessageSizeType size_type)
{
switch(size_type) {
case MessageSizeType_Undefined:
- ERROR_MSG("Can't convert Undefined MessageSizeType to integer");
+ panic("Can't convert Undefined MessageSizeType to integer");
break;
case MessageSizeType_Control:
case MessageSizeType_Request_Control:
@@ -85,10 +86,9 @@ Network::MessageSizeType_to_int(MessageSizeType size_type)
case MessageSizeType_Writeback_Data:
return m_data_msg_size;
default:
- ERROR_MSG("Invalid range for type MessageSizeType");
+ panic("Invalid range for type MessageSizeType");
break;
}
- return 0;
}
const std::vector<Throttle*>*