diff options
author | Gabe Black <gabeblack@google.com> | 2018-11-26 17:51:16 -0800 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2018-11-27 21:58:24 +0000 |
commit | 12311c5540e69750b39f1f2e476546cdf05d1f3e (patch) | |
tree | 56478af783014362be805d560a19d41faed49b65 /src/mem/ruby | |
parent | a66d12c23517a010f5a05efbc2e47d61fba705c9 (diff) | |
download | gem5-12311c5540e69750b39f1f2e476546cdf05d1f3e.tar.xz |
arch, base, cpu, gpu, mem: Replace assert(0 or false with panic.
Neither assert(0) nor assert(false) give any hint as to why control
getting to them is bad, and their more descriptive versions,
assert(0 && "description") and assert(false && "description"), jury
rig assert to add an error message when the utility function panic()
already does that directly with better formatting options.
This change replaces that flavor of call to assert with panic, except
in the actual code which processes the formatting that panic uses (to
avoid infinitely recurring error handling), and in some *.sm files
since I don't know what rules those have to follow and don't want to
accidentaly break them.
Change-Id: I8addfbfaf77eaed94ec8191f2ae4efb477cefdd0
Reviewed-on: https://gem5-review.googlesource.com/c/14636
Reviewed-by: Brandon Potter <Brandon.Potter@amd.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/mem/ruby')
-rw-r--r-- | src/mem/ruby/filters/H3BloomFilter.cc | 4 | ||||
-rw-r--r-- | src/mem/ruby/filters/MultiBitSelBloomFilter.cc | 4 | ||||
-rw-r--r-- | src/mem/ruby/network/garnet2.0/RoutingUnit.cc | 6 | ||||
-rw-r--r-- | src/mem/ruby/structures/CacheMemory.cc | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/mem/ruby/filters/H3BloomFilter.cc b/src/mem/ruby/filters/H3BloomFilter.cc index 10dc4d283..71d4c88ce 100644 --- a/src/mem/ruby/filters/H3BloomFilter.cc +++ b/src/mem/ruby/filters/H3BloomFilter.cc @@ -29,6 +29,7 @@ #include "mem/ruby/filters/H3BloomFilter.hh" #include "base/intmath.hh" +#include "base/logging.hh" using namespace std; @@ -437,8 +438,7 @@ H3BloomFilter::set(Addr addr) void H3BloomFilter::unset(Addr addr) { - cout << "ERROR: Unset should never be called in a Bloom filter"; - assert(0); + panic("ERROR: Unset should never be called in a Bloom filter"); } bool diff --git a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc index 5faaa10da..e2ca4d08c 100644 --- a/src/mem/ruby/filters/MultiBitSelBloomFilter.cc +++ b/src/mem/ruby/filters/MultiBitSelBloomFilter.cc @@ -31,6 +31,7 @@ #include <vector> #include "base/intmath.hh" +#include "base/logging.hh" #include "base/str.hh" using namespace std; @@ -111,8 +112,7 @@ MultiBitSelBloomFilter::set(Addr addr) void MultiBitSelBloomFilter::unset(Addr addr) { - cout << "ERROR: Unset should never be called in a Bloom filter"; - assert(0); + panic("ERROR: Unset should never be called in a Bloom filter"); } bool diff --git a/src/mem/ruby/network/garnet2.0/RoutingUnit.cc b/src/mem/ruby/network/garnet2.0/RoutingUnit.cc index 695f50ee5..b39bb3c57 100644 --- a/src/mem/ruby/network/garnet2.0/RoutingUnit.cc +++ b/src/mem/ruby/network/garnet2.0/RoutingUnit.cc @@ -34,6 +34,7 @@ #include "mem/ruby/network/garnet2.0/RoutingUnit.hh" #include "base/cast.hh" +#include "base/logging.hh" #include "mem/ruby/network/garnet2.0/InputUnit.hh" #include "mem/ruby/network/garnet2.0/Router.hh" #include "mem/ruby/slicc_interface/Message.hh" @@ -224,7 +225,7 @@ RoutingUnit::outportComputeXY(RouteInfo route, // x_hops == 0 and y_hops == 0 // this is not possible // already checked that in outportCompute() function - assert(0); + panic("x_hops == y_hops == 0"); } return m_outports_dirn2idx[outport_dirn]; @@ -237,6 +238,5 @@ RoutingUnit::outportComputeCustom(RouteInfo route, int inport, PortDirection inport_dirn) { - assert(0); - return -1; + panic("%s placeholder executed", __FUNCTION__); } diff --git a/src/mem/ruby/structures/CacheMemory.cc b/src/mem/ruby/structures/CacheMemory.cc index 8d99c90aa..6c93c3260 100644 --- a/src/mem/ruby/structures/CacheMemory.cc +++ b/src/mem/ruby/structures/CacheMemory.cc @@ -30,6 +30,7 @@ #include "mem/ruby/structures/CacheMemory.hh" #include "base/intmath.hh" +#include "base/logging.hh" #include "debug/RubyCache.hh" #include "debug/RubyCacheTrace.hh" #include "debug/RubyResourceStalls.hh" @@ -637,8 +638,7 @@ CacheMemory::checkResourceAvailable(CacheResourceType res, Addr addr) return false; } } else { - assert(false); - return true; + panic("Unrecognized cache resource type."); } } |