diff options
16 files changed, 16 insertions, 16 deletions
diff --git a/src/systemc/channel/sc_signal.cc b/src/systemc/channel/sc_signal.cc index e2c9bdf9e..702f20901 100644 --- 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 95d2bcaa2..069ae845a 100644 --- 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 95d2bcaa2..069ae845a 100644 --- 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 5be096a49..3b85b3dfa 100644 --- 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 7efe9540e..bf7146f24 100644 --- 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 1e2e6730e..f55b1661e 100644 --- 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 fa5aabca2..a7d4b16d6 100644 --- 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 2d63f201f..49e26b6f3 100644 --- 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 2d63f201f..49e26b6f3 100644 --- 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 2d63f201f..49e26b6f3 100644 --- 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 2d63f201f..49e26b6f3 100644 --- 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 2d63f201f..49e26b6f3 100644 --- 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 f9660d5a8..e08772b3a 100644 --- 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 1b061bb5f..b0f67c084 100644 --- 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 1b061bb5f..b0f67c084 100644 --- 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 1b061bb5f..b0f67c084 100644 --- 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> |