From: Gabe Black <gabeblack@google.com>
Date: Sat, 15 Sep 2018 22:33:58 +0000 (-0700)
Subject: systemc: Change an error message to match the reference outputs.
X-Git-Tag: v19.0.0.0~1582
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=56b5284beec8909eb78086db7af8ff9c2f366519;p=gem5.git

systemc: Change an error message to match the reference outputs.

This is different from the message the Accellera implementation would
print, so it looks like it wouldn't pass this test as is.

Change-Id: I0286fd3e3df7bc3e87f38c35086a32d8dec0bcc9
Reviewed-on: https://gem5-review.googlesource.com/c/12814
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
---

diff --git a/src/systemc/channel/sc_in_resolved.cc b/src/systemc/channel/sc_in_resolved.cc
index 40190c895..94cb55a89 100644
--- a/src/systemc/channel/sc_in_resolved.cc
+++ b/src/systemc/channel/sc_in_resolved.cc
@@ -47,7 +47,7 @@ sc_in_resolved::end_of_elaboration()
 {
     sc_in<sc_dt::sc_logic>::end_of_elaboration();
     if (!dynamic_cast<sc_signal_resolved *>(get_interface())) {
-        std::string msg = csprintf("%s (%s)", name(), kind());
+        std::string msg = csprintf("port '%s' (%s)", name(), kind());
         SC_REPORT_ERROR("(E117) resolved port not bound to resolved signal",
                 msg.c_str());
     }
diff --git a/src/systemc/channel/sc_inout_resolved.cc b/src/systemc/channel/sc_inout_resolved.cc
index 8355a8847..2f3dd1883 100644
--- a/src/systemc/channel/sc_inout_resolved.cc
+++ b/src/systemc/channel/sc_inout_resolved.cc
@@ -48,7 +48,7 @@ sc_inout_resolved::end_of_elaboration()
 {
     sc_inout<sc_dt::sc_logic>::end_of_elaboration();
     if (!dynamic_cast<sc_signal_resolved *>(get_interface())) {
-        std::string msg = csprintf("%s (%s)", name(), kind());
+        std::string msg = csprintf("port '%s' (%s)", name(), kind());
         SC_REPORT_ERROR("(E117) resolved port not bound to resolved signal",
                 msg.c_str());
     }
diff --git a/src/systemc/ext/channel/sc_inout_rv.hh b/src/systemc/ext/channel/sc_inout_rv.hh
index 5ff9d105e..046146924 100644
--- a/src/systemc/ext/channel/sc_inout_rv.hh
+++ b/src/systemc/ext/channel/sc_inout_rv.hh
@@ -94,7 +94,7 @@ class sc_inout_rv : public sc_inout<sc_dt::sc_lv<W>>
         sc_inout<sc_dt::sc_lv<W> >::end_of_elaboration();
         if (!dynamic_cast<sc_signal_rv<W> *>(this->get_interface())) {
             std::ostringstream ss;
-            ss << this->name() << " (" << this->kind() << ")";
+            ss << "port '" << this->name() << "' (" << this->kind() << ")";
             SC_REPORT_ERROR(
                     "(E117) resolved port not bound to resolved signal",
                     ss.str().c_str());