Changeset 137 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration

Timestamp:

Feb 16, 2010, 1:35:48 PM (14 years ago)

Author:

rosiere

Message:

Various modif (add test, and vhdl)

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src

Files:

• Configuration_header.cpp (modified) (3 diffs)
• Instance_fromXMLLight.cpp (modified) (8 diffs)

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

@@ -7 +7 @@
 
 #include "Behavioural/Configuration/include/Configuration.h"
-#include "Behavioural/include/Version.h"
+#include "Common/include/Environment.h"
 
 namespace morpheo {
@@ -18 +18 @@
   {
     log_begin(Configuration,FUNCTION);
+
+    environment();
 
     std::string str = "";
@@ -52 +54 @@
     str += toString(MSG_INFORMATION)+"\n";
     str += toString(MSG_INFORMATION)+_("  * Multiple ORganization of a Processor with HEterogeneous and Open architecture\n");
-    str += toString(MSG_INFORMATION)+_("  * Version            : ")+toString(MORPHEO_HEADER)+"\n";
-    str += toString(MSG_INFORMATION)+_("  * Last change        : ")+toString(MORPHEO_DATE  )+"\n";
+    str += toString(MSG_INFORMATION)+_("  * Version            : ")+MORPHEO_HEADER+"\n";
+    str += toString(MSG_INFORMATION)+_("  * Last change        : ")+MORPHEO_DATE  +"\n";
     str += toString(MSG_INFORMATION)+_("  * E-mail support     : mathieu.rosiere@lip6.fr\n"      );
     str += toString(MSG_INFORMATION)+_("  * Original author(s) : Mathieu  Rosière\n"             );

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

@@ -27 +27 @@
     XMLLightVector<XML_t> vect = xml->getNodes(); 
 
+    log_printf(TRACE,Configuration,FUNCTION,"  * id         : %s",id.c_str());
+    log_printf(TRACE,Configuration,FUNCTION,"  * size       : %d",vect.size());
+
     for (uint32_t i=0; i<vect.size(); ++i)
       {
@@ -33 +36 @@
         std::string child_name = child->getName();
 
-//         log_printf(TRACE,Configuration,FUNCTION,"  * child_name : %s",child_name.c_str());
+        log_printf(TRACE,Configuration,FUNCTION,"  * child_name : %s",child_name.c_str());
 
         //--------------------------------------------
@@ -47 +50 @@
             attribute_t  value      = getAttribute(child,attributes,"value");
 
-//             log_printf(TRACE,Configuration,FUNCTION,"    * parameter \"%s\" = %s",value_name.c_str(), value.c_str());
+            log_printf(TRACE,Configuration,FUNCTION,"    * parameter \"%s\" = %s",value_name.c_str(), value.c_str());
             
             testAttributesEmpty(child,attributes);
@@ -75 +78 @@
             attribute_t  value_name = getAttribute(child,attributes,"name");
 
-//             log_printf(TRACE,Configuration,FUNCTION,"    * link  \"%s\"",value_name.c_str());
+            log_printf(TRACE,Configuration,FUNCTION,"    * link  \"%s\"",value_name.c_str());
             
             // Test, must have src or dest (or twice)
@@ -118 +121 @@
         if (child_name == "timing")
           {
-//             log_printf(TRACE,Configuration,FUNCTION,"    * timing");
+            log_printf(TRACE,Configuration,FUNCTION,"    * timing");
 
             // Notation :
@@ -196 +199 @@
         else
           {
-//             log_printf(TRACE,Configuration,FUNCTION,"    * component");
+            log_printf(TRACE,Configuration,FUNCTION,"    * component");
 
             testSingleton  (child,false);        
@@ -229 +232 @@
                 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());
+                log_printf(TRACE,Configuration,FUNCTION,"    * component \"%s\" - %s",value_type.c_str(), value_id.c_str());
 
                 index_begin = index_end;
@@ -238 +241 @@
                                                                       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());
+                  // 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