[!] rtlgen fix: destructors did not properly generate for the array o…

…f modules (memory blocks, decoders ,etc)
sergeykhbr · Nov 26, 2023 · 27af9d8 · 27af9d8
1 parent 8994714
commit 27af9d8
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 15 deletions.
diff --git a/sc/rtl/misclib/sfifo.h b/sc/rtl/misclib/sfifo.h
@@ -54,7 +54,6 @@ SC_MODULE(sfifo) {
         sc_signal<sc_uint<(log2_depth + 1)>> total_cnt;
     } v, r;
 
-
 };
 
 template<int dbits, int log2_depth>

diff --git a/sc/rtl/riverlib/cache/lrunway.h b/sc/rtl/riverlib/cache/lrunway.h
@@ -51,7 +51,6 @@ SC_MODULE(lrunway) {
         sc_signal<sc_uint<LINE_WIDTH>> mem[LINES_TOTAL];
     } v, r;
 
-
 };
 
 template<int abits, int waybits>

diff --git a/sc/rtl/riverlib/cache/pmp.h b/sc/rtl/riverlib/cache/pmp.h
@@ -60,7 +60,6 @@ SC_MODULE(PMP) {
         PmpTableItemType tbl[CFG_PMP_TBL_SIZE];
     } v, r;
 
-
 };
 
 }  // namespace debugger

diff --git a/sc/rtl/riverlib/cache/tagmemcoupled.h b/sc/rtl/riverlib/cache/tagmemcoupled.h
@@ -51,6 +51,7 @@ SC_MODULE(TagMemCoupled) {
 
     TagMemCoupled(sc_module_name name,
                   bool async_reset);
+    virtual ~TagMemCoupled();
 
 
  private:
@@ -190,6 +191,15 @@ TagMemCoupled<abus, waybits, ibits, lnbits, flbits>::TagMemCoupled(sc_module_nam
     sensitive << i_clk.pos();
 }
 
+template<int abus, int waybits, int ibits, int lnbits, int flbits>
+TagMemCoupled<abus, waybits, ibits, lnbits, flbits>::~TagMemCoupled() {
+    for (int i = 0; i < MemTotal; i++) {
+        if (memx[i]) {
+            delete memx[i];
+        }
+    }
+}
+
 template<int abus, int waybits, int ibits, int lnbits, int flbits>
 void TagMemCoupled<abus, waybits, ibits, lnbits, flbits>::comb() {
     bool v_addr_sel;

diff --git a/sc/rtl/riverlib/core/arith/int_mul.h b/sc/rtl/riverlib/core/arith/int_mul.h
@@ -65,7 +65,6 @@ SC_MODULE(IntMul) {
         sc_signal<sc_biguint<83>> lvl3[4];
     } v, r;
 
-
 };
 
 }  // namespace debugger

diff --git a/sc/rtl/riverlib/core/bp_btb.h b/sc/rtl/riverlib/core/bp_btb.h
@@ -59,7 +59,6 @@ SC_MODULE(BpBTB) {
 
     sc_signal<sc_uint<RISCV_ARCH>> dbg_npc[CFG_BP_DEPTH];
 
-
 };
 
 }  // namespace debugger

diff --git a/sc/rtl/riverlib/core/csr.h b/sc/rtl/riverlib/core/csr.h
@@ -195,7 +195,6 @@ SC_MODULE(CsrRegs) {
         sc_signal<sc_uint<CFG_PMP_FL_TOTAL>> pmp_flags;
     } v, r;
 
-
 };
 
 }  // namespace debugger

diff --git a/sc/rtl/riverlib/core/decoder.cpp b/sc/rtl/riverlib/core/decoder.cpp
@@ -209,6 +209,19 @@ InstrDecoder::InstrDecoder(sc_module_name name,
     sensitive << i_clk.pos();
 }
 
+InstrDecoder::~InstrDecoder() {
+    for (int i = 0; i < DEC_NUM; i++) {
+        if (rv[i]) {
+            delete rv[i];
+        }
+    }
+    for (int i = 0; i < DEC_NUM; i++) {
+        if (rvc[i]) {
+            delete rvc[i];
+        }
+    }
+}
+
 void InstrDecoder::generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd) {
     std::string pn(name());
     if (o_vcd) {

diff --git a/sc/rtl/riverlib/core/decoder.h b/sc/rtl/riverlib/core/decoder.h
@@ -64,6 +64,7 @@ SC_MODULE(InstrDecoder) {
     InstrDecoder(sc_module_name name,
                  bool async_reset,
                  bool fpu_ena);
+    virtual ~InstrDecoder();
 
     void generateVCD(sc_trace_file *i_vcd, sc_trace_file *o_vcd);
 

diff --git a/sc/rtl/riverlib/core/fpu_d/divstage53.h b/sc/rtl/riverlib/core/fpu_d/divstage53.h
@@ -42,7 +42,6 @@ SC_MODULE(divstage53) {
     sc_uint<62> wb_thresh[16];
     sc_uint<61> wb_dif[4];
 
-
 };
 
 }  // namespace debugger

diff --git a/sc/rtl/riverlib/core/fpu_d/zeroenc.h b/sc/rtl/riverlib/core/fpu_d/zeroenc.h
@@ -38,7 +38,6 @@ SC_MODULE(zeroenc) {
  private:
     sc_signal<sc_uint<shiftwidth>> wb_muxind[(iwidth + 1)];
 
-
 };
 
 template<int iwidth, int shiftwidth>

diff --git a/sc/rtl/riverlib/core/queue.h b/sc/rtl/riverlib/core/queue.h
@@ -52,7 +52,6 @@ SC_MODULE(Queue) {
         sc_signal<sc_biguint<dbits>> mem[DEPTH];
     } v, r;
 
-
 };
 
 template<int abits, int dbits>

diff --git a/sc/rtl/riverlib/core/regibank.h b/sc/rtl/riverlib/core/regibank.h
@@ -96,7 +96,6 @@ SC_MODULE(RegIntBank) {
         RegValueType arr[REGS_TOTAL];
     } v, r;
 
-
 };
 
 }  // namespace debugger

diff --git a/sc/rtl/riverlib/core/stacktrbuf.h b/sc/rtl/riverlib/core/stacktrbuf.h
@@ -43,7 +43,6 @@ SC_MODULE(StackTraceBuffer) {
         sc_signal<sc_biguint<(2 * RISCV_ARCH)>> stackbuf[STACK_TRACE_BUF_SIZE];// [pc, npc]
     } v, r;
 
-
 };
 
 }  // namespace debugger

diff --git a/sc/rtl/riverlib/core/tracer.h b/sc/rtl/riverlib/core/tracer.h
@@ -111,7 +111,6 @@ SC_MODULE(Tracer) {
     std::string tracestr;
     FILE *fl;
 
-
 };
 
 }  // namespace debugger

diff --git a/sc/rtl/techmap/mem/ram_bytes_tech.h b/sc/rtl/techmap/mem/ram_bytes_tech.h
@@ -37,6 +37,7 @@ SC_MODULE(ram_bytes_tech) {
     SC_HAS_PROCESS(ram_bytes_tech);
 
     ram_bytes_tech(sc_module_name name);
+    virtual ~ram_bytes_tech();
 
 
  private:
@@ -97,6 +98,15 @@ ram_bytes_tech<abits, log2_dbytes>::ram_bytes_tech(sc_module_name name)
     }
 }
 
+template<int abits, int log2_dbytes>
+ram_bytes_tech<abits, log2_dbytes>::~ram_bytes_tech() {
+    for (int i = 0; i < dbytes; i++) {
+        if (mem[i]) {
+            delete mem[i];
+        }
+    }
+}
+
 template<int abits, int log2_dbytes>
 void ram_bytes_tech<abits, log2_dbytes>::comb() {
     sc_uint<dbits> vb_rdata;

diff --git a/sc/rtl/techmap/mem/ram_cache_bwe_tech.h b/sc/rtl/techmap/mem/ram_cache_bwe_tech.h
@@ -36,6 +36,7 @@ SC_MODULE(ram_cache_bwe_tech) {
     SC_HAS_PROCESS(ram_cache_bwe_tech);
 
     ram_cache_bwe_tech(sc_module_name name);
+    virtual ~ram_cache_bwe_tech();
 
 
  private:
@@ -89,6 +90,15 @@ ram_cache_bwe_tech<abits, dbits>::ram_cache_bwe_tech(sc_module_name name)
     }
 }
 
+template<int abits, int dbits>
+ram_cache_bwe_tech<abits, dbits>::~ram_cache_bwe_tech() {
+    for (int i = 0; i < (dbits / 8); i++) {
+        if (rx[i]) {
+            delete rx[i];
+        }
+    }
+}
+
 template<int abits, int dbits>
 void ram_cache_bwe_tech<abits, dbits>::comb() {
     sc_biguint<dbits> vb_rdata;

diff --git a/sc/rtl/techmap/mem/ram_mmu_tech.h b/sc/rtl/techmap/mem/ram_mmu_tech.h
@@ -43,7 +43,6 @@ SC_MODULE(ram_mmu_tech) {
     sc_biguint<dbits> rdata;
     sc_biguint<dbits> mem[DEPTH];
 
-
 };
 
 template<int abits, int dbits>

diff --git a/sc/rtl/techmap/mem/ram_tech.h b/sc/rtl/techmap/mem/ram_tech.h
@@ -43,7 +43,6 @@ SC_MODULE(ram_tech) {
     sc_uint<dbits> rdata;
     sc_uint<dbits> mem[DEPTH];
 
-
 };
 
 template<int abits, int dbits>

diff --git a/sc/rtl/techmap/mem/rom_inferred_2x32.h b/sc/rtl/techmap/mem/rom_inferred_2x32.h
@@ -48,7 +48,6 @@ SC_MODULE(rom_inferred_2x32) {
     sc_uint<32> mem0[DEPTH];
     sc_uint<32> mem1[DEPTH];
 
-
 };
 
 template<int abits>