sc_simcontext: cleanup stale zombie processes during clean()

The process zombie collection in sc_simcontext::crunch might be
skipped due to errors or early exit from the simulation.

Make sure to clean the collected zombies when cleaning up the
simcontext's state as a whole.

src/sysc/kernel/sc_simcontext.cpp

@@ -367,6 +367,9 @@ sc_simcontext::init()
 void
 sc_simcontext::clean()
 {
+    // remove remaining zombie processes
+    do_collect_processes();
+
     delete m_method_invoker_p;
     delete m_error;
     delete m_cor_pkg;
@@ -516,14 +519,8 @@ sc_simcontext::crunch( bool once )
 	    }
 	}
 
-	// remove finally dead zombies:
-
-        while( ! m_collectable->empty() )
-        {
-	    sc_process_b* del_p = m_collectable->front();
-	    m_collectable->pop_front();
-	    del_p->reference_decrement();
-        }
+        // remove finally dead zombies:
+        do_collect_processes();
 
 
 	// UPDATE PHASE
@@ -975,6 +972,15 @@ sc_simcontext::mark_to_collect_process( sc_process_b* zombie )
     m_collectable->push_back( zombie );
 }
 
+void sc_simcontext::do_collect_processes()
+{
+    while( ! m_collectable->empty() )
+    {
+        sc_process_b* del_p = m_collectable->front();
+        m_collectable->pop_front();
+        del_p->reference_decrement();
+    }
+}
 
 //------------------------------------------------------------------------------
 //"sc_simcontext::stop"

src/sysc/kernel/sc_simcontext.h

@@ -332,6 +332,7 @@ class SC_API sc_simcontext
     void do_sc_stop_action();
     void do_timestep( const sc_time& );
     void mark_to_collect_process( sc_process_b* zombie_p );
+    void do_collect_processes();
 
     sc_method_handle remove_process( sc_method_handle );
     sc_thread_handle remove_process( sc_thread_handle );