Changeset 108 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Simulator_fromFile.cpp

Timestamp:

Feb 12, 2009, 12:55:06 PM (15 years ago)

Author:

rosiere

Message:

1) decod_queue : add reg_LAST_SLOT.
2) Commit : insert on event -> to pop decod_queue. Head test : add information (speculative or not)
3) Context State / UPT : Branch miss and Load miss in same cycle.
4) Free List : Bank is on LSB not MSB.
5) Platforms : move data

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Simulator_fromFile.cpp (modified) (1 diff)

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

@@ -45 +45 @@
         XML_t * xml = vect[i];
 
-        // Test node
-        testNodeName   (xml,"parameter");
-        testSingleton  (xml,true);        
+        std::string child_name = xml->getName();
 
-        // Take attributes of this tag
-
-        attributes_t attributes = xml->getAttributes();
-
-//         std::cout << "Node [" << name           << "]" << std::endl;
-//         std::cout << "  * nb attributes : " << xml->getAttributes().size()  << std::endl;
-
-        attribute_t value_name  = getAttribute(xml,attributes,"name" );
-        attribute_t value       = getAttribute(xml,attributes,"value");
-
-        testAttributesEmpty(xml,attributes);
-
-        // Insert in array
-        Parameter_affectation * param = new Parameter_affectation(value_name,
-                                                                  value     );
-
-        insert(param);
+        //--------------------------------------------
+        // Child : Parameter
+        //--------------------------------------------
+        if (child_name == "parameter")
+          {
+            // testNodeName   (xml,"parameter");
+            testSingleton  (xml,true);        
+            
+            // Take attributes of this tag
+            
+            attributes_t attributes = xml->getAttributes();
+            
+            //         std::cout << "Node [" << name           << "]" << std::endl;
+            //         std::cout << "  * nb attributes : " << xml->getAttributes().size()  << std::endl;
+            
+            attribute_t value_name  = getAttribute(xml,attributes,"name" );
+            attribute_t value       = getAttribute(xml,attributes,"value");
+            
+            testAttributesEmpty(xml,attributes);
+            
+            // Insert in array
+            Parameter_affectation * param = new Parameter_affectation(value_name,
+                                                                      value     );
+            
+            insert(param);
+          }
+        //--------------------------------------------
+        // Child : Simulation
+        //--------------------------------------------
+        else
+          {
+            testNodeName   (xml,"simulation");
+            testSingleton  (xml,true);
+          }
       }