Changeset 128 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_transition.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/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_transition.cpp (modified) (5 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_transition.cpp

@@ -22 +22 @@
     log_function(RegisterFile_Monolithic,FUNCTION,_name.c_str());
 
-    if (_param->_have_init_value and (PORT_READ(in_NRESET) == 0))
+    if (PORT_READ(in_NRESET) == 0)
       {
-        for (uint32_t i=0; i<_param->_nb_word; ++i)
-          reg_DATA[i] = fromString<Tdata_t>(_param->_init_value);
+        if (_param->_have_init_value)
+          {
+            for (uint32_t i=0; i<_param->_nb_word; ++i)
+              reg_DATA[i] = fromString<Tdata_t>(_param->_init_value);
+          }
+        else
+          {
+            for (uint32_t i=0; i<_param->_nb_word; ++i)
+              reg_DATA[i] = 0;
+          }
       }
     else
@@ -31 +39 @@
         for (uint32_t i=0; i<_param->_nb_port_write; i++)
           {
+            log_printf(TRACE,RegisterFile,FUNCTION,"  * WRITE [%d] : %d",i,PORT_READ(in_WRITE_VAL[i]));
+
             // Have a write?
             if ( PORT_READ(in_WRITE_VAL[i]) == true)
@@ -38 +48 @@
                   (*_stat_nb_write) ++;
 #endif    
-                
+
                 Taddress_t address = (_param->_have_port_address)?PORT_READ(in_WRITE_ADDRESS[i]):0;
                 Tdata_t    data    = PORT_READ(in_WRITE_DATA   [i]);
+
+                log_printf(TRACE,RegisterFile,FUNCTION,"    * address : %d",address);
+                log_printf(TRACE,RegisterFile,FUNCTION,"    * gloup");
+                log_printf(TRACE,RegisterFile,FUNCTION,"    * data    : %d",data);
                 
                 log_printf(TRACE,RegisterFile,FUNCTION,"  * [%d] <- %.8x",static_cast<uint32_t>(address),static_cast<uint32_t>(data));
+
+#ifdef DEBUG_TEST
+                if (address >= _param->_nb_word)
+                  throw ERRORMORPHEO(FUNCTION,toString(_("Address (%d) is invalid (size : %d).\n"),address,_param->_nb_word));
+#endif
                 
                 // Write in registerFile
@@ -50 +69 @@
         for (uint32_t i=0; i<_param->_nb_port_read_write; i++)
           {
+            log_printf(TRACE,RegisterFile,FUNCTION,"  * READ_WRITE [%d] : %d",i,PORT_READ(in_READ_WRITE_VAL[i]));
+
             // Have a read_write?
             if (PORT_READ(in_READ_WRITE_VAL[i]) == true)
@@ -65 +86 @@
                     log_printf(TRACE,RegisterFile,FUNCTION,"  * [%d] <- %.8x",static_cast<uint32_t>(address),static_cast<uint32_t>(data));
                     
+
+#ifdef DEBUG_TEST
+                if (address >= _param->_nb_word)
+                  throw ERRORMORPHEO(FUNCTION,toString(_("Address (%d) is invalid (size : %d).\n"),address,_param->_nb_word));
+#endif
+
                     // Write in registerFile
                     reg_DATA[address] = data;