diff options
| author | Gabe Black <gabeblack@google.com> | 2018-08-30 14:51:25 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-10-03 00:23:50 +0000 |
| commit | fc01f3743ffb130e300842ecdd85659cb57ecafb (patch) | |
| tree | 9d4427cce2e4f7c41941a834a47ff66b8a3d1a6b /src/systemc/ext/dt | |
| parent | 9f1e647bb293f0728d3083c3b6ce2a6399f6eeb0 (diff) | |
| download | gem5-fc01f3743ffb130e300842ecdd85659cb57ecafb.tar.xz | |
systemc: Adjust some error messages to match Accellera.
Those messages include an error number in the Accellera implementation.
Add those numbers to gem5 so it's easier to check against golden
reference output for the regression tests.
Change-Id: I35054dd187e86a87eb177f4695d61044c58ce262
Reviewed-on: https://gem5-review.googlesource.com/c/12450
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/systemc/ext/dt')
| -rw-r--r-- | src/systemc/ext/dt/bit/sc_bit_proxies.hh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/systemc/ext/dt/bit/sc_bit_proxies.hh b/src/systemc/ext/dt/bit/sc_bit_proxies.hh index 0eec8aac0..da57f04ac 100644 --- a/src/systemc/ext/dt/bit/sc_bit_proxies.hh +++ b/src/systemc/ext/dt/bit/sc_bit_proxies.hh @@ -1735,7 +1735,7 @@ sc_bitref_r<T>::get_bit(int n) const if (n == 0) { return m_obj.get_bit(m_index); } else { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); return Log_0; } } @@ -1747,7 +1747,7 @@ sc_bitref_r<T>::get_word(int n) const if (n == 0) { return (get_bit(n) & SC_DIGIT_ONE); } else { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); return 0; } } @@ -1759,7 +1759,7 @@ sc_bitref_r<T>::get_cword(int n) const if (n == 0) { return ((get_bit(n) & SC_DIGIT_TWO) >> 1); } else { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); return 0; } } @@ -2068,7 +2068,7 @@ sc_bitref<X>::set_bit(int n, value_type value) if (n == 0) { this->m_obj.set_bit(this->m_index, value); } else { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); } } @@ -2084,7 +2084,7 @@ sc_bitref<X>::set_word(int n, sc_digit w) temp = (temp & ~(1 << bi)) | ((w & 1) << bi); this->m_obj.set_word(wi, temp); } else { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); } } @@ -2100,7 +2100,7 @@ sc_bitref<X>::set_cword(int n, sc_digit w) temp = (temp & ~(1 << bi)) | ((w & 1) << bi); this->m_obj.set_cword(wi, temp); } else { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); } } @@ -2199,7 +2199,7 @@ sc_subref_r<X>::check_bounds() { int len = m_obj.length(); if (m_hi < 0 || m_hi >= len || m_lo < 0 || m_lo >= len) { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); sc_core::sc_abort(); // can't recover from here } if (reversed()) { @@ -2668,7 +2668,7 @@ sc_concref_r<X, Y>::get_bit(int n) const } else if (n < r_len + m_left.length()) { return value_type(m_left.get_bit(n - r_len)); } else { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); return Log_0; } } @@ -2683,7 +2683,7 @@ sc_concref_r<X, Y>::set_bit(int n, value_type v) } else if (n < r_len + m_left.length()) { m_left.set_bit(n - r_len, typename X::value_type(v)); } else { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); } } @@ -2692,7 +2692,7 @@ inline sc_digit sc_concref_r<X, Y>::get_word(int i) const { if (i < 0 || i >= size()) { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); } // 0 <= i < size() Y &r = m_right; @@ -2726,7 +2726,7 @@ inline void sc_concref_r<X, Y>::set_word(int i, sc_digit w) { if (i < 0 || i >= size()) { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); } // 0 <= i < size() Y &r = m_right; @@ -2765,7 +2765,7 @@ inline sc_digit sc_concref_r<X, Y>::get_cword(int i) const { if (i < 0 || i >= size()) { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); } // 0 <= i < size() Y &r = m_right; @@ -2799,7 +2799,7 @@ inline void sc_concref_r<X, Y>::set_cword(int i, sc_digit w) { if (i < 0 || i >= size()) { - SC_REPORT_ERROR("out of bounds", 0); + SC_REPORT_ERROR("(E5) out of bounds", 0); } // 0 <= i < size() Y &r = m_right; |