systemc: Fix a typo in one of the error messages.

This typo was added purposefully to match Accellera's output, but then
it was discovered that some test's golden output had the typo, and some
didn't. That must mean that not all tests have up to date output, and
that Accellera couldn't possibly pass all of their own tests.

To resolve this conflict, this change fixes the typo and manually
updates all the golden output.

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

diff --git a/src/systemc/channel/sc_signal.cc b/src/systemc/channel/sc_signal.cc
index e2c9bdf9eebca2b5a883f92fc469adafbdad556f..702f20901812401a0b9cb2a76aefc7b2db7fdc4c 100644 (file)
--- a/src/systemc/channel/sc_signal.cc
+++ b/src/systemc/channel/sc_signal.cc
@@ -77,7 +77,7 @@ reportSignalError(ScSignalBase *sig, sc_core::sc_object *first,
 {
     std::ostringstream ss;
     ss << "\n signal " << "`" << sig->name() << "' (" << sig->kind() << ")";
-    ss << "\n first driver `" << first->name() << "'  (" <<
+    ss << "\n first driver `" << first->name() << "' (" <<
         first->kind() << ")";
     ss << "\n second driver `" << second->name() << "' (" <<
         second->kind() << ")";

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test01/golden/test01.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test01/golden/test01.log
index 95d2bcaa29230e5098d008f3570c7e7e18cb17f2..069ae845a3ac1b986aaa34abb794103dac635290 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test01/golden/test01.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test01/golden/test01.log
@@ -2,7 +2,7 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `signal_0' (sc_signal)
- first driver `a.main_action1'  (sc_method_process)
+ first driver `a.main_action1' (sc_method_process)
  second driver `a.main_action2' (sc_method_process)
 In file: <removed by verify.pl>
 In process: a.main_action2 @ 500 ps

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test02/golden/test02.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test02/golden/test02.log
index 95d2bcaa29230e5098d008f3570c7e7e18cb17f2..069ae845a3ac1b986aaa34abb794103dac635290 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test02/golden/test02.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test02/golden/test02.log
@@ -2,7 +2,7 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `signal_0' (sc_signal)
- first driver `a.main_action1'  (sc_method_process)
+ first driver `a.main_action1' (sc_method_process)
  second driver `a.main_action2' (sc_method_process)
 In file: <removed by verify.pl>
 In process: a.main_action2 @ 500 ps

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test03/golden/test03.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test03/golden/test03.log
index 5be096a499da036f00ebd09db7af4800347544e2..3b85b3dfa984dddc50d9e64404c8d33c22924d19 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test03/golden/test03.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test03/golden/test03.log
@@ -2,7 +2,7 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `sig_int' (sc_signal)
- first driver `a.main_action1'  (sc_method_process)
+ first driver `a.main_action1' (sc_method_process)
  second driver `a.main_action2' (sc_method_process)
 In file: <removed by verify.pl>
 In process: a.main_action2 @ 500 ps

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test04/golden/test04.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test04/golden/test04.log
index 7efe9540e7ba162236454f8a9254cb254a2193dc..bf7146f24a8cc61916acf35baf89af91860c36ea 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test04/golden/test04.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test04/golden/test04.log
@@ -2,7 +2,7 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `signal_2' (sc_signal)
- first driver `a.main_action1'  (sc_method_process)
+ first driver `a.main_action1' (sc_method_process)
  second driver `a.main_action2' (sc_method_process)
 In file: <removed by verify.pl>
 In process: a.main_action2 @ 500 ps

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test05/golden/test05.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test05/golden/test05.log
index 1e2e6730e4db674f6cb3a4d7989419abfdbf88aa..f55b1661e7e2af4bb45912f469482864015eaacb 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test05/golden/test05.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test05/golden/test05.log
@@ -2,7 +2,7 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `buffer_0' (sc_buffer)
- first driver `a.main_action1'  (sc_method_process)
+ first driver `a.main_action1' (sc_method_process)
  second driver `a.main_action2' (sc_method_process)
 In file: <removed by verify.pl>
 In process: a.main_action2 @ 500 ps

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test07/golden/test07.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test07/golden/test07.log
index fa5aabca25ca68228ceeb4a315732853655f2545..a7d4b16d69ce05d3f55935378664a985baff0e4e 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test07/golden/test07.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test07/golden/test07.log
@@ -2,7 +2,7 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `signal_1' (sc_signal)
- first driver `a.main_action1'  (sc_method_process)
+ first driver `a.main_action1' (sc_method_process)
  second driver `a.main_action2' (sc_method_process)
 In file: <removed by verify.pl>
 In process: a.main_action2 @ 500 ps

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test08/golden/test08.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test08/golden/test08.log
index 2d63f201f93048d3694819bccf043841040cc94c..49e26b6f38d70fc256826098c15795e7b1121a99 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test08/golden/test08.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test08/golden/test08.log
@@ -2,6 +2,6 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `signal_0' (sc_signal)
- first driver `a.port_2'  (sc_out)
+ first driver `a.port_2' (sc_out)
  second driver `a.port_1' (sc_out)
 In file: <removed by verify.pl>

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test09/golden/test09.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test09/golden/test09.log
index 2d63f201f93048d3694819bccf043841040cc94c..49e26b6f38d70fc256826098c15795e7b1121a99 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test09/golden/test09.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test09/golden/test09.log
@@ -2,6 +2,6 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `signal_0' (sc_signal)
- first driver `a.port_2'  (sc_out)
+ first driver `a.port_2' (sc_out)
  second driver `a.port_1' (sc_out)
 In file: <removed by verify.pl>

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test10/golden/test10.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test10/golden/test10.log
index 2d63f201f93048d3694819bccf043841040cc94c..49e26b6f38d70fc256826098c15795e7b1121a99 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test10/golden/test10.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test10/golden/test10.log
@@ -2,6 +2,6 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `signal_0' (sc_signal)
- first driver `a.port_2'  (sc_out)
+ first driver `a.port_2' (sc_out)
  second driver `a.port_1' (sc_out)
 In file: <removed by verify.pl>

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test11/golden/test11.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test11/golden/test11.log
index 2d63f201f93048d3694819bccf043841040cc94c..49e26b6f38d70fc256826098c15795e7b1121a99 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test11/golden/test11.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test11/golden/test11.log
@@ -2,6 +2,6 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `signal_0' (sc_signal)
- first driver `a.port_2'  (sc_out)
+ first driver `a.port_2' (sc_out)
  second driver `a.port_1' (sc_out)
 In file: <removed by verify.pl>

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test12/golden/test12.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test12/golden/test12.log
index 2d63f201f93048d3694819bccf043841040cc94c..49e26b6f38d70fc256826098c15795e7b1121a99 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test12/golden/test12.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test12/golden/test12.log
@@ -2,6 +2,6 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `signal_0' (sc_signal)
- first driver `a.port_2'  (sc_out)
+ first driver `a.port_2' (sc_out)
  second driver `a.port_1' (sc_out)
 In file: <removed by verify.pl>

diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test14/golden/test14.log b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test14/golden/test14.log
index f9660d5a8dd6200785d7a67ebc4d61394cff3edc..e08772b3afd49975562c2fd2834c5f4ae69bcd9c 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test14/golden/test14.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test14/golden/test14.log
@@ -2,7 +2,7 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `dut.sig' (sc_signal)
- first driver `dut.p2'  (sc_thread_process)
+ first driver `dut.p2' (sc_thread_process)
  second driver `dut.p1' (sc_thread_process)
 In file: <removed by verify.pl>
 In process: dut.p1 @ 10 ns

diff --git a/src/systemc/tests/systemc/communication/sc_signal/register_port/test01/golden/test01.log b/src/systemc/tests/systemc/communication/sc_signal/register_port/test01/golden/test01.log
index 1b061bb5f40c210e75e06b82b08e714806b89b73..b0f67c0841204d751fd061d0d86c0f417e92e1a9 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/register_port/test01/golden/test01.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/register_port/test01/golden/test01.log
@@ -2,6 +2,6 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `t1.signal_0' (sc_signal)
- first driver `t1.w2.port_0'  (sc_out)
+ first driver `t1.w2.port_0' (sc_out)
  second driver `t1.w1.port_0' (sc_out)
 In file: <removed by verify.pl>

diff --git a/src/systemc/tests/systemc/communication/sc_signal/register_port/test02/golden/test02.log b/src/systemc/tests/systemc/communication/sc_signal/register_port/test02/golden/test02.log
index 1b061bb5f40c210e75e06b82b08e714806b89b73..b0f67c0841204d751fd061d0d86c0f417e92e1a9 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/register_port/test02/golden/test02.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/register_port/test02/golden/test02.log
@@ -2,6 +2,6 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `t1.signal_0' (sc_signal)
- first driver `t1.w2.port_0'  (sc_out)
+ first driver `t1.w2.port_0' (sc_out)
  second driver `t1.w1.port_0' (sc_out)
 In file: <removed by verify.pl>

diff --git a/src/systemc/tests/systemc/communication/sc_signal/register_port/test03/golden/test03.log b/src/systemc/tests/systemc/communication/sc_signal/register_port/test03/golden/test03.log
index 1b061bb5f40c210e75e06b82b08e714806b89b73..b0f67c0841204d751fd061d0d86c0f417e92e1a9 100644 (file)
--- a/src/systemc/tests/systemc/communication/sc_signal/register_port/test03/golden/test03.log
+++ b/src/systemc/tests/systemc/communication/sc_signal/register_port/test03/golden/test03.log
@@ -2,6 +2,6 @@ SystemC Simulation
 
 Error: (E115) sc_signal<T> cannot have more than one driver: 
  signal `t1.signal_0' (sc_signal)
- first driver `t1.w2.port_0'  (sc_out)
+ first driver `t1.w2.port_0' (sc_out)
  second driver `t1.w1.port_0' (sc_out)
 In file: <removed by verify.pl>