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>
This commit is contained in:
Gabe Black
2018-10-01 23:00:09 -07:00
parent 167e6c06b5
commit 20fd137dde
16 changed files with 16 additions and 16 deletions

View File

@@ -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() << ")";

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>