Changeset 71 for trunk/IPs/systemC/processor/Morpheo/Behavioural/src

Timestamp:

Jan 19, 2008, 12:09:01 PM (16 years ago)

Author:

rosiere

Message:

Modification of Statisctics
Add a new systemC component : Load_Store_Queue (tested with one benchmark and one configuration). Store don't supported the Data Buss Error (Load is supported)

Location:

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

Files:

• Parameters_test.cpp (modified) (1 diff)
• Stat.cpp (added)
• Stat_alloc_operand.cpp (added)
• Stat_binary_tree.cpp (added)
• Stat_binary_tree_eval.cpp (added)
• Stat_binary_tree_goto_next_root.cpp (added)
• Stat_binary_tree_goto_top_level.cpp (added)
• Stat_binary_tree_insert_tree.cpp (added)
• Stat_binary_tree_is_leaf.cpp (added)
• Stat_binary_tree_val_leaf.cpp (added)
• Stat_binary_tree_val_tree.cpp (added)
• Stat_binary_tree_valid.cpp (added)
• Stat_create_counter.cpp (added)
• Stat_create_expr.cpp (added)
• Stat_create_variable.cpp (added)
• Stat_end_cycle.cpp (added)
• Stat_end_simulation.cpp (added)
• Stat_eval_expr.cpp (added)
• Stat_eval_exprs.cpp (added)
• Stat_generate_file.cpp (added)
• Stat_is_valid_var.cpp (added)
• Stat_print.cpp (added)
• Stat_string2tree.cpp (added)
• Stat_test_and_save.cpp (added)
• Statistics.cpp (modified) (1 diff)
• Statistics_generate_file.cpp (modified) (3 diffs)
• Vhdl.cpp (modified) (1 diff)
• Vhdl_direction_toString.cpp (modified) (2 diffs)
• Vhdl_generate_file_model.cpp (modified) (2 diffs)
• Vhdl_generate_file_package.cpp (modified) (2 diffs)
• Vhdl_get_alias.cpp (modified) (2 diffs)
• Vhdl_get_architecture.cpp (modified) (2 diffs)
• Vhdl_get_body.cpp (modified) (2 diffs)
• Vhdl_get_component.cpp (modified) (2 diffs)
• Vhdl_get_entity.cpp (modified) (2 diffs)
• Vhdl_get_header.cpp (modified) (2 diffs)
• Vhdl_get_library_ieee.cpp (modified) (2 diffs)
• Vhdl_get_library_work.cpp (modified) (2 diffs)
• Vhdl_get_list.cpp (modified) (4 diffs)
• Vhdl_get_model.cpp (modified) (1 diff)
• Vhdl_get_package.cpp (modified) (2 diffs)
• Vhdl_get_port.cpp (modified) (2 diffs)
• Vhdl_get_signal.cpp (modified) (2 diffs)
• Vhdl_get_type.cpp (modified) (2 diffs)
• Vhdl_set_alias.cpp (modified) (3 diffs)
• Vhdl_set_body.cpp (modified) (2 diffs)
• Vhdl_set_body_component.cpp (modified) (2 diffs)
• Vhdl_set_body_component_port_map.cpp (modified) (3 diffs)
• Vhdl_set_constant.cpp (modified) (4 diffs)
• Vhdl_set_library_work.cpp (modified) (2 diffs)
• Vhdl_set_list.cpp (modified) (2 diffs)
• Vhdl_set_port.cpp (modified) (3 diffs)
• Vhdl_set_signal.cpp (modified) (6 diffs)
• Vhdl_set_type.cpp (modified) (2 diffs)
• Vhdl_std_logic.cpp (modified) (7 diffs)
• XML.cpp (modified) (1 diff)
• XML_attribut.cpp (modified) (1 diff)
• XML_balise_close.cpp (modified) (1 diff)
• XML_balise_open.cpp (modified) (1 diff)
• XML_balise_open_begin.cpp (modified) (1 diff)
• XML_comment.cpp (modified) (1 diff)
• XML_filename_extension.cpp (modified) (2 diffs)
• XML_generate_file.cpp (modified) (3 diffs)
• XML_get_body.cpp (modified) (2 diffs)
• XML_header.cpp (modified) (1 diff)
• XML_indent.cpp (modified) (2 diffs)
• XML_singleton.cpp (modified) (1 diff)
• XML_singleton_begin.cpp (modified) (1 diff)
• XML_text.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Parameters_test.cpp

@@ -17 +17 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string msg = msg_error();
+    std::string msg = msg_error();
     
     if (msg.length() != 0)

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Statistics.cpp

@@ -15 +15 @@
 #undef  FUNCTION
 #define FUNCTION "Statistics::Statistics"
-  Statistics::Statistics  (string                  name                 ,
+  Statistics::Statistics  (std::string                  name                 ,
                            Parameters_Statistics * parameters_statistics):
     _name                  (name                 ),

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Statistics_generate_file.cpp

@@ -12 +12 @@
 #include <sstream>
 #include <fstream>
-using namespace std;
 
 namespace morpheo              {
@@ -19 +18 @@
 #undef  FUNCTION
 #define FUNCTION "Statistics::generate_file"
-  void Statistics::generate_file(string stat)
+  void Statistics::generate_file(std::string stat)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    ostringstream filename;
+    std::stringstream filename;
     filename << _name << ".stat";
 
-    cout << "Generate file \""<< filename.str() << "\"" << endl;
+    std::cout << "Generate file \""<< filename.str() << "\"" << std::endl;
 
-    ofstream file;
-    file.open(filename.str().c_str(),ios::out | ios::trunc);
+    std::ofstream file;
+    file.open(filename.str().c_str(),std::ios::out | std::ios::trunc);
 
     time_t current_time;
@@ -35 +34 @@
 
     // print header
-    file << "<!-- "                                                    << endl
-         << "\tfile        : " << filename.str()                       << endl
+    file << "<!-- "                                                    << std::endl
+         << "\tfile        : " << filename.str()                       << std::endl
          << "\tdate        : " << ctime (&current_time )
-         << "\tcomment     : it's a autogenerated file : don't modify" << endl
-         << "-->"                                                      << endl
-         <<                                                               endl;
+         << "\tcomment     : it's a autogenerated file : don't modify" << std::endl
+         << "-->"                                                      << std::endl
+         <<                                                               std::endl;
          
     file << stat;

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl.cpp

@@ -15 +15 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::Vhdl"
-  Vhdl::Vhdl  (string                name):
+  Vhdl::Vhdl  (std::string name):
     _name   (name)
   {

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_direction_toString.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::direction_toString"
-  string Vhdl::direction_toString (direction_t direction)
+  std::string Vhdl::direction_toString (direction_t direction)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string _return;
+    std::string _return;
     switch (direction)
       {

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_generate_file_model.cpp

@@ -11 +11 @@
 #include <sstream>
 #include <fstream>
-using namespace std;
 
 namespace morpheo              {
@@ -20 +19 @@
     log_printf(FUNC,Behavioural,"generate_file_model","Begin");
 
-    string filename = _name + ".vhdl";
+    std::string filename = _name + ".vhdl";
     
     log_printf(TRACE,Behavioural,"generate_file_model","print %s",filename.c_str());
-    cout << "Generate file \""<< filename << "\"" << endl;
+    std::cout << "Generate file \""<< filename << "\"" << std::endl;
 
     log_printf(TRACE,Behavioural,"generate_file_model","declaration");
-    ofstream file;
+    std::ofstream file;
 
     log_printf(TRACE,Behavioural,"generate_file_model","open file");
-    file.open(filename.c_str(),ios::out | ios::trunc);
+    file.open(filename.c_str(),std::ios::out | std::ios::trunc);
 
     log_printf(TRACE,Behavioural,"generate_file_model","get model");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_generate_file_package.cpp

@@ -11 +11 @@
 #include <sstream>
 #include <fstream>
-using namespace std;
 
 namespace morpheo              {
@@ -20 +19 @@
     log_printf(FUNC,Behavioural,"generate_file_package","Begin");
 
-    string name     = _name + "_Pack";
-    string filename =  name + ".vhdl";
+    std::string name     = _name + "_Pack";
+    std::string filename =  name + ".vhdl";
 
-    cout << "Generate file \""<< filename << "\"" << endl;
+    std::cout << "Generate file \""<< filename << "\"" << std::endl;
 
-    ofstream file;
-    file.open(filename.c_str(),ios::out | ios::trunc);
+    std::ofstream file;
+    file.open(filename.c_str(),std::ios::out | std::ios::trunc);
 
     file << get_package (0,filename, name, _name);

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_alias.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_alias"
-  string Vhdl::get_alias (uint32_t depth)
+  std::string Vhdl::get_alias (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string _return = get_list(_list_alias, depth, ";", true);
+    std::string _return = get_list(_list_alias, depth, ";", true);
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_architecture.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_architecture"
-  string Vhdl::get_architecture (uint32_t depth      ,
-                                 string   name       ,
-                                 string   entity_name)
+  std::string Vhdl::get_architecture (uint32_t depth      ,
+                                 std::string   name       ,
+                                 std::string   entity_name)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string        tab = string(depth,'\t');
-    ostringstream text;
+    std::string        tab = std::string(depth,'\t');
+    std::ostringstream text;
 
-    text << tab << "architecture " << name << " of " << entity_name << " is" << endl
-         << tab << get_type     (depth+1)                                    << endl
-         << tab << get_signal   (depth+1)                                    << endl
-         << tab << get_alias    (depth+1)                                    << endl
-         << tab << "begin"                                                   << endl
-         << tab << get_body     (depth+1)                                    << endl
-         << tab << "end " << name << ";"                                     << endl;
+    text << tab << "architecture " << name << " of " << entity_name << " is" << std::endl
+         << tab << get_type     (depth+1)                                    << std::endl
+         << tab << get_signal   (depth+1)                                    << std::endl
+         << tab << get_alias    (depth+1)                                    << std::endl
+         << tab << "begin"                                                   << std::endl
+         << tab << get_body     (depth+1)                                    << std::endl
+         << tab << "end " << name << ";"                                     << std::endl;
 
     log_printf(FUNC,Behavioural,FUNCTION,"End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_body.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_body"
-  string Vhdl::get_body (uint32_t depth)
+  std::string Vhdl::get_body (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string _return = get_list(_list_body,depth,"",true);
+    std::string _return = get_list(_list_body,depth,"",true);
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_component.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_component"
-  string Vhdl::get_component(uint32_t depth,
-                             string   name)
+  std::string Vhdl::get_component(uint32_t depth,
+                             std::string   name)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string        tab = string(depth,'\t');
-    ostringstream text;
+    std::string        tab = std::string(depth,'\t');
+    std::ostringstream text;
 
-    text <<                                      endl
-         << tab << "component " << name       << endl;
+    text <<                                      std::endl
+         << tab << "component " << name       << std::endl;
     if (_list_port.empty() == false)
-      text << tab << "\tport ("                 << endl
-           << tab << get_port(depth+1)          << endl
-           << tab << "\t     );"                << endl;
-    text << tab << "end component;"           << endl;
-  
+      text << tab << "\tport ("                 << std::endl
+           << tab << get_port(depth+1)          << std::endl
+           << tab << "\t     );"                << std::endl;
+    text << tab << "end component;"           << std::endl;
+    
     log_printf(FUNC,Behavioural,FUNCTION,"End");
     return text.str();

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_entity.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_entity"
-  string Vhdl::get_entity(uint32_t depth,
-                          string   name)
+  std::string Vhdl::get_entity(uint32_t depth,
+                               std::string   name)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string        tab = string(depth,'\t');
-    ostringstream text;
+    std::string        tab = std::string(depth,'\t');
+    std::ostringstream text;
 
-    text <<                                      endl
-         << tab << "entity " << name << " is" << endl;
-
+    text <<                                      std::endl
+         << tab << "entity " << name << " is" << std::endl;
+    
     if (_list_port.empty() == false)
-      text << tab << "\tport ("                 << endl
-           << tab << get_port(depth+1)          << endl
-           << tab << "\t     );"                << endl;
+      text << tab << "\tport ("                 << std::endl
+           << tab << get_port(depth+1)          << std::endl
+           << tab << "\t     );"                << std::endl;
     
-    text << tab << "end " << name << ";"      << endl;
+    text << tab << "end " << name << ";"      << std::endl;
     
     log_printf(FUNC,Behavioural,FUNCTION,"End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_header.cpp

@@ -11 +11 @@
 #include <time.h>
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_header"
-  string Vhdl::get_header(uint32_t depth,
-                          string   filename)
+  std::string Vhdl::get_header(uint32_t depth,
+                          std::string   filename)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string        tab = string(depth,'\t');
-    ostringstream text;
+    std::string        tab = std::string(depth,'\t');
+    std::ostringstream text;
 
     time_t current_time;
     time (&current_time);
 
-    text << tab << "-------------------------------------------------------------------------------" << endl
-         << tab << "-- file      : " << filename                                                     << endl
+    text << tab << "-------------------------------------------------------------------------------" << std::endl
+         << tab << "-- file      : " << filename                                                     << std::endl
          << tab << "-- date      : " << ctime (&current_time )
-         << tab << "-- comment   : it's a autogenerated file : don't modify"                         << endl
-         << tab << "-------------------------------------------------------------------------------" << endl;
+         << tab << "-- comment   : it's a autogenerated file : don't modify"                         << std::endl
+         << tab << "-------------------------------------------------------------------------------" << std::endl;
     
     log_printf(FUNC,Behavioural,FUNCTION,"End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_library_ieee.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_library_ieee"
-  string Vhdl::get_library_ieee (uint32_t depth)
+  std::string Vhdl::get_library_ieee (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string        tab = string(depth,'\t');
-    ostringstream text;
+    std::string        tab = std::string(depth,'\t');
+    std::ostringstream text;
 
-    text << tab                                       << endl
-         << tab << "library ieee;"                    << endl
-         << tab << "use ieee.numeric_bit.all;"        << endl
-         << tab << "use ieee.numeric_std.all;"        << endl
-         << tab << "use ieee.std_logic_1164.all;"     << endl
-         << tab << "use ieee.std_logic_arith.all;"    << endl
-         << tab << "use ieee.std_logic_misc.all;"     << endl
-         << tab << "--use ieee.std_logic_signed.all;"   << endl
-         << tab << "use ieee.std_logic_unsigned.all;" << endl
-         << tab << "--use ieee.std_logic_textio.all;"   << endl;
+    text << tab                                       << std::endl
+         << tab << "library ieee;"                    << std::endl
+         << tab << "use ieee.numeric_bit.all;"        << std::endl
+         << tab << "use ieee.numeric_std.all;"        << std::endl
+         << tab << "use ieee.std_logic_1164.all;"     << std::endl
+         << tab << "use ieee.std_logic_arith.all;"    << std::endl
+         << tab << "use ieee.std_logic_misc.all;"     << std::endl
+         << tab << "--use ieee.std_logic_signed.all;" << std::endl
+         << tab << "use ieee.std_logic_unsigned.all;" << std::endl
+         << tab << "--use ieee.std_logic_textio.all;" << std::endl;
       
     log_printf(FUNC,Behavioural,FUNCTION,"End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_library_work.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_library_work"
-  string Vhdl::get_library_work (uint32_t depth)
+  std::string Vhdl::get_library_work (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    list<string>::iterator i   = _list_library_work.begin();
-    string                 tab = string(depth,'\t');
-    ostringstream          text;
+    std::list<std::string>::iterator i   = _list_library_work.begin();
+    std::string                 tab = std::string(depth,'\t');
+    std::ostringstream          text;
 
     if (i != _list_library_work.end())
-      text << tab                    << endl
-           << tab << "library work;" << endl
+      text << tab                    << std::endl
+           << tab << "library work;" << std::endl
            << get_list(_list_library_work,depth,";",true);
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_list.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_list"
-  string Vhdl::get_list (list<string> liste                ,
-                         uint32_t     depth                ,
-                         string       separator            ,
-                         bool         last_separator       )
+  std::string Vhdl::get_list (std::list<std::string> liste                ,
+                              uint32_t     depth                ,
+                              std::string       separator            ,
+                              bool         last_separator       )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    list<string>::iterator i     = liste.begin();
-    bool                   empty = liste.empty();
+    std::list<std::string>::iterator i     = liste.begin();
+    bool                             empty = liste.empty();
 
-    string                 tab   = string(depth,'\t');
-    ostringstream          text;
+    std::string                 tab   = std::string(depth,'\t');
+    std::ostringstream          text;
 
     if (not empty)
@@ -42 +41 @@
         while (i != liste.end())
           {
-            text << separator << endl;
+            text << separator << std::endl;
             text << tab << *i;
             ++i;
@@ -48 +47 @@
         
         if (last_separator)
-          text << separator << endl;
+          text << separator << std::endl;
       }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_model.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
 namespace behavioural          {
   
-  string Vhdl::get_model(uint32_t depth            ,
-                         string   filename         ,
-                         string   entity_name      ,
-                         string   architecture_name)
+  std::string Vhdl::get_model(uint32_t depth            ,
+                         std::string   filename         ,
+                         std::string   entity_name      ,
+                         std::string   architecture_name)
   {
     log_printf(FUNC,Behavioural,"get_model","Begin");
 
-    string        tab = string(depth,'\t');
-    ostringstream text;
+    std::string        tab = std::string(depth,'\t');
+    std::ostringstream text;
 
-    text << tab << get_header       (depth,filename)                      << endl
-         << tab << get_library_ieee (depth)                               << endl
-         << tab << get_library_work (depth)                               << endl
-         << tab << get_entity       (depth,entity_name)                   << endl
-         << tab << get_architecture (depth,architecture_name,entity_name) << endl;
+    text << tab << get_header       (depth,filename)                      << std::endl
+         << tab << get_library_ieee (depth)                               << std::endl
+         << tab << get_library_work (depth)                               << std::endl
+         << tab << get_entity       (depth,entity_name)                   << std::endl
+         << tab << get_architecture (depth,architecture_name,entity_name) << std::endl;
     
     log_printf(FUNC,Behavioural,"get_model","End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_package.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_package"
-  string Vhdl::get_package(uint32_t depth       ,
-                           string   filename    ,
-                           string   package_name,
-                           string   entity_name )
+  std::string Vhdl::get_package(uint32_t depth       ,
+                           std::string   filename    ,
+                           std::string   package_name,
+                           std::string   entity_name )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string        tab = string(depth,'\t');
-    ostringstream text;
+    std::string        tab = std::string(depth,'\t');
+    std::ostringstream text;
 
-    text << tab << get_header       (depth,filename)                      << endl
-         << tab << get_library_ieee (depth)                               << endl
-         << tab << "package " << package_name << " is"                    << endl
-         << tab << get_component    (depth+1,entity_name)                 << endl
-         << tab << "end " << package_name << ";"                          << endl;
+    text << tab << get_header       (depth,filename)                      << std::endl
+         << tab << get_library_ieee (depth)                               << std::endl
+         << tab << "package " << package_name << " is"                    << std::endl
+         << tab << get_component    (depth+1,entity_name)                 << std::endl
+         << tab << "end " << package_name << ";"                          << std::endl;
 
     log_printf(FUNC,Behavioural,FUNCTION,"End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_port.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_port"
-  string Vhdl::get_port (uint32_t depth)
+  std::string Vhdl::get_port (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string _return = get_list (_list_port, depth, ";", false);    
+    std::string _return = get_list (_list_port, depth, ";", false);    
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_signal.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_signal"
-  string Vhdl::get_signal (uint32_t depth)
+  std::string Vhdl::get_signal (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string _return = get_list (_list_signal, depth, ";", true);
+    std::string _return = get_list (_list_signal, depth, ";", true);
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_type.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_type"
-  string Vhdl::get_type (uint32_t depth)
+  std::string Vhdl::get_type (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string _return = get_list (_list_type, depth, ";", true);
+    std::string _return = get_list (_list_type, depth, ";", true);
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_alias.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_alias"
-  void Vhdl::set_alias (string      name1 ,
-                        string      type1 ,
-                        string      name2 ,
-                        string      range2)
+  void Vhdl::set_alias (std::string      name1 ,
+                        std::string      type1 ,
+                        std::string      name2 ,
+                        std::string      range2)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
@@ -28 +27 @@
   };
 
-  void Vhdl::set_alias (string      name1 ,
+  void Vhdl::set_alias (std::string      name1 ,
                         uint32_t    size1 ,
-                        string      name2 ,
-                        string      range2)
+                        std::string      name2 ,
+                        std::string      range2)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_body.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_body"
-  void Vhdl::set_body (string      text     )
+  void Vhdl::set_body (std::string      text     )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_body_component.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_body_component"
-  void Vhdl::set_body_component (string         name_instance      ,
-                                 string         name_component     ,
-                                 list<string>   list_port_map      )
+  void Vhdl::set_body_component (std::string         name_instance      ,
+                                 std::string         name_component     ,
+                                 std::list<std::string>   list_port_map      )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_body_component_port_map.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_body_component_port_map"
-  void Vhdl::set_body_component_port_map (list<string> & list_port_map      ,
-                                          string         name_port          ,
+  void Vhdl::set_body_component_port_map (std::list<std::string> & list_port_map      ,
+                                          std::string         name_port          ,
                                           uint32_t       size_port          ,
-                                          string         name_signal        ,
+                                          std::string         name_signal        ,
                                           uint32_t       size_signal        )
   {
@@ -29 +28 @@
       throw (ErrorMorpheo ("<Vhdl::set_body_component_port_map> size of port '"+name_port+"' ("+toString(size_port)+") is greater than size of signal '"+name_signal+"' ("+toString(size_signal)+")."));
 
-    string str_size = "";
+    std::string str_size = "";
 
     // test if size is different (possible if multi write

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_constant.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_constant"
-  void Vhdl::set_constant (string      name     ,
-                           string      type     ,
-                           string      init)
+  void Vhdl::set_constant (std::string      name     ,
+                           std::string      type     ,
+                           std::string      init)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
@@ -27 +26 @@
   };
 
-  void Vhdl::set_constant (string      name     ,
+  void Vhdl::set_constant (std::string      name     ,
                            uint32_t    size     ,
-                           string      init)
+                           std::string      init)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
@@ -36 +35 @@
   };
 
-  void Vhdl::set_constant (string      name     ,
+  void Vhdl::set_constant (std::string      name     ,
                            uint32_t    size     ,
                            uint32_t    init)

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_library_work.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_library_work"
-  void Vhdl::set_library_work (string      package_name)
+  void Vhdl::set_library_work (std::string      package_name)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_list.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_list"
-  void Vhdl::set_list (list<string> & liste,
-                       string         text )
+  void Vhdl::set_list (std::list<std::string> & liste,
+                       std::string         text )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_port.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_port"
-  void Vhdl::set_port (string      name     ,
+  void Vhdl::set_port (std::string      name     ,
                        direction_t direction,
-                       string      type     )
+                       std::string      type     )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
@@ -27 +26 @@
   };
 
-  void Vhdl::set_port (string      name     ,
+  void Vhdl::set_port (std::string      name     ,
                        direction_t direction,
                        uint32_t    size     )

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_signal.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -19 +18 @@
 #define FUNCTION "Vhdl::set_signal"
 
-  void Vhdl::set_signal (string      name     ,
-                         string      type     )
+  void Vhdl::set_signal (std::string      name     ,
+                         std::string      type     )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
@@ -27 +26 @@
   };
 
-  void Vhdl::set_signal (string      name     ,
+  void Vhdl::set_signal (std::string      name     ,
                          uint32_t    size     )
   {
@@ -35 +34 @@
   }
 
-  void Vhdl::set_signal (string      name     ,
-                         string      type     ,
-                         string      init)
+  void Vhdl::set_signal (std::string      name     ,
+                         std::string      type     ,
+                         std::string      init)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
@@ -44 +43 @@
   };
 
-  void Vhdl::set_signal (string      name     ,
+  void Vhdl::set_signal (std::string      name     ,
                          uint32_t    size     ,
-                         string      init     )
+                         std::string      init     )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
@@ -52 +51 @@
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };
-  void Vhdl::set_signal (string      name     ,
+  void Vhdl::set_signal (std::string      name     ,
                          uint32_t    size     ,
                          uint32_t    init     )

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_set_type.cpp

@@ -11 +11 @@
 
 #include <sstream>
-using namespace std;
 
 namespace morpheo              {
@@ -18 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_type"
-  void Vhdl::set_type (string      name     ,
-                       string      type     )
+  void Vhdl::set_type (std::string      name     ,
+                       std::string      type     )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_std_logic.cpp

@@ -16 +16 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::std_logic"
-  string std_logic (uint32_t size)
+  std::string std_logic (uint32_t size)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string type;
+    std::string type;
 
     if (size == 1)
@@ -34 +34 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::std_logic_conv"
-  string std_logic_conv (uint32_t size, string value)
+  std::string std_logic_conv (uint32_t size, std::string value)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string conv;
+    std::string conv;
 
     if (size == 1)
@@ -50 +50 @@
   };
 
-  string std_logic_conv (uint32_t size, uint32_t value)
+  std::string std_logic_conv (uint32_t size, uint32_t value)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    cout << toString(value) << endl;
-    string _return = std_logic_conv(size,toString(value));
+    std::string _return = std_logic_conv(size,toString(value));
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 
@@ -62 +61 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::std_logic_range"
-  string std_logic_range (uint32_t size, uint32_t max, uint32_t min)
+  std::string std_logic_range (uint32_t size, uint32_t max, uint32_t min)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string type;
+    std::string type;
 
     if (size < 2)
@@ -80 +79 @@
   };
 
-  string std_logic_range (uint32_t max, uint32_t min)
+  std::string std_logic_range (uint32_t max, uint32_t min)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string type;
+    std::string type;
 
     if (max == 0)
@@ -98 +97 @@
   };
 
-  string std_logic_range (uint32_t size)
+  std::string std_logic_range (uint32_t size)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string _return = std_logic_range(size-1,0);
+    std::string _return = std_logic_range(size-1,0);
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 
@@ -109 +108 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::std_logic_others"
-  string std_logic_others (uint32_t size, uint32_t cst  )
+  std::string std_logic_others (uint32_t size, uint32_t cst  )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string _return;
+    std::string _return;
 
     if (size < 2)

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::XML"
-  XML::XML  (string name) :
+  XML::XML  (std::string name) :
     _name (name)
   {

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_attribut.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::attribut"
-  bool XML::attribut (string name, string value)
+  bool XML::attribut (std::string name, std::string value)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_balise_close.cpp

@@ -16 +16 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string name=*(_list_balise_name.begin());
+    std::string name=*(_list_balise_name.begin());
 
     _list_balise_name.pop_front();

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_balise_open.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::balise_open"
-  bool XML::balise_open (string name)
+  bool XML::balise_open (std::string name)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_balise_open_begin.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::balise_open_begin"
-  bool XML::balise_open_begin (string name)
+  bool XML::balise_open_begin (std::string name)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_comment.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::comment"
-  bool XML::comment (string texte)
+  bool XML::comment (std::string texte)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_filename_extension.cpp

@@ -8 +8 @@
 #include "Behavioural/include/XML.h"
 #include <fstream>
-using namespace std;
 
 namespace morpheo              {
@@ -15 +14 @@
 #undef  FUNCTION
 #define FUNCTION "XML::filename_extension"
-  void XML::filename_extension (string extension)
+  void XML::filename_extension (std::string extension)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_generate_file.cpp

@@ -8 +8 @@
 #include "Behavioural/include/XML.h"
 #include <fstream>
-using namespace std;
 
 namespace morpheo              {
@@ -15 +14 @@
 #undef  FUNCTION
 #define FUNCTION "XML::generate_file"
-  void XML::generate_file (string encoding)
+  void XML::generate_file (std::string encoding)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
@@ -21 +20 @@
     header (encoding);
 
-    string name     = _name;
-    string filename =  name + "." + _filename_extension;
+    std::string filename =  _name + "." + _filename_extension;
 
-    cout << "Generate file \""<< filename << "\"" << endl;
+    std::cout << "Generate file \""<< filename << "\"" << std::endl;
 
-    ofstream file;
-    file.open(filename.c_str(),ios::out | ios::trunc);
+    std::ofstream file;
+    file.open(filename.c_str(),std::ios::out | std::ios::trunc);
 
     file << get_body();

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_get_body.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::get_body"
-  string XML::get_body (void)
+  std::string XML::get_body (void)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
@@ -20 +20 @@
   };
 
-  string XML::get_body (uint32_t depth)
+  std::string XML::get_body (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    string body       = _body;
-    string tabulation = indent(depth);
+    std::string body       = _body;
+    std::string tabulation = indent(depth);
 
-    body.insert(0,tabulation);
+//     body.insert(0,tabulation);
     for (size_t pos=body.find('\n',0); pos<body.length()-1; pos=body.find('\n',++pos))
       body.insert(++pos,tabulation);

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_header.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::header"
-  void XML::header (string encoding)
+  void XML::header (std::string encoding)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    _body = "<?xml version=\"1.0\" encoding=\""+encoding+"\" ?>\n" + _body;
+
+    time_t current_time;
+    time (&current_time);
+
+    std::string str_time = ctime (&current_time );
+
+    std::string str;
+
+    str  = "<?xml version=\"1.0\" encoding=\""+encoding+"\" ?>\n";
+    str += "\n";
+    str += "<!--\n";
+    str += "\tFile        : " + _name+"."+_filename_extension + "\n";
+    str += "\tDate        : " + str_time +"\n";
+    str += "\tComment     : it's a autogenerated file : don't modify\n";
+    str += "-->\n";
+    str += "\n";
+
+    _body = str + _body;
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_indent.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::indent"
-  string XML::indent (uint32_t depth)
+  std::string XML::indent (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string _return = string(depth,'\t');
+    std::string _return = std::string(depth,'\t');
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 
@@ -22 +22 @@
   };
 
-  string XML::indent (void)
+  std::string XML::indent (void)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    string _return = indent(depth());
+    std::string _return = indent(depth());
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_singleton.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::singleton"
-  bool XML::singleton (string name)
+  bool XML::singleton (std::string name)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_singleton_begin.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::singleton_begin"
-  bool XML::singleton_begin (string name)
+  bool XML::singleton_begin (std::string name)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/src/XML_text.cpp

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "XML::text"
-  bool XML::text (string text)
+  bool XML::text (std::string text)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");