Changeset 124 for trunk/IPs/systemC/Environment/src/Environment_transition.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_transition.cpp (modified) (8 diffs)

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

@@ -44 +44 @@
             if (ICACHE_REQ_VAL [i][j]->read() and icache_req_ack [i][j])
               {
-                _cout(ENVIRONMENT, "ICACHE_REQ [%d] : Transaction accepted\n",i);
+                _cout(ENVIRONMENT, "ICACHE_REQ [%d][%d] : Transaction accepted\n",i,j);
 
                 Ticache_context_t context   = ICACHE_REQ_CONTEXT_ID [i][j]->read();// TODO : test presence
@@ -83 +83 @@
                           {
                             uint32_t addr = address+k*(size);
-                            _cout(ENVIRONMENT,"    * addr    : %.8x\n",addr);
+                            _cout(ENVIRONMENT,"    * addr    : %.8x - ",addr);
 
                             bus_error |= !component_data->read(addr,size,read_iram[k]);
@@ -93 +93 @@
                               }
 
-                            _cout(ENVIRONMENT,"    * inst    :");
+                            //_cout(ENVIRONMENT,"    * inst    : ");
                             for (int32_t cpt=(param->iaccess_size_instruction[i]/8)-1; cpt>=0; --cpt)
                               __cout(ENVIRONMENT, "%.2x",0xff&static_cast<uint32_t>(read_iram[k][cpt]));
@@ -144 +144 @@
                     _cout(ENVIRONMENT, "    * push in buffer_irsp[%d]\n",i);
 
-                    irsp_t * rsp = new irsp_t(context,
+                    irsp_t * rsp = new irsp_t(j,
+                                              context,
                                               packet,
                                               param->iaccess_nb_instruction[i],
@@ -163 +164 @@
             if (DCACHE_REQ_VAL [i][j]->read() and dcache_req_ack [i][j])
               {
-                _cout(ENVIRONMENT, "DCACHE_REQ [%d] : Transaction accepted\n",i);
+                _cout(ENVIRONMENT, "DCACHE_REQ [%d][%d] : Transaction accepted\n",i,j);
 
                 Tdcache_context_t context   = DCACHE_REQ_CONTEXT_ID [i][j]->read();// TODO : test presence
@@ -339 +340 @@
 
                           uint32_t num_ramlock           = (address - entity.segment->getBase()); // Char access
+                          uint32_t num_lock              = num_ramlock % (param->daccess_size_data [i]/8);
                           uint32_t num_component_ramlock = entity.segment->getIndex();
 
-                          _cout(ENVIRONMENT,"    * num_ramlock           : %d\n",num_ramlock          );
-                          _cout(ENVIRONMENT,"    * num_component_ramlock : %d\n",num_component_ramlock);
+//                        _cout(ENVIRONMENT,"    * num_ramlock           : %d\n",num_ramlock          );
+//                        _cout(ENVIRONMENT,"    * num_lock              : %d\n",num_lock             );
+//                        _cout(ENVIRONMENT,"    * num_component_ramlock : %d\n",num_component_ramlock);
+                          _cout(true,"    * num_ramlock           : %d\n",num_ramlock          );
+                          _cout(true,"    * num_lock              : %d\n",num_lock             );
+                          _cout(true,"    * num_component_ramlock : %d\n",num_component_ramlock);
 
                           // No test : because out of range
@@ -352 +358 @@
 
                           memset (read_dram[0],0,size);
-                          
+
                           if (must_read == true)
-                            read_dram [0][0] = static_cast<char>(component_ramlock [num_component_ramlock]->read (num_ramlock));
+                            read_dram [0][num_lock] = static_cast<char>(component_ramlock [num_component_ramlock]->read (num_ramlock));
                           if (must_write == true)
-                            read_dram [0][0] = static_cast<char>(component_ramlock [num_component_ramlock]->write(num_ramlock));
+                            read_dram [0][num_lock] = static_cast<char>(component_ramlock [num_component_ramlock]->write(num_ramlock));
+
+                          _cout(true,"    * lock                  : %d\n",(int)read_dram [0][num_lock]);
+//                        _cout(ENVIRONMENT,"    * lock                  : %d\n",(int)read_dram [0][num_lock]);
                           
                           break;
@@ -506 +515 @@
                     
                     // Simplification : the size of a line is a multiple of size_iword (no test)
-                    drsp_t * rsp = new drsp_t(context,
+                    drsp_t * rsp = new drsp_t(j,
+                                              context,
                                               packet,
                                               1,