[*] rtlgen updates: improved sensitivity list generation and VCD trac…

…ing variable list. Minor changes in '0 initialization

sc/prj/impl/asic/asic_top.cpp

@@ -223,6 +223,12 @@ void asic_top::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, io_sd_cd_dat3, io_sd_cd_dat3.name());
         sc_trace(o_vcd, i_sd_detected, i_sd_detected.name());
         sc_trace(o_vcd, i_sd_protect, i_sd_protect.name());
+        sc_trace(o_vcd, ddr_xslvo, ddr_xslvo.name());
+        sc_trace(o_vcd, ddr_xslvi, ddr_xslvi.name());
+        sc_trace(o_vcd, ddr_apbi, ddr_apbi.name());
+        sc_trace(o_vcd, ddr_apbo, ddr_apbo.name());
+        sc_trace(o_vcd, prci_apbi, prci_apbi.name());
+        sc_trace(o_vcd, prci_apbo, prci_apbo.name());
     }
 
     if (iclk0) {

sc/rtl/ambalib/apb_slv.cpp

@@ -66,8 +66,6 @@ apb_slv::apb_slv(sc_module_name name,
 void apb_slv::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_apbi, i_apbi.name());
         sc_trace(o_vcd, o_apbo, o_apbo.name());
         sc_trace(o_vcd, o_req_valid, o_req_valid.name());

sc/rtl/ambalib/axi2apb_bus1.cpp

@@ -101,8 +101,6 @@ axi2apb_bus1::~axi2apb_bus1() {
 void axi2apb_bus1::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_xslvi, i_xslvi.name());
         sc_trace(o_vcd, o_xslvo, o_xslvo.name());
         sc_trace(o_vcd, r.state, pn + ".r_state");

sc/rtl/ambalib/axi_slv.cpp

@@ -81,8 +81,6 @@ axi_slv::axi_slv(sc_module_name name,
 void axi_slv::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_xslvi, i_xslvi.name());
         sc_trace(o_vcd, o_xslvo, o_xslvo.name());
         sc_trace(o_vcd, o_req_valid, o_req_valid.name());

sc/rtl/ambalib/axictrl_bus0.cpp

@@ -100,7 +100,8 @@ axictrl_bus0::~axictrl_bus0() {
 void axictrl_bus0::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
+        sc_trace(o_vcd, wb_def_xslvi, wb_def_xslvi.name());
+        sc_trace(o_vcd, wb_def_xslvo, wb_def_xslvo.name());
         sc_trace(o_vcd, r.r_midx, pn + ".r_r_midx");
         sc_trace(o_vcd, r.r_sidx, pn + ".r_r_sidx");
         sc_trace(o_vcd, r.w_midx, pn + ".r_w_midx");

sc/rtl/misclib/apb_ddr.cpp

@@ -95,8 +95,6 @@ apb_ddr::~apb_ddr() {
 void apb_ddr::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_apbi, i_apbi.name());
         sc_trace(o_vcd, o_apbo, o_apbo.name());
         sc_trace(o_vcd, i_pll_locked, i_pll_locked.name());

sc/rtl/misclib/apb_gpio.h

@@ -156,8 +156,6 @@ template<int width>
 void apb_gpio<width>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_apbi, i_apbi.name());
         sc_trace(o_vcd, o_apbo, o_apbo.name());
         sc_trace(o_vcd, i_gpio, i_gpio.name());

sc/rtl/misclib/apb_pnp.h

@@ -194,8 +194,6 @@ template<int cfg_slots>
 void apb_pnp<cfg_slots>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_apbi, i_apbi.name());
         sc_trace(o_vcd, o_apbo, o_apbo.name());
         sc_trace(o_vcd, o_irq, o_irq.name());

sc/rtl/misclib/apb_prci.cpp

@@ -98,8 +98,6 @@ void apb_prci::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, o_sys_rst, o_sys_rst.name());
         sc_trace(o_vcd, o_sys_nrst, o_sys_nrst.name());
         sc_trace(o_vcd, o_dbg_nrst, o_dbg_nrst.name());
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_apbi, i_apbi.name());
         sc_trace(o_vcd, o_apbo, o_apbo.name());
         sc_trace(o_vcd, r.sys_rst, pn + ".r_sys_rst");

sc/rtl/misclib/apb_spi.h

@@ -274,8 +274,6 @@ template<int log2_fifosz>
 void apb_spi<log2_fifosz>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_apbi, i_apbi.name());
         sc_trace(o_vcd, o_apbo, o_apbo.name());
         sc_trace(o_vcd, o_cs, o_cs.name());

sc/rtl/misclib/apb_uart.h

@@ -216,8 +216,6 @@ template<int log2_fifosz>
 void apb_uart<log2_fifosz>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_apbi, i_apbi.name());
         sc_trace(o_vcd, o_apbo, o_apbo.name());
         sc_trace(o_vcd, i_rd, i_rd.name());

sc/rtl/misclib/axi_rom.h

@@ -147,8 +147,6 @@ axi_rom<abits>::~axi_rom() {
 template<int abits>
 void axi_rom<abits>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_xslvi, i_xslvi.name());
         sc_trace(o_vcd, o_xslvo, o_xslvo.name());
     }

sc/rtl/misclib/axi_sram.h

@@ -144,8 +144,6 @@ axi_sram<abits>::~axi_sram() {
 template<int abits>
 void axi_sram<abits>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_xslvi, i_xslvi.name());
         sc_trace(o_vcd, o_xslvo, o_xslvo.name());
     }

sc/rtl/misclib/clint.h

@@ -135,8 +135,6 @@ clint<cpu_total>::clint(sc_module_name name,
     sensitive << wb_resp_rdata;
     sensitive << wb_resp_err;
     sensitive << r.mtime;
-    for (int i = 0; i < cpu_total; i++) {
-    }
     sensitive << r.rdata;
 
     SC_METHOD(registers);
@@ -155,8 +153,6 @@ template<int cpu_total>
 void clint<cpu_total>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_xslvi, i_xslvi.name());
         sc_trace(o_vcd, o_xslvo, o_xslvo.name());
         sc_trace(o_vcd, o_mtimer, o_mtimer.name());
@@ -165,6 +161,12 @@ void clint<cpu_total>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, r.mtime, pn + ".r_mtime");
         for (int i = 0; i < cpu_total; i++) {
             char tstr[1024];
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_hart%d_msip", pn.c_str(), i);
+            sc_trace(o_vcd, r.hart[i].msip, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_hart%d_mtip", pn.c_str(), i);
+            sc_trace(o_vcd, r.hart[i].mtip, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_hart%d_mtimecmp", pn.c_str(), i);
+            sc_trace(o_vcd, r.hart[i].mtimecmp, tstr);
         }
         sc_trace(o_vcd, r.rdata, pn + ".r_rdata");
     }

sc/rtl/misclib/plic.h

@@ -143,8 +143,6 @@ plic<ctxmax, irqmax>::plic(sc_module_name name,
     sensitive << r.src_priority;
     sensitive << r.pending;
     sensitive << r.ip;
-    for (int i = 0; i < ctxmax; i++) {
-    }
     sensitive << r.rdata;
 
     SC_METHOD(registers);
@@ -163,8 +161,6 @@ template<int ctxmax, int irqmax>
 void plic<ctxmax, irqmax>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_xslvi, i_xslvi.name());
         sc_trace(o_vcd, o_xslvo, o_xslvo.name());
         sc_trace(o_vcd, i_irq_request, i_irq_request.name());
@@ -174,6 +170,20 @@ void plic<ctxmax, irqmax>::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vc
         sc_trace(o_vcd, r.ip, pn + ".r_ip");
         for (int i = 0; i < ctxmax; i++) {
             char tstr[1024];
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_ctx%d_priority_th", pn.c_str(), i);
+            sc_trace(o_vcd, r.ctx[i].priority_th, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_ctx%d_ie", pn.c_str(), i);
+            sc_trace(o_vcd, r.ctx[i].ie, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_ctx%d_ip_prio", pn.c_str(), i);
+            sc_trace(o_vcd, r.ctx[i].ip_prio, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_ctx%d_prio_mask", pn.c_str(), i);
+            sc_trace(o_vcd, r.ctx[i].prio_mask, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_ctx%d_sel_prio", pn.c_str(), i);
+            sc_trace(o_vcd, r.ctx[i].sel_prio, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_ctx%d_irq_idx", pn.c_str(), i);
+            sc_trace(o_vcd, r.ctx[i].irq_idx, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_ctx%d_irq_prio", pn.c_str(), i);
+            sc_trace(o_vcd, r.ctx[i].irq_prio, tstr);
         }
         sc_trace(o_vcd, r.rdata, pn + ".r_rdata");
     }

sc/rtl/riscv_soc.cpp

@@ -415,18 +415,14 @@ void riscv_soc::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, i_sd_detected, i_sd_detected.name());
         sc_trace(o_vcd, i_sd_protect, i_sd_protect.name());
         sc_trace(o_vcd, o_dmreset, o_dmreset.name());
-        sc_trace(o_vcd, o_prci_pmapinfo, o_prci_pmapinfo.name());
-        sc_trace(o_vcd, i_prci_pdevcfg, i_prci_pdevcfg.name());
         sc_trace(o_vcd, o_prci_apbi, o_prci_apbi.name());
         sc_trace(o_vcd, i_prci_apbo, i_prci_apbo.name());
-        sc_trace(o_vcd, o_ddr_pmapinfo, o_ddr_pmapinfo.name());
-        sc_trace(o_vcd, i_ddr_pdevcfg, i_ddr_pdevcfg.name());
         sc_trace(o_vcd, o_ddr_apbi, o_ddr_apbi.name());
         sc_trace(o_vcd, i_ddr_apbo, i_ddr_apbo.name());
-        sc_trace(o_vcd, o_ddr_xmapinfo, o_ddr_xmapinfo.name());
-        sc_trace(o_vcd, i_ddr_xdevcfg, i_ddr_xdevcfg.name());
         sc_trace(o_vcd, o_ddr_xslvi, o_ddr_xslvi.name());
         sc_trace(o_vcd, i_ddr_xslvo, i_ddr_xslvo.name());
+        sc_trace(o_vcd, acpo, acpo.name());
+        sc_trace(o_vcd, acpi, acpi.name());
     }
 
     if (bus0) {

sc/rtl/riverlib/cache/pmp.cpp

@@ -75,6 +75,12 @@ void PMP::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, o_x, o_x.name());
         for (int i = 0; i < CFG_PMP_TBL_SIZE; i++) {
             char tstr[1024];
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_tbl%d_start_addr", pn.c_str(), i);
+            sc_trace(o_vcd, r.tbl[i].start_addr, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_tbl%d_end_addr", pn.c_str(), i);
+            sc_trace(o_vcd, r.tbl[i].end_addr, tstr);
+            RISCV_sprintf(tstr, sizeof(tstr), "%s.r_tbl%d_flags", pn.c_str(), i);
+            sc_trace(o_vcd, r.tbl[i].flags, tstr);
         }
     }
 

sc/rtl/riverlib/core/arith/divstage64.cpp

@@ -86,7 +86,7 @@ void divstage64::comb() {
     wb_divident = 0;
     wb_divisor = 0;
     for (int i = 0; i < 16; i++) {
-        wb_thresh[i] = 0ull;
+        wb_thresh[i] = 0;
     }
 
     wb_divident = i_divident.read().to_uint64();

sc/rtl/riverlib/core/arith/int_mul.cpp

@@ -119,13 +119,13 @@ void IntMul::comb() {
     vb_a2 = 0;
     wb_mux_lvl0 = 0;
     for (int i = 0; i < 32; i++) {
-        wb_lvl0[i] = 0ull;
+        wb_lvl0[i] = 0;
     }
     for (int i = 0; i < 8; i++) {
-        wb_lvl2[i] = 0ull;
+        wb_lvl2[i] = 0;
     }
     for (int i = 0; i < 2; i++) {
-        wb_lvl4[i] = 0ull;
+        wb_lvl4[i] = 0;
     }
     wb_lvl5 = 0;
     wb_res32 = 0;
@@ -303,10 +303,10 @@ void IntMul::comb() {
         v.a2_dbg = 0;
         v.reference_mul = 0ull;
         for (int i = 0; i < 16; i++) {
-            v.lvl1[i] = 0ull;
+            v.lvl1[i] = 0;
         }
         for (int i = 0; i < 4; i++) {
-            v.lvl3[i] = 0ull;
+            v.lvl3[i] = 0;
         }
     }
 
@@ -330,10 +330,10 @@ void IntMul::registers() {
         r.a2_dbg = 0;
         r.reference_mul = 0ull;
         for (int i = 0; i < 16; i++) {
-            r.lvl1[i] = 0ull;
+            r.lvl1[i] = 0;
         }
         for (int i = 0; i < 4; i++) {
-            r.lvl3[i] = 0ull;
+            r.lvl3[i] = 0;
         }
     } else {
         r.busy = v.busy;

sc/rtl/riverlib/core/bp.cpp

@@ -154,10 +154,10 @@ void BranchPredictor::comb() {
     sc_uint<2> vb_ignore_pd;
 
     for (int i = 0; i < CFG_BP_DEPTH; i++) {
-        vb_addr[i] = 0ull;
+        vb_addr[i] = 0;
     }
     for (int i = 0; i < 4; i++) {
-        vb_piped[i] = 0ull;
+        vb_piped[i] = 0;
     }
     vb_fetch_npc = 0;
     v_btb_we = 0;

sc/rtl/riverlib/core/dec_rv.cpp

@@ -119,14 +119,12 @@ void DecoderRv::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, o_f64, o_f64.name());
         sc_trace(o_vcd, o_unsigned_op, o_unsigned_op.name());
         sc_trace(o_vcd, o_isa_type, o_isa_type.name());
-        sc_trace(o_vcd, o_instr_vec, o_instr_vec.name());
         sc_trace(o_vcd, o_exception, o_exception.name());
         sc_trace(o_vcd, o_instr_load_fault, o_instr_load_fault.name());
         sc_trace(o_vcd, o_instr_page_fault_x, o_instr_page_fault_x.name());
         sc_trace(o_vcd, o_progbuf_ena, o_progbuf_ena.name());
         sc_trace(o_vcd, r.pc, pn + ".r_pc");
         sc_trace(o_vcd, r.isa_type, pn + ".r_isa_type");
-        sc_trace(o_vcd, r.instr_vec, pn + ".r_instr_vec");
         sc_trace(o_vcd, r.instr, pn + ".r_instr");
         sc_trace(o_vcd, r.memop_store, pn + ".r_memop_store");
         sc_trace(o_vcd, r.memop_load, pn + ".r_memop_load");

sc/rtl/riverlib/core/dec_rvc.cpp

@@ -112,14 +112,12 @@ void DecoderRvc::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, o_f64, o_f64.name());
         sc_trace(o_vcd, o_unsigned_op, o_unsigned_op.name());
         sc_trace(o_vcd, o_isa_type, o_isa_type.name());
-        sc_trace(o_vcd, o_instr_vec, o_instr_vec.name());
         sc_trace(o_vcd, o_exception, o_exception.name());
         sc_trace(o_vcd, o_instr_load_fault, o_instr_load_fault.name());
         sc_trace(o_vcd, o_instr_page_fault_x, o_instr_page_fault_x.name());
         sc_trace(o_vcd, o_progbuf_ena, o_progbuf_ena.name());
         sc_trace(o_vcd, r.pc, pn + ".r_pc");
         sc_trace(o_vcd, r.isa_type, pn + ".r_isa_type");
-        sc_trace(o_vcd, r.instr_vec, pn + ".r_instr_vec");
         sc_trace(o_vcd, r.instr, pn + ".r_instr");
         sc_trace(o_vcd, r.memop_store, pn + ".r_memop_store");
         sc_trace(o_vcd, r.memop_load, pn + ".r_memop_load");

sc/rtl/riverlib/core/decoder.cpp

@@ -254,9 +254,6 @@ void InstrDecoder::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, o_instr_load_fault, o_instr_load_fault.name());
         sc_trace(o_vcd, o_instr_page_fault_x, o_instr_page_fault_x.name());
         sc_trace(o_vcd, o_progbuf_ena, o_progbuf_ena.name());
-        for (int i = 0; i < FULL_DEC_DEPTH; i++) {
-            char tstr[1024];
-        }
     }
 
     for (int i = 0; i < DEC_NUM; i++) {

sc/rtl/riverlib/core/fpu_d/imul53.cpp

@@ -99,7 +99,7 @@ void imul53::comb() {
 
     v_ena = 0;
     for (int i = 0; i < 17; i++) {
-        vb_mux[i] = 0ull;
+        vb_mux[i] = 0;
     }
     vb_sel = 0;
     vb_shift = 0;

sc/rtl/riverlib/core/tracer.cpp

@@ -156,20 +156,20 @@ Tracer::Tracer(sc_module_name name,
         sensitive << r.trace_tbl[i].instr;
         sensitive << r.trace_tbl[i].regactioncnt;
         sensitive << r.trace_tbl[i].memactioncnt;
-        for (int i = 0; i < TRACE_TBL_SZ; i++) {
-            sensitive << r.trace_tbl[i].regaction[i].waddr;
-            sensitive << r.trace_tbl[i].regaction[i].wres;
+        for (int j = 0; j < TRACE_TBL_SZ; j++) {
+            sensitive << r.trace_tbl[i].regaction[j].waddr;
+            sensitive << r.trace_tbl[i].regaction[j].wres;
         }
-        for (int i = 0; i < TRACE_TBL_SZ; i++) {
-            sensitive << r.trace_tbl[i].memaction[i].store;
-            sensitive << r.trace_tbl[i].memaction[i].size;
-            sensitive << r.trace_tbl[i].memaction[i].mask;
-            sensitive << r.trace_tbl[i].memaction[i].memaddr;
-            sensitive << r.trace_tbl[i].memaction[i].data;
-            sensitive << r.trace_tbl[i].memaction[i].regaddr;
-            sensitive << r.trace_tbl[i].memaction[i].complete;
-            sensitive << r.trace_tbl[i].memaction[i].sc_release;
-            sensitive << r.trace_tbl[i].memaction[i].ignored;
+        for (int j = 0; j < TRACE_TBL_SZ; j++) {
+            sensitive << r.trace_tbl[i].memaction[j].store;
+            sensitive << r.trace_tbl[i].memaction[j].size;
+            sensitive << r.trace_tbl[i].memaction[j].mask;
+            sensitive << r.trace_tbl[i].memaction[j].memaddr;
+            sensitive << r.trace_tbl[i].memaction[j].data;
+            sensitive << r.trace_tbl[i].memaction[j].regaddr;
+            sensitive << r.trace_tbl[i].memaction[j].complete;
+            sensitive << r.trace_tbl[i].memaction[j].sc_release;
+            sensitive << r.trace_tbl[i].memaction[j].ignored;
         }
         sensitive << r.trace_tbl[i].completed;
     }

sc/rtl/riverlib/dmi/dmidebug.cpp

@@ -183,8 +183,6 @@ void dmidebug::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, i_tms, i_tms.name());
         sc_trace(o_vcd, i_tdi, i_tdi.name());
         sc_trace(o_vcd, o_tdo, o_tdo.name());
-        sc_trace(o_vcd, i_mapinfo, i_mapinfo.name());
-        sc_trace(o_vcd, o_cfg, o_cfg.name());
         sc_trace(o_vcd, i_apbi, i_apbi.name());
         sc_trace(o_vcd, o_apbo, o_apbo.name());
         sc_trace(o_vcd, o_ndmreset, o_ndmreset.name());

sc/rtl/riverlib/workgroup.cpp

@@ -314,14 +314,13 @@ void Workgroup::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
         sc_trace(o_vcd, i_mtimer, i_mtimer.name());
         sc_trace(o_vcd, i_acpo, i_acpo.name());
         sc_trace(o_vcd, o_acpi, o_acpi.name());
-        sc_trace(o_vcd, o_xmst_cfg, o_xmst_cfg.name());
         sc_trace(o_vcd, i_msti, i_msti.name());
         sc_trace(o_vcd, o_msto, o_msto.name());
-        sc_trace(o_vcd, i_dmi_mapinfo, i_dmi_mapinfo.name());
-        sc_trace(o_vcd, o_dmi_cfg, o_dmi_cfg.name());
         sc_trace(o_vcd, i_dmi_apbi, i_dmi_apbi.name());
         sc_trace(o_vcd, o_dmi_apbo, o_dmi_apbo.name());
         sc_trace(o_vcd, o_dmreset, o_dmreset.name());
+        sc_trace(o_vcd, l2i, l2i.name());
+        sc_trace(o_vcd, l2o, l2o.name());
     }
 
     if (dmi0) {