luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-10-06 01:54:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Include systemc instead of systemc.h in model header files (#4622) (#4623)

Browse Source 
This may require that SystemC programs add:
using namespace sc_core;
using namespace sc_dt;
This commit is contained in:
Chih-Mao Chen
2023-10-26 14:36:18 -04:00
committed by GitHub
parent a87fb57656
commit 98252634fc
18 changed files with 184 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3EmitCModel.cpp
+5 -4
View File
@@ -112,7 +112,7 @@ class EmitCModel final : public EmitCFunc {
}
}
}
if (optSystemC() && v3Global.usesTiming()) puts("sc_event trigger_eval;\n");
if (optSystemC() && v3Global.usesTiming()) puts("sc_core::sc_event trigger_eval;\n");
// Cells instantiated by the top level (for access to /* verilator public */)
puts("\n// CELLS\n"
@@ -200,7 +200,7 @@ class EmitCModel final : public EmitCFunc {
}
if (v3Global.opt.trace() && optSystemC()) {
puts("/// SC tracing; avoid overloaded virtual function lint warning\n");
puts("void trace(sc_trace_file* tfp) const override { "
puts("void trace(sc_core::sc_trace_file* tfp) const override { "
"::sc_core::sc_module::trace(tfp); }\n");
}
@@ -255,7 +255,7 @@ class EmitCModel final : public EmitCFunc {
puts("\n");
puts(topClassName() + "::" + topClassName());
if (optSystemC()) {
puts("(sc_module_name /* unused */)\n");
puts("(sc_core::sc_module_name /* unused */)\n");
puts(" : VerilatedModel{*Verilated::threadContextp()}\n");
puts(" , vlSymsp{new " + symClassName() + "(contextp(), name(), this)}\n");
} else {
@@ -364,7 +364,8 @@ class EmitCModel final : public EmitCFunc {
puts("\nvoid " + topClassName() + "::eval() {\n");
puts("eval_step();\n");
puts("if (eventsPending()) {\n");
puts("sc_time dt = sc_time::from_value(nextTimeSlot() - contextp()->time());\n");
puts("sc_core::sc_time dt = sc_core::sc_time::from_value(nextTimeSlot() - "
"contextp()->time());\n");
puts("next_trigger(dt, trigger_eval);\n");
puts("} else {\n");
puts("next_trigger(trigger_eval);\n");