Changeset 124 for trunk/IPs/systemC/Environment/src/Environment_genMoore.cpp

Timestamp:

Jun 17, 2009, 2:11:25 PM (15 years ago)

Author:

rosiere

Message:

1) Add test and configuration
2) Fix Bug
3) Add log file in load store unit
4) Fix Bug in environment

File:

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

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

@@ -30 +30 @@
         //-----------------------------------------------------------------------------
         {
+          // init
           for (uint32_t j = 0; j < param->icache_dedicated_nb_port [i]; j ++)
+            icache_rsp_val [i][j] = 0;
+
+          for (uint32_t j = 0; j+1 < component_buffer_irsp [i]->nb_slot_use(); j ++)
             {
               // Test the number of element in the respons's buffer
-              if (j >= component_buffer_irsp [i]->nb_slot_use())
-                {
-                  icache_rsp_val [i][j] = 0; // No respons
-                }
-              else
-                {
-                  queue::slot_t<irsp_t*> slot = component_buffer_irsp [i]->read(j);
+              
+              queue::slot_t<irsp_t*> slot = component_buffer_irsp [i]->read(j);
+              
+              uint32_t port = slot._data->port;
+              
+              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);
+
+              
+              if (val)
+                {
+                  _cout(ENVIRONMENT, "ICACHE_RSP [%d][%d] - respons valid\n",i,port);
+                  
+                  icache_rsp_val        [i][port] = 1;
+                                
+                  ICACHE_RSP_CONTEXT_ID [i][port]->write(slot._data->trdid); // TODO : test if exist
+                  ICACHE_RSP_PACKET_ID  [i][port]->write(slot._data->pktid); // TODO : test if exist
+                  ICACHE_RSP_ERROR      [i][port]->write(slot._data->error);
                   
-                  bool val = (slot._delay == 0);
-
-                  icache_rsp_val [i][j] = (val); // respons if have a result
-
-                  if (val)
-                    {
-                      ICACHE_RSP_CONTEXT_ID [i][j]->write(slot._data->trdid); // TODO : test if exist
-                      ICACHE_RSP_PACKET_ID  [i][j]->write(slot._data->pktid); // TODO : test if exist
-                      ICACHE_RSP_ERROR      [i][j]->write(slot._data->error);
-                      
-                      for (uint32_t k = 0; k < param->iaccess_nb_instruction[i]; k ++)
-                        {
-                          Ticache_instruction_t data = 0;
-                          
-                          atoi (slot._data->data[k], data, param->iaccess_size_instruction[i]/8);
-                          
-                          ICACHE_RSP_INSTRUCTION [i][j][k]->write(data);
-                        }
-                    }
-                }
-
-              ICACHE_RSP_VAL [i][j]->write (icache_rsp_val [i][j]);
-            }
+                  for (uint32_t k = 0; k < param->iaccess_nb_instruction[i]; k ++)
+                    {
+                      Ticache_instruction_t data = 0;
+                      
+                      atoi (slot._data->data[k], data, param->iaccess_size_instruction[i]/8);
+                      
+                      ICACHE_RSP_INSTRUCTION [i][port][k]->write(data);
+                    }
+                }
+            }
+          
+          for (uint32_t j = 0; j < param->icache_dedicated_nb_port [i]; j ++)
+            ICACHE_RSP_VAL [i][j]->write (icache_rsp_val [i][j]);
         }
         
@@ -103 +109 @@
                   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