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

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

Location:

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

Files:

• include/Parameters.h (modified) (2 diffs)
• src/Parameters.cpp (modified) (2 diffs)
• src/RegisterFile_Multi_Banked_transition.cpp (modified) (1 diff)

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

@@ -32 +32 @@
   public : const uint32_t    _nb_port_write_by_bank; // Local  write port
   public : const Tcrossbar_t _crossbar             ;
+  public : const bool        _have_init_value;
+  public : const std::string _init_value;
 
   public : const uint32_t    _size_address         ;
@@ -60 +62 @@
                         uint32_t    nb_port_read_by_bank ,
                         uint32_t    nb_port_write_by_bank,
-                        Tcrossbar_t crossbar             );
+                        Tcrossbar_t crossbar             ,
+                        std::string init_value=""        );
 //   public : Parameters  (Parameters & param) ;
   public : ~Parameters () ;

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

@@ -23 +23 @@
                           uint32_t    nb_port_read_by_bank ,
                           uint32_t    nb_port_write_by_bank,
-                          Tcrossbar_t crossbar             ):
+                          Tcrossbar_t crossbar             ,
+                          std::string init_value
+                          ):
     _nb_port_read          (nb_port_read         ),
     _nb_port_write         (nb_port_write        ),
@@ -32 +34 @@
     _nb_port_write_by_bank (nb_port_write_by_bank),
     _crossbar              (crossbar             ),
+    _have_init_value       (init_value != ""     ),
+    _init_value            (init_value           ),
     _size_address          (static_cast<uint32_t>(ceil(log2(_nb_word)))),
     _size_address_by_bank  (_size_address - static_cast<uint32_t>(ceil(log2(_nb_bank)))),

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) ();
-
-    for (uint32_t i=0; i<_param->_nb_port_write; i++)
+    if (_param->_have_init_value and (PORT_READ(in_NRESET) == 0))
       {
-        if (internal_WRITE_VAL [i] == 1)
-          {
-            Tdata_t data = PORT_READ(in_WRITE_DATA   [i]);
-            
-            // Write in registerFile
-            reg_DATA[internal_WRITE_BANK[i]][internal_WRITE_NUM_REG[i]] = data;
-          }
+        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_port_write; i++)
+          {
+            if (internal_WRITE_VAL [i] == 1)
+              {
+                Tdata_t data = PORT_READ(in_WRITE_DATA   [i]);
+                
+                // Write in registerFile
+                reg_DATA[internal_WRITE_BANK[i]][internal_WRITE_NUM_REG[i]] = data;
+              }
+          }
       }