From b366cbcde953e2adddc10a2825e2803b5f8a9bdd Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sun, 7 Oct 2018 03:02:56 -0700 Subject: 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 Maintainer: Gabe Black --- src/systemc/ext/utils/_using.hh | 17 +++++++++ src/systemc/ext/utils/_utils.hh | 1 + src/systemc/ext/utils/messages.hh | 55 ++++++++++++++++++++++++++++++ src/systemc/ext/utils/sc_report_handler.hh | 4 ++- src/systemc/ext/utils/sc_vector.hh | 5 ++- 5 files changed, 78 insertions(+), 4 deletions(-) create mode 100644 src/systemc/ext/utils/messages.hh (limited to 'src/systemc/ext/utils') diff --git a/src/systemc/ext/utils/_using.hh b/src/systemc/ext/utils/_using.hh index 721f40383..2cbb7254f 100644 --- a/src/systemc/ext/utils/_using.hh +++ b/src/systemc/ext/utils/_using.hh @@ -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__ diff --git a/src/systemc/ext/utils/_utils.hh b/src/systemc/ext/utils/_utils.hh index d76caf9ec..6c19ac230 100644 --- a/src/systemc/ext/utils/_utils.hh +++ b/src/systemc/ext/utils/_utils.hh @@ -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" diff --git a/src/systemc/ext/utils/messages.hh b/src/systemc/ext/utils/messages.hh new file mode 100644 index 000000000..09c8c06d2 --- /dev/null +++ b/src/systemc/ext/utils/messages.hh @@ -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__ diff --git a/src/systemc/ext/utils/sc_report_handler.hh b/src/systemc/ext/utils/sc_report_handler.hh index f65b32cca..a3bf314bb 100644 --- a/src/systemc/ext/utils/sc_report_handler.hh +++ b/src/systemc/ext/utils/sc_report_handler.hh @@ -32,6 +32,7 @@ #include +#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); diff --git a/src/systemc/ext/utils/sc_vector.hh b/src/systemc/ext/utils/sc_vector.hh index f005751d5..f5a8f9ccb 100644 --- a/src/systemc/ext/utils/sc_vector.hh +++ b/src/systemc/ext/utils/sc_vector.hh @@ -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; -- cgit v1.2.3