Changeset 128 for trunk/IPs/systemC/Environment/src/Environment.cpp

Timestamp:

Jun 26, 2009, 10:43:23 AM (15 years ago)

Author:

rosiere

Message:

1) Correct bug in link two signal
2) Fix error detected with valgrind
3) modif distexe script

File:

• trunk/IPs/systemC/Environment/src/Environment.cpp (modified) (7 diffs)

trunk/IPs/systemC/Environment/src/Environment.cpp

@@ -1 +1 @@
 #include "../include/Environment.h"
+#include "../../processor/Morpheo/Common/include/ToString.h"
 
 using namespace morpheo;
@@ -13 +14 @@
     component_tty         = new tty::TTY * [param->nb_component_tty];
     for (uint32_t i=0; i<param->nb_component_tty; i++)
-    component_tty     [i] = new tty::TTY         ("tty_"+i    ,param->param_tty     [i]);
+      component_tty     [i] = new tty::TTY         ("tty_"+morpheo::toString(i),param->param_tty     [i]);
     component_ramlock     = new ramlock::RamLock * [param->nb_component_ramlock];
     for (uint32_t i=0; i<param->nb_component_ramlock; i++)
-    component_ramlock [i] = new ramlock::RamLock ("ramlock_"+i,param->param_ramlock [i]);
+    component_ramlock [i] = new ramlock::RamLock ("ramlock_"+morpheo::toString(i),param->param_ramlock [i]);
     component_sim2os      = new sim2os::Sim2OS   ("sim2os" ,param->param_sim2os );
     component_data        = new data::Data       ("data"   ,param->param_data   );
@@ -186 +187 @@
     icache_req_ack = new Tcontrol_t * [param->nb_entity];
     icache_rsp_val = new Tcontrol_t * [param->nb_entity];
+    icache_rsp_num = new uint32_t   * [param->nb_entity];
     dcache_req_ack = new Tcontrol_t * [param->nb_entity];
     dcache_rsp_val = new Tcontrol_t * [param->nb_entity];
+    dcache_rsp_num = new uint32_t   * [param->nb_entity];
 
     for (uint32_t i=0; i<param->nb_entity; i++)
@@ -193 +196 @@
         icache_req_ack [i] = new Tcontrol_t [param->icache_dedicated_nb_port[i]];
         icache_rsp_val [i] = new Tcontrol_t [param->icache_dedicated_nb_port[i]];
+        icache_rsp_num [i] = new uint32_t   [param->icache_dedicated_nb_port[i]];
         dcache_req_ack [i] = new Tcontrol_t [param->dcache_dedicated_nb_port[i]];
         dcache_rsp_val [i] = new Tcontrol_t [param->dcache_dedicated_nb_port[i]];
+        dcache_rsp_num [i] = new uint32_t   [param->dcache_dedicated_nb_port[i]];
       }
 
@@ -214 +219 @@
         delete [] icache_req_ack [i];
         delete [] icache_rsp_val [i];
+        delete [] icache_rsp_num [i];
         delete [] dcache_req_ack [i];
         delete [] dcache_rsp_val [i];
+        delete [] dcache_rsp_num [i];
       }
 
     delete [] icache_req_ack;
     delete [] icache_rsp_val;
+    delete [] icache_rsp_num;
     delete [] dcache_req_ack;
     delete [] dcache_rsp_val;
+    delete [] dcache_rsp_num;
 
     delete CLOCK ;
@@ -243 +252 @@
 
             for (uint32_t k=0; k<param->iaccess_nb_instruction[i]; k++)
-              delete ICACHE_RSP_INSTRUCTION [i][j][k];
-
+            delete    ICACHE_RSP_INSTRUCTION [i][j][k];
             delete [] ICACHE_RSP_INSTRUCTION [i][j];
           }
+
         delete [] ICACHE_REQ_VAL         [i];
         delete [] ICACHE_REQ_ACK         [i];
@@ -276 +285 @@
     for (uint32_t i=0; i<param->nb_entity; i++)
       {
-        for (uint32_t j=0; j<param->icache_dedicated_nb_port[i]; j++)
+        for (uint32_t j=0; j<param->dcache_dedicated_nb_port[i]; j++)
           {
             delete DCACHE_REQ_VAL        [i][j];