Changeset 128 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic

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

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic

Files:

• Comparator/SelfTest/src/main.cpp (modified) (1 diff)
• RegisterFile/RegisterFile_Monolithic/include/Types.h (modified) (2 diffs)
• RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_transition.cpp (modified) (5 diffs)
• RegisterFile/RegisterFile_Multi_Banked/include/Types.h (modified) (2 diffs)
• RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_transition.cpp (modified) (1 diff)
• RegisterFile/src/RegisterFile_deallocation.cpp (modified) (2 diffs)
• Sort/src/Sort.cpp (modified) (2 diffs)
• Sort/src/Sort_transition.cpp (modified) (1 diff)
• Victim/Victim_Pseudo_LRU/include/Types.h (modified) (2 diffs)
• Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_deallocation.cpp (modified) (1 diff)
• Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_genMealy.cpp (modified) (1 diff)
• Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_transition.cpp (modified) (1 diff)
• Victim/src/Victim_deallocation.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Comparator/SelfTest/src/main.cpp

@@ -56 +56 @@
       
       test (name,param);
+
+      delete param;
     }
   catch (morpheo::ErrorMorpheo & error)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Types.h

@@ -5 +5 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -18 +18 @@
 
 //   typedef uint32_t Taddress_t;
-  typedef uint32_t Tdata_t;
+  typedef Tgeneral_data_t Tdata_t;
  
 }; // end namespace registerfile_monolithic

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;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/include/Types.h

@@ -5 +5 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -19 +19 @@
 
 //typedef uint32_t Taddress_t;
-  typedef uint32_t Tdata_t;
+  typedef Tgeneral_data_t Tdata_t;
 
 }; // end namespace registerfile_multi_banked

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_transition.cpp

@@ -25 +25 @@
     // call function pointer
 //     (this->*function_transition) ();
-    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_bank; ++i)
-          for (uint32_t j=0; j<_param->_nb_word; ++j)
-          reg_DATA[i][j] = fromString<Tdata_t>(_param->_init_value);
+        if (_param->_have_init_value)
+          {
+            for (uint32_t i=0; i<_param->_nb_bank; ++i)
+              for (uint32_t j=0; j<_param->_nb_word; ++j)
+                reg_DATA[i][j] = fromString<Tdata_t>(_param->_init_value);
+          }
+        else
+          {
+            for (uint32_t i=0; i<_param->_nb_bank; ++i)
+              for (uint32_t j=0; j<_param->_nb_word; ++j)
+                reg_DATA[i][j] = 0;
+          }
       }
     else

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

@@ -22 +22 @@
     delete in_NRESET;
     // ----- Interface Read
+    for (uint32_t i=0; i<_param->_nb_port_read; i++)
+      {
+    delete     in_READ_VAL    [i];
+    delete    out_READ_ACK    [i];
+    if (_param->_have_port_address == true)
+    delete     in_READ_ADDRESS[i];
+    delete    out_READ_DATA   [i];
+      }
+
     delete []  in_READ_VAL    ;
     delete [] out_READ_ACK    ;
@@ -29 +38 @@
 
     // ----- Interface Write
+    for (uint32_t i=0; i<_param->_nb_port_write; i++)
+      {
+    delete     in_WRITE_VAL    [i];
+    delete    out_WRITE_ACK    [i];
+    if (_param->_have_port_address == true)
+    delete     in_WRITE_ADDRESS[i];
+    delete     in_WRITE_DATA   [i];
+      }
+
     delete []  in_WRITE_VAL    ;
     delete [] out_WRITE_ACK    ;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort.cpp

@@ -71 +71 @@
     if (usage_is_set(_usage,USE_SYSTEMC))
       {
+# if defined(STATISTICS) or defined(VHDL_TESTBENCH)
         log_printf(INFO,Sort,FUNCTION,"Method - transition");
 
@@ -77 +78 @@
         sensitive << (*(in_CLOCK)).pos();
         
-# ifdef SYSTEMCASS_SPECIFIC
+#  ifdef SYSTEMCASS_SPECIFIC
         // List dependency information
-# endif    
+#  endif    
+# endif
 
         log_printf(INFO,Sort,FUNCTION,"Method - genMealy");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort_transition.cpp

@@ -14 +14 @@
 namespace generic {
 namespace sort {
-
 
 #undef  FUNCTION

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/include/Types.h

@@ -47 +47 @@
   public  : entry_t () 
     {
+      _entry = NULL;
     };
   public  : entry_t (uint32_t size) : _size (size)
@@ -53 +54 @@
       
       // initialisation
-      for (uint32_t i=0; i<size; i++)
-        _entry [i] = false;
+      reset ();
     }
     
   public : ~entry_t ()
     {
-      delete _entry;
+      if (_entry != NULL)
+        delete [] _entry;
+    }
+
+  public : void reset ()
+    {
+      // initialisation
+      for (uint32_t i=0; i<_size; i++)
+        _entry [i] = false;
     }
     

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_deallocation.cpp

@@ -29 +29 @@
     DELETE1_SIGNAL(out_ACCESS_VICTIM ,_param->_nb_access,log2(_param->_nb_entity   ));
 
-    DELETE1(reg_TABLE             ,_param->_size_table);
+    for (uint32_t i=0; i<_param->_size_table; i++)
+    delete    reg_TABLE [i];
+    delete [] reg_TABLE;
+        
     DELETE1(internal_ACCESS_ACK   ,_param->_nb_access);
     DELETE1(internal_ACCESS_VICTIM,_param->_nb_access);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_genMealy.cpp

@@ -22 +22 @@
         Taddress_t address = (_param->_size_table>1)?PORT_READ(in_ACCESS_ADDRESS[i]):0;
 
+#ifdef DEBUG_TEST
+        if (address >= _param->_size_table)
+          throw ERRORMORPHEO(FUNCTION,toString(_("Address (%d) is invalid (size : %d).\n"),address,_param->_size_table));
+#endif
+
         internal_ACCESS_VICTIM[i] = reg_TABLE[address]->access();
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/src/Victim_Pseudo_LRU_transition.cpp

@@ -17 +17 @@
   void Victim_Pseudo_LRU::transition (void)
   {
-    for (uint32_t i=0; i<_param->_nb_access; i++)
+
+    if (PORT_READ(in_NRESET) == 0)
       {
-        if (PORT_READ (in_ACCESS_VAL[i]) and internal_ACCESS_ACK)
-          {
-            Taddress_t address = (_param->_size_table>1)?PORT_READ(in_ACCESS_ADDRESS[i]):0;
-            Tentity_t  entity  = 0;
+        for (uint32_t i=0; i<_param->_size_table; ++i)
+          reg_TABLE[i]->reset();
+      }
+    else
+      {
+        for (uint32_t i=0; i<_param->_nb_access; i++)
+          {
+            if (PORT_READ (in_ACCESS_VAL[i]) and internal_ACCESS_ACK)
+              {
+                Taddress_t address = (_param->_size_table>1)?PORT_READ(in_ACCESS_ADDRESS[i]):0;
+                Tentity_t  entity  = 0;
+                
+                if (PORT_READ(in_ACCESS_HIT [i]))
+                  {
+                    // Hit  : don't need a victim
+// #ifdef STATISTICS
+//                  _stat_nb_update ++;
+// #endif
+                    entity = PORT_READ(in_ACCESS_ENTITY[i]);
+                  }
+                else
+                  {
+                    // Miss : need victim
+// #ifdef STATISTICS
+//                  _stat_nb_access ++;
+// #endif
+                    entity = internal_ACCESS_VICTIM[i];
+                  }
+                
+#ifdef DEBUG_TEST
+                if (address >= _param->_size_table)
+                  throw ERRORMORPHEO(FUNCTION,toString(_("Address (%d) is invalid (size : %d).\n"),address, _param->_size_table));
+#endif
+                reg_TABLE[address]->update(entity);
+              }
+          }//end for i
+      }
 
-            if (PORT_READ(in_ACCESS_HIT [i]))
-              {
-                // Hit  : don't need a victim
-// #ifdef STATISTICS
-//              _stat_nb_update ++;
-// #endif
-                entity = PORT_READ(in_ACCESS_ENTITY[i]);
-              }
-            else
-              {
-                // Miss : need victim
-// #ifdef STATISTICS
-//              _stat_nb_access ++;
-// #endif
-                entity = internal_ACCESS_VICTIM[i];
-              }
-
-            reg_TABLE[address]->update(entity);
-          }
-      }//end for i
-    
 #if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     end_cycle ();

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/src/Victim_deallocation.cpp

@@ -38 +38 @@
         delete    in_NRESET;
 
+        for (uint32_t i=0; i<_param->_nb_access; ++i)
+          {
+        delete     in_ACCESS_VAL    [i];
+        delete    out_ACCESS_ACK    [i];
+        if (_param->_have_port_address)
+        delete     in_ACCESS_ADDRESS[i];
+        delete     in_ACCESS_HIT    [i];
+        delete     in_ACCESS_ENTITY [i];
+        delete    out_ACCESS_VICTIM [i];
+          }
+
         delete []  in_ACCESS_VAL    ;
         delete [] out_ACCESS_ACK    ;
@@ -47 +58 @@
       }
 
-
     log_printf(FUNC,Victim,FUNCTION,"End");
   };