Merge pull request #28 from mariusmm/fix/memory-leak-destructors

fix: resolve memory leak in CPU destructors

Author: mariusmm

inc/CPU.h

@@ -42,7 +42,7 @@ namespace riscv_tlm {
         CPU& operator=(CPU&& other) noexcept = delete;
 
         /* Destructors */
-        ~CPU() override = default;
+        ~CPU() override;
 
         /**
          * @brief Perform one instruction step

src/CPU.cpp

@@ -44,6 +44,13 @@ namespace riscv_tlm {
         dmi_ptr_valid = false;
     }
 
+    CPU::~CPU() {
+        if (m_qk) {
+            delete m_qk;
+            m_qk = nullptr;
+        }
+    }
+
     [[noreturn]] void CPU::CPU_thread() {
 
         while (true) {

src/RV32.cpp

@@ -36,13 +36,31 @@ namespace riscv_tlm {
     }
 
     CPURV32::~CPURV32() {
-        delete register_bank;
-        delete mem_intf;
-        delete base_inst;
-        delete c_inst;
-        delete m_inst;
-        delete a_inst;
-        delete m_qk;
+        if (register_bank) {
+            delete register_bank;
+            register_bank = nullptr;
+        }
+        if (mem_intf) {
+            delete mem_intf;
+            mem_intf = nullptr;
+        }
+        if (base_inst) {
+            delete base_inst;
+            base_inst = nullptr;
+        }
+        if (c_inst) {
+            delete c_inst;
+            c_inst = nullptr;
+        }
+        if (m_inst) {
+            delete m_inst;
+            m_inst = nullptr;
+        }
+        if (a_inst) {
+            delete a_inst;
+            a_inst = nullptr;
+        }
+        // m_qk is handled by base class destructor
     }
 
     bool CPURV32::cpu_process_IRQ() {

src/RV64.cpp

@@ -34,13 +34,31 @@ namespace riscv_tlm {
     }
 
     CPURV64::~CPURV64() {
-        delete register_bank;
-        delete mem_intf;
-        delete base_inst;
-        delete c_inst;
-        delete m_inst;
-        delete a_inst;
-        delete m_qk;
+        if (register_bank) {
+            delete register_bank;
+            register_bank = nullptr;
+        }
+        if (mem_intf) {
+            delete mem_intf;
+            mem_intf = nullptr;
+        }
+        if (base_inst) {
+            delete base_inst;
+            base_inst = nullptr;
+        }
+        if (c_inst) {
+            delete c_inst;
+            c_inst = nullptr;
+        }
+        if (m_inst) {
+            delete m_inst;
+            m_inst = nullptr;
+        }
+        if (a_inst) {
+            delete a_inst;
+            a_inst = nullptr;
+        }
+        // m_qk is handled by base class destructor
     }
 
     bool CPURV64::cpu_process_IRQ() {