diff options
author | Gabe Black <gabeblack@google.com> | 2018-10-07 03:02:56 -0700 |
---|---|---|
committer | Gabe Black <gabeblack@google.com> | 2018-10-16 01:11:44 +0000 |
commit | b366cbcde953e2adddc10a2825e2803b5f8a9bdd (patch) | |
tree | e532fa49c762eb6b293f88f5a0583946d3a88227 /src/systemc/dt/int | |
parent | 98f40c54a31457078de587b8a29fdd055b9db28b (diff) | |
download | gem5-b366cbcde953e2adddc10a2825e2803b5f8a9bdd.tar.xz |
systemc: Switch to using predefined messages for utils.
Create and use predefined messages for utils which match the ones
Accellera uses.
Change-Id: I932b7206fc16181d01a0d5b7441ce617b30e5365
Reviewed-on: https://gem5-review.googlesource.com/c/13328
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/systemc/dt/int')
-rw-r--r-- | src/systemc/dt/int/sc_int_base.cc | 11 | ||||
-rw-r--r-- | src/systemc/dt/int/sc_signed.cc | 4 | ||||
-rw-r--r-- | src/systemc/dt/int/sc_uint_base.cc | 10 | ||||
-rw-r--r-- | src/systemc/dt/int/sc_unsigned.cc | 5 |
4 files changed, 16 insertions, 14 deletions
diff --git a/src/systemc/dt/int/sc_int_base.cc b/src/systemc/dt/int/sc_int_base.cc index 6094086d8..69b62d128 100644 --- a/src/systemc/dt/int/sc_int_base.cc +++ b/src/systemc/dt/int/sc_int_base.cc @@ -71,6 +71,7 @@ #include "systemc/ext/dt/int/sc_uint_base.hh" #include "systemc/ext/dt/int/sc_unsigned.hh" #include "systemc/ext/dt/misc/sc_concatref.hh" +#include "systemc/ext/utils/messages.hh" // explicit template instantiations namespace sc_core @@ -92,7 +93,7 @@ sc_int_concref_invalid_length(int length) std::stringstream msg; msg << "sc_int_concref<T1,T2> initialization: length = " << length << "violates 1 <= length <= " << SC_INTWIDTH; - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } @@ -361,7 +362,7 @@ sc_int_base::invalid_length() const std::stringstream msg; msg << "sc_int[_base] initialization: length = " << m_len << " violates 1 <= length <= " << SC_INTWIDTH; - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } @@ -371,7 +372,7 @@ sc_int_base::invalid_index(int i) const std::stringstream msg; msg << "sc_int[_base] bit selection: index = " << i << " violates 0 <= index <= " << (m_len - 1); - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } @@ -382,7 +383,7 @@ sc_int_base::invalid_range(int l, int r) const msg << "sc_int[_base] part selection: " << "left = " << l << ", right = " << r << " violates " << (m_len-1) << " >= left >= right >= 0"; - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } @@ -393,7 +394,7 @@ sc_int_base::check_value() const if (m_val < -limit || m_val >= limit) { std::stringstream msg; msg << "sc_int[_base]: value does not fit into a length of " << m_len; - SC_REPORT_WARNING("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_WARNING(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); } } diff --git a/src/systemc/dt/int/sc_signed.cc b/src/systemc/dt/int/sc_signed.cc index 74660b371..cbb688523 100644 --- a/src/systemc/dt/int/sc_signed.cc +++ b/src/systemc/dt/int/sc_signed.cc @@ -123,7 +123,7 @@ sc_signed::invalid_index(int i) const std::stringstream msg; msg << "sc_bigint bit selection: index = " << i << " violates " "0 <= index <= " << (nbits - 1); - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } @@ -135,7 +135,7 @@ sc_signed::invalid_range(int l, int r) const l << ", right = " << r << " \n" " violates either (" << (nbits-1) << " >= left >= 0) or " "(" << (nbits-1) << " >= right >= 0)"; - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } diff --git a/src/systemc/dt/int/sc_uint_base.cc b/src/systemc/dt/int/sc_uint_base.cc index 9d28f778c..a6053813f 100644 --- a/src/systemc/dt/int/sc_uint_base.cc +++ b/src/systemc/dt/int/sc_uint_base.cc @@ -91,7 +91,7 @@ sc_uint_concref_invalid_length(int length) std::stringstream msg; msg << "sc_uint_concref<T1,T2> initialization: length = " << length << "violates 1 <= length <= " << SC_INTWIDTH; - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } @@ -347,7 +347,7 @@ sc_uint_base::invalid_length() const std::stringstream msg; msg << "sc_uint[_base] initialization: length = " << m_len << " violates 1 <= length <= " << SC_INTWIDTH; - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here} } @@ -357,7 +357,7 @@ sc_uint_base::invalid_index(int i) const std::stringstream msg; msg << "sc_uint[_base] bit selection: index = " << i << " violates 0 <= index <= " << (m_len - 1); - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } @@ -368,7 +368,7 @@ sc_uint_base::invalid_range(int l, int r) const msg << "sc_uint[_base] part selection: " << "left = " << l << ", right = " << r << " violates " << (m_len - 1) << " >= left >= right >= 0"; - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } @@ -380,7 +380,7 @@ sc_uint_base::check_value() const if (m_val > limit) { std::stringstream msg; msg << "sc_uint[_base]: value does not fit into a length of " << m_len; - SC_REPORT_WARNING("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_WARNING(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); } } diff --git a/src/systemc/dt/int/sc_unsigned.cc b/src/systemc/dt/int/sc_unsigned.cc index ffea95a68..b358c5cd3 100644 --- a/src/systemc/dt/int/sc_unsigned.cc +++ b/src/systemc/dt/int/sc_unsigned.cc @@ -89,6 +89,7 @@ #include "systemc/ext/dt/int/sc_uint_base.hh" #include "systemc/ext/dt/int/sc_unsigned.hh" #include "systemc/ext/dt/misc/sc_concatref.hh" +#include "systemc/ext/utils/messages.hh" // explicit template instantiations namespace sc_core @@ -131,7 +132,7 @@ sc_unsigned::invalid_index(int i) const std::stringstream msg; msg << "sc_biguint bit selection: index = " << i << " violates " "0 <= index <= " << (nbits-2); - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } @@ -143,7 +144,7 @@ sc_unsigned::invalid_range(int l, int r) const l << ", right = " << r << " \n" " violates either (" << (nbits - 2) << " >= left >= 0) or " "(" << (nbits-2) << " >= right >= 0)"; - SC_REPORT_ERROR("(E5) out of bounds", msg.str().c_str()); + SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, msg.str().c_str()); sc_core::sc_abort(); // can't recover from here } |