Changeset 128 for trunk/IPs/systemC/Environment/src/Environment_genMoore.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_genMoore.cpp (modified) (5 diffs)

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

@@ -1 +1 @@
 #include "../include/Environment.h"
+#include "../../processor/Morpheo/Common/include/Systemc.h"
 
 using namespace morpheo;
@@ -7 +8 @@
   void Environment::genMoore (void)
   {
+    _cout(ENVIRONMENT, " [%d] <Environment::genMoore>\n",static_cast<uint32_t>(simulation_cycle()));
+
     //Scan all entity and for each entity scan all port
     for (uint32_t i = 0; i < param->nb_entity; i++)
@@ -32 +35 @@
           // init
           for (uint32_t j = 0; j < param->icache_dedicated_nb_port [i]; j ++)
-            icache_rsp_val [i][j] = 0;
+            {
+              icache_rsp_val [i][j] = 0;
+              icache_rsp_num [i][j] = 0;
+            }
 
-          _cout(ENVIRONMENT, "buffer_irsp [%d] : nb_slot_use %d\n",i,component_buffer_irsp [i]->nb_slot_use());
+          _cout(ENVIRONMENT, "  * buffer_irsp [%d] : nb_slot_use %d\n",i,component_buffer_irsp [i]->nb_slot_use());
           for (uint32_t j = 0; j+1 <= component_buffer_irsp [i]->nb_slot_use(); j ++)
             {
@@ -45 +51 @@
               bool val = ((slot._delay == 0) and (icache_rsp_val [i][port] == 0));
 
-              _cout(ENVIRONMENT, "buffer_irsp [%d][%d] - delay %d - port %d\n",i,j,slot._delay,port);
+              _cout(ENVIRONMENT, "  * buffer_irsp [%d][%d] - delay %d - port %d\n",i,j,slot._delay,port);
 
               
               if (val)
                 {
-                  _cout(ENVIRONMENT, "ICACHE_RSP [%d][%d] - respons valid\n",i,port);
+                  _cout(ENVIRONMENT, "  * ICACHE_RSP [%d][%d] - respons valid\n",i,port);
                   
                   icache_rsp_val        [i][port] = 1;
+                  icache_rsp_num        [i][port] = j;
                                 
                   ICACHE_RSP_CONTEXT_ID [i][port]->write(slot._data->trdid); // TODO : test if exist
@@ -93 +100 @@
         //-----------------------------------------------------------------------------
         {
+          // init
           for (uint32_t j = 0; j < param->dcache_dedicated_nb_port [i]; j ++)
+            {
+              dcache_rsp_val [i][j] = 0;
+              dcache_rsp_num [i][j] = 0;
+            }
+
+          for (uint32_t j = 0; j+1 <= component_buffer_drsp [i]->nb_slot_use(); j ++)
             {
-              // Test the number of element in the respons's buffer
-              if (j >= component_buffer_drsp [i]->nb_slot_use())
-                {
-                  dcache_rsp_val [i][j] = 0; // No respons
-                }
-              else
-                {
-                  queue::slot_t<drsp_t*> slot = component_buffer_drsp [i]->read(j);
+              queue::slot_t<drsp_t*> slot = component_buffer_drsp [i]->read(j);
+              
+              uint32_t port = slot._data->port;
+              bool val = ((slot._delay == 0) and (dcache_rsp_val [i][port] == 0));
+              
+              if (val)
+                {
+                  _cout(ENVIRONMENT, "  * DCACHE_RSP [%d][%d] - respons valid\n",i,port);
+                  
+                  dcache_rsp_val        [i][port] = 1;
+                  dcache_rsp_num        [i][port] = j;
+                  
+                  DCACHE_RSP_CONTEXT_ID [i][port]->write(slot._data->trdid); // TODO : test if exist
+                  DCACHE_RSP_PACKET_ID  [i][port]->write(slot._data->pktid); // TODO : test if exist
+                  DCACHE_RSP_ERROR      [i][port]->write(slot._data->error);
+                  
+                  Tdcache_data_t data = 0;
+                  atoi (slot._data->data[0], data, param->daccess_size_data[i]/8);
+                  
+                  DCACHE_RSP_RDATA      [i][port]->write(data);
+                }
+            }
 
-                  bool val = (slot._delay == 0); // respons if have a result
-                  
-                  dcache_rsp_val [i][j] = (val); // respons if have a result
-
-                  if (val)
-                    {
-                      _cout(ENVIRONMENT, "DCACHE_RSP [%d][%d] - respons valid\n",i,j);
-
-                      DCACHE_RSP_CONTEXT_ID [i][j]->write(slot._data->trdid); // TODO : test if exist
-                      DCACHE_RSP_PACKET_ID  [i][j]->write(slot._data->pktid); // TODO : test if exist
-                      DCACHE_RSP_ERROR      [i][j]->write(slot._data->error);
-                      
-                      Tdcache_data_t data = 0;
-                      atoi (slot._data->data[0], data, param->daccess_size_data[i]/8);
-                      
-                      DCACHE_RSP_RDATA       [i][j]->write(data);
-                    }
-                }
-              DCACHE_RSP_VAL [i][j]->write (dcache_rsp_val [i][j]);
-            }
+          for (uint32_t j = 0; j < param->dcache_dedicated_nb_port [i]; j ++)
+            DCACHE_RSP_VAL [i][j]->write (dcache_rsp_val [i][j]);
         }
       }