derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemc: Switch to using predefined messages for utils.

Browse Source 
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>
This commit is contained in:
Gabe Black
2018-10-07 03:02:56 -07:00
parent 98f40c54a3
commit b366cbcde9
20 changed files with 213 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/systemc/ext/dt/bit/sc_bit_proxies.hh
View File

@@ -31,6 +31,7 @@
#include <iostream>
#include "../../utils/messages.hh"
#include "sc_proxy.hh"
namespace sc_dt
@@ -1735,7 +1736,7 @@ sc_bitref_r<T>::get_bit(int n) const
if (n == 0) {
return m_obj.get_bit(m_index);
} else {
SC_REPORT_ERROR("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
return Log_0;
}
}
@@ -1747,7 +1748,7 @@ sc_bitref_r<T>::get_word(int n) const
if (n == 0) {
return (get_bit(n) & SC_DIGIT_ONE);
} else {
SC_REPORT_ERROR("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
return 0;
}
}
@@ -1759,7 +1760,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("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
return 0;
}
}
@@ -2068,7 +2069,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("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
}
}
@@ -2084,7 +2085,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("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
}
}
@@ -2100,7 +2101,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("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
}
}
@@ -2199,7 +2200,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("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
sc_core::sc_abort(); // can't recover from here
}
if (reversed()) {
@@ -2668,7 +2669,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("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
return Log_0;
}
}
@@ -2683,7 +2684,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("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
}
}
@@ -2692,7 +2693,7 @@ inline sc_digit
sc_concref_r<X, Y>::get_word(int i) const
{
if (i < 0 || i >= size()) {
SC_REPORT_ERROR("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
}
// 0 <= i < size()
Y &r = m_right;
@@ -2726,7 +2727,7 @@ inline void
sc_concref_r<X, Y>::set_word(int i, sc_digit w)
{
if (i < 0 || i >= size()) {
SC_REPORT_ERROR("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
}
// 0 <= i < size()
Y &r = m_right;
@@ -2765,7 +2766,7 @@ inline sc_digit
sc_concref_r<X, Y>::get_cword(int i) const
{
if (i < 0 || i >= size()) {
SC_REPORT_ERROR("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
}
// 0 <= i < size()
Y &r = m_right;
@@ -2799,7 +2800,7 @@ inline void
sc_concref_r<X, Y>::set_cword(int i, sc_digit w)
{
if (i < 0 || i >= size()) {
SC_REPORT_ERROR("(E5) out of bounds", 0);
SC_REPORT_ERROR(sc_core::SC_ID_OUT_OF_BOUNDS_, 0);
}
// 0 <= i < size()
Y &r = m_right;

3
src/systemc/ext/dt/fx/sc_fxdefs.hh
View File

@@ -47,6 +47,7 @@
#ifndef __SYSTEMC_EXT_DT_FX_SC_FXDEFS_HH__
#define __SYSTEMC_EXT_DT_FX_SC_FXDEFS_HH__
#include "../../utils/messages.hh"
#include "../../utils/sc_report_handler.hh"
#include "../int/sc_nbutils.hh"
@@ -241,7 +242,7 @@ const int SC_DEFAULT_MAX_WL_ = SC_BUILTIN_MAX_WL_;
#ifdef DEBUG_SYSTEMC
# define SC_ASSERT_(cnd, msg) \
SC_ERROR_IF_IMPL_(!(cnd), "internal error", msg)
SC_ERROR_IF_IMPL_(!(cnd), sc_core::SC_ID_INTERNAL_ERROR_, msg)
#else
# define SC_ASSERT_(cnd, msg) (void(0))
#endif

17
src/systemc/ext/utils/_using.hh
View File

@@ -98,4 +98,21 @@ using sc_core::sc_release;
using sc_core::sc_copyright;
using sc_core::sc_version;
using sc_core::SC_ID_UNKNOWN_ERROR_;
using sc_core::SC_ID_WITHOUT_MESSAGE_;
using sc_core::SC_ID_NOT_IMPLEMENTED_;
using sc_core::SC_ID_INTERNAL_ERROR_;
using sc_core::SC_ID_ASSERTION_FAILED_;
using sc_core::SC_ID_OUT_OF_BOUNDS_;
using sc_core::SC_ID_ABORT_;
using sc_core::SC_ID_REGISTER_ID_FAILED_;
using sc_core::SC_ID_STRING_TOO_LONG_;
using sc_core::SC_ID_FRONT_ON_EMPTY_LIST_;
using sc_core::SC_ID_BACK_ON_EMPTY_LIST_;
using sc_core::SC_ID_IEEE_1666_DEPRECATION_;
using sc_core::SC_ID_VECTOR_INIT_CALLED_TWICE_;
using sc_core::SC_ID_VECTOR_BIND_EMPTY_;
using sc_core::SC_ID_VECTOR_NONOBJECT_ELEMENTS_;
#endif //__SYSTEMC_EXT_UTILS__USING_HH__

1
src/systemc/ext/utils/_utils.hh
View File

@@ -31,6 +31,7 @@
#define __SYSTEMC_EXT_UTIL__UTIL_HH__
#include "functions.hh"
#include "messages.hh"
#include "sc_exception.hh"
#include "sc_report.hh"
#include "sc_report_handler.hh"

55
src/systemc/ext/utils/messages.hh Normal file
View File

@@ -0,0 +1,55 @@
/*
* Copyright 2018 Google, Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Authors: Gabe Black
*/
#ifndef __SYSTEMC_EXT_UTILS_MESSAGES_HH__
#define __SYSTEMC_EXT_UTILS_MESSAGES_HH__
namespace sc_core
{
extern const char SC_ID_UNKNOWN_ERROR_[];
extern const char SC_ID_WITHOUT_MESSAGE_[];
extern const char SC_ID_NOT_IMPLEMENTED_[];
extern const char SC_ID_INTERNAL_ERROR_[];
extern const char SC_ID_ASSERTION_FAILED_[];
extern const char SC_ID_OUT_OF_BOUNDS_[];
extern const char SC_ID_ABORT_[];
extern const char SC_ID_REGISTER_ID_FAILED_[];
extern const char SC_ID_STRING_TOO_LONG_[];
extern const char SC_ID_FRONT_ON_EMPTY_LIST_[];
extern const char SC_ID_BACK_ON_EMPTY_LIST_[];
extern const char SC_ID_IEEE_1666_DEPRECATION_[];
extern const char SC_ID_VECTOR_INIT_CALLED_TWICE_[];
extern const char SC_ID_VECTOR_BIND_EMPTY_[];
extern const char SC_ID_VECTOR_NONOBJECT_ELEMENTS_[];
} // namespace sc_core
#endif // __SYSTEMC_EXT_UTILS_MESSAGES_HH__

4
src/systemc/ext/utils/sc_report_handler.hh
View File

@@ -32,6 +32,7 @@
#include <string>
#include "messages.hh"
#include "sc_report.hh" // for sc_severity
namespace sc_core
@@ -134,7 +135,8 @@ class sc_report_handler
::sc_core::SC_FATAL, msg_type, msg, __FILE__, __LINE__)
#define sc_assert(expr) \
((void)((expr) ? 0 : (SC_REPORT_FATAL("assertion failed", #expr), 0)))
((void)((expr) ? 0 : (SC_REPORT_FATAL( \
::sc_core::SC_ID_ASSERTION_FAILED_, #expr), 0)))
void sc_interrupt_here(const char *msg_type, sc_severity);
void sc_stop_here(const char *msg_type, sc_severity);

5
src/systemc/ext/utils/sc_vector.hh
View File

@@ -57,6 +57,7 @@
#include "../core/sc_module.hh"
#include "../core/sc_object.hh"
#include "messages.hh"
namespace sc_gem5
{
@@ -182,9 +183,7 @@ class sc_vector_base : public sc_object
sc_object *implicitCast(sc_object *p) const { return p; }
sc_object *implicitCast(...) const
{
SC_REPORT_ERROR(
"(E808) sc_vector::get_elements called for element type "
"not derived from sc_object", name());
SC_REPORT_ERROR(SC_ID_VECTOR_NONOBJECT_ELEMENTS_, name());
return nullptr;
}
virtual sc_object *objectCast(void *) const = 0;