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

Timestamp:

Jan 15, 2009, 6:19:08 PM (15 years ago)

Author:

rosiere

Message:

1) Add soc test
2) fix bug (Pc management, Decod and execute, Update prediction ...)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_transition.cpp (modified) (1 diff)

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

@@ -18 +18 @@
     log_printf(FUNC,RegisterFile,"transition","Begin");
 
-    for (uint32_t i=0; i<_param->_nb_port_write; i++)
+    if (_param->_have_init_value and (PORT_READ(in_NRESET) == 0))
       {
-        // Have a write?
-        if ( PORT_READ(in_WRITE_VAL[i]) == true)
-          {
+        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_port_write; i++)
+          {
+            // Have a write?
+            if ( PORT_READ(in_WRITE_VAL[i]) == true)
+              {
 #ifdef STATISTICS
-            if (usage_is_set(_usage,USE_STATISTICS))
-              (*_stat_nb_write) ++;
-#endif    
-
-            Taddress_t address;
-            if (_param->_have_port_address)
-              address = PORT_READ(in_WRITE_ADDRESS[i]);
-            else
-              address = 0;
-
-            Tdata_t    data    = PORT_READ(in_WRITE_DATA   [i]);
-            
-            log_printf(TRACE,RegisterFile,"transition","[%d] <- %.8x",static_cast<uint32_t>(address),static_cast<uint32_t>(data));
-
-            // Write in registerFile
-            reg_DATA[address] = data;
-          }
-      }
-    for (uint32_t i=0; i<_param->_nb_port_read_write; i++)
-      {
-        // Have a read_write?
-        if (PORT_READ(in_READ_WRITE_VAL[i]) == true)
-          {
-            if (PORT_READ(in_READ_WRITE_RW [i]) == RW_WRITE)
-              {
-#ifdef STATISTICS
-                if (usage_is_set(_usage,USE_STATISTICS))
+                if (usage_is_set(_usage,USE_STATISTICS))
                   (*_stat_nb_write) ++;
 #endif    
-                
-                Taddress_t address;
-                if (_param->_have_port_address)
-                  address = PORT_READ(in_READ_WRITE_ADDRESS[i]);
-                else
-                  address = 0;
-                Tdata_t    data    = PORT_READ(in_READ_WRITE_WDATA  [i]);
-                
-                log_printf(TRACE,RegisterFile,"transition","[%d] <- %.8x",static_cast<uint32_t>(address),static_cast<uint32_t>(data));
-                
-                // Write in registerFile
-                reg_DATA[address] = data;
-              }
+                
+                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,"transition","[%d] <- %.8x",static_cast<uint32_t>(address),static_cast<uint32_t>(data));
+                
+                // Write in registerFile
+                reg_DATA[address] = data;
+              }
+          }
+        for (uint32_t i=0; i<_param->_nb_port_read_write; i++)
+          {
+            // Have a read_write?
+            if (PORT_READ(in_READ_WRITE_VAL[i]) == true)
+              {
+                if (PORT_READ(in_READ_WRITE_RW [i]) == RW_WRITE)
+                  {
 #ifdef STATISTICS
-            else
-              {
-                if (usage_is_set(_usage,USE_STATISTICS))
-                  (*_stat_nb_read) ++;
-              }
+                    if (usage_is_set(_usage,USE_STATISTICS))
+                      (*_stat_nb_write) ++;
 #endif    
-          }
+                    
+                    Taddress_t address = (_param->_have_port_address)?PORT_READ(in_READ_WRITE_ADDRESS[i]):0;
+                    Tdata_t    data    = PORT_READ(in_READ_WRITE_WDATA  [i]);
+                    
+                    log_printf(TRACE,RegisterFile,"transition","[%d] <- %.8x",static_cast<uint32_t>(address),static_cast<uint32_t>(data));
+                    
+                    // Write in registerFile
+                    reg_DATA[address] = data;
+                  }
+#ifdef STATISTICS
+                else
+                  {
+                    if (usage_is_set(_usage,USE_STATISTICS))
+                      (*_stat_nb_read) ++;
+                  }
+#endif    
+              }
+          }
       }