Changeset 109 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromInternalStructure.cpp

Timestamp:

Feb 16, 2009, 9:28:31 PM (15 years ago)

Author:

rosiere

Message:

1) Configuration : instance configuration file : regroup similar instance
2) Configuration : timing default = 0
3) Debug/Commit_unit : Add watch dog timer
4) Issue_queue : Test parameters : add test if type is optionnal
5) Cor_glue : Fix insert index
6) Free_list : remove bank_by_pop (else deadlock)
7) Update Free List : add register to source event

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromInternalStructure.cpp (modified) (4 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromInternalStructure.cpp

@@ -220 +220 @@
             
             for (uint32_t k=0; k<MAX_OPERATION; ++k)
-              if (is_type_valid(j) and (j != TYPE_MEMORY))// A functional unit can't execute memory instruction
-                {
-                  _param->_timing [i][j][k]._latence = fromString<uint32_t> (getParam("latence",
-                                                                                      "functionnal_unit",toString(i).c_str(),
-                                                                                      "type"            ,toString(j).c_str(),
-                                                                                      "operation"       ,toString(k).c_str(),
-                                                                                      ""));
-                  _param->_timing [i][j][k]._delay   = fromString<uint32_t> (getParam("delay",
-                                                                                      "functionnal_unit",toString(i).c_str(),
-                                                                                      "type"            ,toString(j).c_str(),
-                                                                                      "operation"       ,toString(k).c_str(),
-                                                                                      ""));
-                }
-              else
-                {
-                  _param->_timing [i][j][k]._latence = 0;
-                  _param->_timing [i][j][k]._delay   = 0;
-                }
+              {
+                if (is_type_valid(j) and (j != TYPE_MEMORY))// A functional unit can't execute memory instruction
+                  {
+                    _param->_timing [i][j][k]._latence = fromString<uint32_t> (getParam("latence",
+                                                                                        "functionnal_unit",toString(i).c_str(),
+                                                                                        "type"            ,toString(j).c_str(),
+                                                                                        "operation"       ,toString(k).c_str(),
+                                                                                        ""));
+                    _param->_timing [i][j][k]._delay   = fromString<uint32_t> (getParam("delay",
+                                                                                        "functionnal_unit",toString(i).c_str(),
+                                                                                        "type"            ,toString(j).c_str(),
+                                                                                        "operation"       ,toString(k).c_str(),
+                                                                                        ""));
+                  }
+                else
+                  {
+                    _param->_timing [i][j][k]._latence = 0;
+                    _param->_timing [i][j][k]._delay   = 0;
+                  }
+              }
           }
       }
@@ -247 +249 @@
   //log_printf(INFO,Configuration,FUNCTION,_("ICACHE_PORT"));
 
-    _param->_nb_icache_port               = fromString<uint32_t         >(getParam("nb_icache_port"            , ""));
+    _param->_nb_icache_port             = fromString<uint32_t           >(getParam("nb_icache_port"            , ""));
     _param->_icache_port_priority       = fromString<Tpriority_t        >(getParam("icache_port_priority"      , ""));
     _param->_icache_port_load_balancing = fromString<Tload_balancing_t  >(getParam("icache_port_load_balancing", ""));
@@ -512 +514 @@
         getLink_2("link_execute_unit_with_functionnal_unit",toString(i).c_str(), "");
         _param->_link_execute_unit_with_functionnal_unit [i] = pair_dual(fromString<uint32_t>(dest[0]),
-                                                                        fromString<uint32_t>(dest[1]));
+                                                                         fromString<uint32_t>(dest[1]));
       }
 
@@ -519 +521 @@
         getLink_2("link_execute_unit_with_load_store_unit",toString(i).c_str(), "");
         _param->_link_execute_unit_with_load_store_unit [i] = pair_dual(fromString<uint32_t>(dest[0]),
-                                                                       fromString<uint32_t>(dest[1]));
+                                                                        fromString<uint32_t>(dest[1]));
 
         for (uint32_t j=0; j<_param->_nb_cache_port[i]; ++j)