Changeset 109 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Instance_fromXMLLight.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_fromXMLLight.cpp (modified) (8 diffs)

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

@@ -26 +26 @@
 
     XMLLightVector<XML_t> vect = xml->getNodes(); 
-    
+
     for (uint32_t i=0; i<vect.size(); ++i)
       {
@@ -33 +33 @@
         std::string child_name = child->getName();
 
+//         log_printf(TRACE,Configuration,FUNCTION,"  * child_name : %s",child_name.c_str());
+
         //--------------------------------------------
         // Child : Parameter
@@ -44 +46 @@
             attribute_t  value_name = getAttribute(child,attributes,"name" );
             attribute_t  value      = getAttribute(child,attributes,"value");
+
+//             log_printf(TRACE,Configuration,FUNCTION,"    * parameter \"%s\" = %s",value_name.c_str(), value.c_str());
             
             testAttributesEmpty(child,attributes);
@@ -70 +74 @@
             attributes_t attributes = child->getAttributes();
             attribute_t  value_name = getAttribute(child,attributes,"name");
+
+//             log_printf(TRACE,Configuration,FUNCTION,"    * link  \"%s\"",value_name.c_str());
             
             // Test, must have src or dest (or twice)
@@ -80 +86 @@
             attribute_t  value_src  = (have_src )?getAttribute(child,attributes,"src" ):id;
             attribute_t  value_dest = (have_dest)?getAttribute(child,attributes,"dest"):id;
+
 
             testAttributesEmpty(child,attributes);
@@ -111 +118 @@
         if (child_name == "timing")
           {
+//             log_printf(TRACE,Configuration,FUNCTION,"    * timing");
+
             // Notation :
             //     <timing type="5" operation="8" latence="2"  delay="1" />
@@ -183 +192 @@
           }
         //--------------------------------------------
-        // Child : Other (node)
+        // Child : Other (component)
         //--------------------------------------------
         else
           {
+//             log_printf(TRACE,Configuration,FUNCTION,"    * component");
+
             testSingleton  (child,false);        
             
             attributes_t attributes = child->getAttributes();
-            attribute_t  value_id   = getAttribute(child,attributes,"id");
+            attribute_t  value_ids  = getAttribute(child,attributes,"id");
             attribute_t  value_type = child->getName();
-            
-            testAttributesEmpty(child,attributes);
-            
-            // Create a new component
+
+            testAttributesEmpty(child,attributes);
+
+            // Test if counter is an parameters
+            std::string name_counter = "nb_"+value_type;
+            
             {
-              Instance_component * param = new Instance_component(value_type, // type
-                                                                  value_id);
-              
-//            log_printf(TRACE,Configuration,FUNCTION,"%s.%s",value_type.c_str(),value_id.c_str());
-//            log_printf(TRACE,Configuration,FUNCTION,"  * %d",((*list_components)[value_type]).size());
-              
-              // Test if this id is previously used
-              if (((*list_components)[value_type]).find(value_id) != ((*list_components)[value_type]).end())
-                throw ERRORMORPHEO(FUNCTION,toString(_("A Component \"%s\" with id \"%s\" is previously declared.\n"),value_type.c_str(),value_id.c_str()));
-              
-              ((*list_components)[value_type])[value_id] = param;
-            }
-            
-            // Test if counter is an parameters
-            {
-              std::string name_counter = "nb_"+value_type;
-//            std::cout << name_counter << std::endl;
-              
               if (list_parameters->find(name_counter) == list_parameters->end())
                 {
-                  // Scearch all occurante of this type
-                  uint32_t nb_counter = xml->getNodes(value_type).size();
-//                std::cout << "  * " << nb_counter << std::endl;
-                  
                   // Insert in array
                   Parameter_affectation * param = new Parameter_affectation(name_counter, // type
-                                                                            toString(nb_counter));
-                  
+                                                                            "0");
                   // insert parameter
                   (*list_parameters)[name_counter] = param;
@@ -230 +220 @@
             }
             
-            // Recursive function
-            fromXMLLight (child,
-                          ((id=="")?value_id:(id+"."+value_id)), // construction of identificator
-                          ((*list_components)[value_type])[value_id]->_list_parameters,
-//                        ((*list_components)[value_type])[value_id]->_list_links,
-                          list_links,
-                          ((*list_components)[value_type])[value_id]->_list_components);
+            size_t index_begin = 0;
+            while (index_begin != std::string::npos)
+              {
+                size_t index_end = value_ids.find_first_of(",",index_begin+1);
+                
+                size_t      index_min = (index_begin==0)?index_begin:(index_begin+1);
+                size_t      index_max = index_end-index_min;
+                attribute_t value_id  = value_ids.substr(index_min, index_max);
+
+//                 log_printf(TRACE,Configuration,FUNCTION,"    * component \"%s\" - %s",value_type.c_str(), value_id.c_str());
+
+                index_begin = index_end;
+
+                // Create a new component
+                {
+                  Instance_component * param = new Instance_component(value_type, // type
+                                                                      value_id);
+              
+//                log_printf(TRACE,Configuration,FUNCTION,"%s.%s",value_type.c_str(),value_id.c_str());
+//                log_printf(TRACE,Configuration,FUNCTION,"  * %d",((*list_components)[value_type]).size());
+              
+                  // Test if this id is previously used
+                  if (((*list_components)[value_type]).find(value_id) != ((*list_components)[value_type]).end())
+                    throw ERRORMORPHEO(FUNCTION,toString(_("A Component \"%s\" with id \"%s\" is previously declared.\n"),value_type.c_str(),value_id.c_str()));
+                  
+                  ((*list_components)[value_type])[value_id] = param;
+                }
+
+                // Increase occurence counter
+                {
+                  (*list_parameters)[name_counter]->_value = toString(fromString<uint32_t>((*list_parameters)[name_counter]->_value)+1);
+                }
+                
+                // Recursive function
+                fromXMLLight (child,
+                              ((id=="")?value_id:(id+"."+value_id)), // construction of identificator
+                              ((*list_components)[value_type])[value_id]->_list_parameters,
+//                            ((*list_components)[value_type])[value_id]->_list_links,
+                              list_links,
+                              ((*list_components)[value_type])[value_id]->_list_components);
+              }
           }
       }