45a46
> #include "systemc/ext/core/messages.hh"
61,62c62,63
< SC_REPORT_ERROR("(E541) call to SC_METHOD in sc_module while "
< "simulation running", name.c_str());
---
> SC_REPORT_ERROR(sc_core::SC_ID_MODULE_METHOD_AFTER_START_,
> name.c_str());
76,77c77,78
< SC_REPORT_ERROR("(E542) call to SC_THREAD in sc_module while "
< "simulation running", name.c_str());
---
> SC_REPORT_ERROR(sc_core::SC_ID_MODULE_THREAD_AFTER_START_,
> name.c_str());
91,92c92,93
< SC_REPORT_ERROR("(E543) call to SC_CTHREAD in sc_module while "
< "simulation running", name.c_str());
---
> SC_REPORT_ERROR(sc_core::SC_ID_MODULE_CTHREAD_AFTER_START_,
> name.c_str());
255,262c256,259
< if (sc_is_running()) {
< SC_REPORT_ERROR("(E529) insert module failed", "simulation running");
< std::cout << "Running!\n";
< }
< if (::sc_gem5::scheduler.elaborationDone()) {
< SC_REPORT_ERROR("(E529) insert module failed", "elaboration done");
< std::cout << "Elaboration done!\n";
< }
---
> if (sc_is_running())
> SC_REPORT_ERROR(SC_ID_INSERT_MODULE_, "simulation running");
> if (::sc_gem5::scheduler.elaborationDone())
> SC_REPORT_ERROR(SC_ID_INSERT_MODULE_, "elaboration done");
269,271c266
< SC_REPORT_WARNING("(W569) sc_module(const char*), "
< "sc_module(const std::string&) have been deprecated, use "
< "sc_module(const sc_module_name&)", _name);
---
> SC_REPORT_WARNING(SC_ID_BAD_SC_MODULE_CONSTRUCTOR_, _name);
277,279c272
< SC_REPORT_WARNING("(W569) sc_module(const char*), "
< "sc_module(const std::string&) have been deprecated, use "
< "sc_module(const sc_module_name&)", _name.c_str());
---
> SC_REPORT_WARNING(SC_ID_BAD_SC_MODULE_CONSTRUCTOR_, _name.c_str());
342,345c335,336
< if (p->procKind() == SC_CTHREAD_PROC_) {
< SC_REPORT_WARNING("(W524) dont_initialize() has no effect for "
< "SC_CTHREADs", "");
< }
---
> if (p->procKind() == SC_CTHREAD_PROC_)
> SC_REPORT_WARNING(SC_ID_DONT_INITIALIZE_, "");
648,649c639
< SC_REPORT_ERROR(
< "(E519) wait() is only allowed in SC_THREADs and SC_CTHREADs",
---
> SC_REPORT_ERROR(SC_ID_WAIT_NOT_ALLOWED_,
674c664
< SC_REPORT_ERROR("(E525) wait(n) is only valid for n > 0", msg.c_str());
---
> SC_REPORT_ERROR(SC_ID_WAIT_N_INVALID_, msg.c_str());
829,830c819
< SC_REPORT_ERROR(
< "(E532) cannot generate unique name from null string", "");
---
> SC_REPORT_ERROR(SC_ID_GEN_UNIQUE_NAME_, "");