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

Timestamp:

Apr 14, 2009, 8:39:12 PM (15 years ago)

Author:

rosiere

Message:

1) Add modelsim simulation systemC
2) Modelsim cosimulation systemC / VHDL is not finish !!!! (cf execute_queue and write_unit)
3) Add multi architecture
5) Add template for comparator, multiplier and divider
6) Change Message
Warning) Various test macro have change, many selftest can't compile

Location:

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

Files:

• Component.cpp (modified) (2 diffs)
• Component_get_sc_signal.cpp (added)
• Component_port_map.cpp (modified) (3 diffs)
• Component_set_component.cpp (modified) (3 diffs)
• Component_set_entity.cpp (modified) (2 diffs)
• Component_signal_internal.cpp (modified) (3 diffs)
• Component_vhdl_instance.cpp (modified) (2 diffs)
• Entity_usage.cpp (added)
• Interface.cpp (modified) (1 diff)
• Interface_fifo_testbench_assert.cpp (modified) (1 diff)
• Interface_fifo_testbench_cycle.cpp (modified) (2 diffs)
• Interface_find_signal.cpp (modified) (1 diff)
• Interface_set_port.cpp (modified) (1 diff)
• Interface_set_signal.cpp (modified) (5 diffs)
• Interface_signal_name.cpp (modified) (1 diff)
• Interfaces.cpp (modified) (1 diff)
• Interfaces_set_port.cpp (modified) (1 diff)
• Interfaces_testbench_generate_file.cpp (modified) (4 diffs)
• Model_print.cpp (added)
• Model_set_model.cpp (modified) (1 diff)
• Parameters.cpp (modified) (1 diff)
• Parameters_test.cpp (modified) (1 diff)
• Signal.cpp (modified) (3 diffs)
• Signal_get_sc_signal.cpp (added)
• Signal_get_size.cpp (modified) (2 diffs)
• Signal_link.cpp (modified) (1 diff)
• Signal_presence_testbench.cpp (modified) (1 diff)
• Signal_set_port.cpp (modified) (2 diffs)
• Signal_set_size.cpp (modified) (2 diffs)
• Signal_testbench.cpp (modified) (4 diffs)
• Signal_testbench_body.cpp (modified) (2 diffs)
• Simulation_test_end.cpp (modified) (3 diffs)
• Stat_end_cycle.cpp (modified) (2 diffs)
• Stat_generate_file.cpp (modified) (2 diffs)
• Stat_print.cpp (modified) (2 diffs)
• Usage.cpp (modified) (6 diffs)
• Vhdl.cpp (modified) (1 diff)
• Vhdl_generate_file_model.cpp (modified) (2 diffs)
• Vhdl_generate_file_package.cpp (modified) (2 diffs)
• Vhdl_get_alias.cpp (modified) (1 diff)
• Vhdl_get_architecture.cpp (modified) (2 diffs)
• Vhdl_get_body.cpp (modified) (1 diff)
• Vhdl_get_configuration.cpp (added)
• Vhdl_get_debug.cpp (added)
• Vhdl_get_header.cpp (modified) (3 diffs)
• Vhdl_get_library.cpp (moved) (moved from trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_library_work.cpp) (1 diff)
• Vhdl_get_library_default.cpp (added)
• Vhdl_get_list.cpp (modified) (1 diff)
• Vhdl_get_model.cpp (modified) (2 diffs)
• Vhdl_get_package.cpp (modified) (1 diff)
• Vhdl_get_signal.cpp (modified) (1 diff)
• Vhdl_get_type.cpp (modified) (1 diff)
• Vhdl_set_alias.cpp (modified) (1 diff)
• Vhdl_set_architecture.cpp (added)
• Vhdl_set_body.cpp (modified) (2 diffs)
• Vhdl_set_body_component.cpp (modified) (1 diff)
• Vhdl_set_constant.cpp (modified) (1 diff)
• Vhdl_set_debug.cpp (added)
• Vhdl_set_library.cpp (added)
• Vhdl_set_library_default.cpp (moved) (moved from trunk/IPs/systemC/processor/Morpheo/Behavioural/src/Vhdl_get_library_ieee.cpp) (2 diffs)
• Vhdl_set_library_work.cpp (modified) (1 diff)
• Vhdl_set_port.cpp (modified) (1 diff)
• Vhdl_set_signal.cpp (modified) (2 diffs)
• Vhdl_set_type.cpp (modified) (1 diff)
• Vhdl_test_architecture.cpp (added)

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

@@ -15 +15 @@
   {
     log_printf(FUNC,Behavioural,"Component::Component","Begin");
+    _entity = NULL;
     _list_component = new std::list<Tcomponent_t *>;
     log_printf(FUNC,Behavioural,"Component::Component","End");
@@ -31 +32 @@
   {
     log_printf(FUNC,Behavioural,"Component::~Component","Begin");
-    delete _entity;
+    if (_entity != NULL)
+      delete _entity;
+    while (not _list_component->empty())
+      {
+        delete _list_component->front();
+        _list_component->pop_front();
+      }
     delete _list_component;
     log_printf(FUNC,Behavioural,"Component::~Component","End");

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

@@ -80 +80 @@
         Signal * signal_productor;
         Entity * entity_productor;
+        Signal * signal_consumer ;
+        Entity * entity_consumer ;
 
         bool     src_is_productor = (signal_src->get_direction() == OUT);
@@ -85 +87 @@
         if (src_is_productor == true)
           {
-            signal_productor = signal_src;
-            entity_productor = entity_src;
+            signal_productor = signal_src ;
+            entity_productor = entity_src ;
+            signal_consumer  = signal_dest;
+            entity_consumer  = entity_dest;
           }
         else
@@ -92 +96 @@
             signal_productor = signal_dest;
             entity_productor = entity_dest;
+            signal_consumer  = signal_src ;
+            entity_consumer  = entity_src ;
           }
 
         // Create internal signal
-        signal_dest= signal_internal (entity_productor, signal_productor);
+        signal_dest= signal_internal (entity_productor,
+                                      signal_productor,
+                                      entity_consumer ,
+                                      signal_consumer );
         signal_dest->set_size_max(signal_src->get_size());
       }

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

@@ -2 +2 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -21 +21 @@
 #endif
                                  ,Tinstance_t instance
+                                 ,std::string architecture
                                  )
   {
@@ -29 +30 @@
     Tcomponent_t * entry = new Tcomponent_t;
     
-    entry->_component= component;
-    entry->_instance = instance;
-    entry->_entity   = entity;
+    entry->_component    = component;
+    entry->_instance     = instance;
+    entry->_architecture = architecture;
+    entry->_entity       = entity;
 
     _list_component->push_back(entry);

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

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "Component::set_entity"
-  Entity * Component::set_entity (std::string        name   
-                                  ,std::string        type   
+  Entity * Component::set_entity (std::string  name
+                                  ,std::string type
 #ifdef POSITION
-                                  ,schema_t      schema
+                                  ,schema_t    schema
 #endif
                                   )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+
+    if (_entity != NULL)
+      throw ERRORMORPHEO(FUNCTION,_("Entity is already allocated.\n"));
     
     Entity * entity = new Entity (name   
@@ -29 +32 @@
                                   ,_usage
                                   );
+
     _entity = entity;
     

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

@@ -2 +2 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -14 +14 @@
 #define FUNCTION "Component::signal_internal"
   Signal * Component::signal_internal (Entity * entity_productor,
-                                       Signal * signal_productor)
+                                       Signal * signal_productor,
+                                       Entity * entity_consumer,
+                                       Signal * signal_consumer)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
+    bool productor_is_cosimulation = usage_is_set(entity_productor->get_usage(),USE_COSIMULATION);
+    bool consumer_is_cosimulation  = usage_is_set(entity_consumer ->get_usage(),USE_COSIMULATION);
+    bool is_cosimulation           = consumer_is_cosimulation or productor_is_cosimulation;
+    if (productor_is_cosimulation and consumer_is_cosimulation)
+      throw ERRORMORPHEO (FUNCTION,toString(_("Entity \"%s\" and Entity \"%s\" use both cosimulation. It's not supported.\n"),entity_productor->get_name().c_str(),entity_consumer->get_name().c_str()));
+    
     // create name of internal's signal
-    std::string str_entity = entity_productor->get_name();
-    std::string str_signal = signal_productor->get_name();
+    Entity * entity = (consumer_is_cosimulation)?entity_consumer:entity_productor;
+    Signal * signal = (consumer_is_cosimulation)?signal_consumer:signal_productor;
+
+    std::string str_entity = entity->get_name();
+    std::string str_signal = signal->get_name();
     
-    UpperCase (str_entity);
-    UpperCase (str_signal);
+//     UpperCase (str_entity);
+//     UpperCase (str_signal);
     
-    std::string name_internal = "internal_"+str_entity+"_"+str_signal;
+    std::string name_internal = (is_cosimulation)?str_signal:("internal_"+str_entity+"_"+str_signal);
     
     // test if internal's signal exist ... else, create
@@ -38 +49 @@
         
         if (interface == NULL)
-          throw (ErrorMorpheo ("<Component::port_map> Component \""+_entity->get_name()+"\", doesn't have an interface \"\"."));
-        
-        std::string signame = entity_productor->get_name()+"_"+signal_productor->get_name();
-        
+          throw ERRORMORPHEO (FUNCTION,toString(_("Component \"%s\", doesn't have an interface \"\".\n"),_entity->get_name().c_str()));
+
+//      std::string signame   = entity->get_name()+"_"+signal->get_name();
+        std::string signame   = name_internal;
+        type_info_t type_info = signal->get_type_info();
+
         // Signal's creation
-        switch (signal_productor->get_type_info())
+        switch (type_info)
           {
-          case BOOL     : 
-            {
-              interface->set_signal_internal<bool    >(signame, signal_productor->get_size());
-              break;
-            }
-          case UINT8_T  :
-            {
-              interface->set_signal_internal<uint8_t >(signame, signal_productor->get_size());
-              break;
-            }
-          case UINT16_T :
-            {
-              interface->set_signal_internal<uint16_t>(signame, signal_productor->get_size());
-              break;
-            }
-          case UINT32_T :
-            {
-              interface->set_signal_internal<uint32_t>(signame, signal_productor->get_size());
-              break;
-            }
-          case UINT64_T :
-            {
-              interface->set_signal_internal<uint64_t>(signame, signal_productor->get_size());
-              break;
-            }
-          default       :
-            throw (ErrorMorpheo ("Signal \""+name_internal+"\" : type unknow."));
+          case BOOL     : interface->set_signal_internal<bool    >(signame, signal->get_size()); break;
+          case UINT8_T  : interface->set_signal_internal<uint8_t >(signame, signal->get_size()); break;
+          case UINT16_T : interface->set_signal_internal<uint16_t>(signame, signal->get_size()); break;
+          case UINT32_T : interface->set_signal_internal<uint32_t>(signame, signal->get_size()); break;
+          case UINT64_T : interface->set_signal_internal<uint64_t>(signame, signal->get_size()); break;
+          default       :throw (ErrorMorpheo ("Signal \""+name_internal+"\" : type unknow."));
           }
         

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

@@ -92 +92 @@
         while (i != list_component->end())
           {
-            Entity *    entity   = (*i)->_entity;
-            Tinstance_t instance = (*i)->_instance;
+            Entity *    entity       = (*i)->_entity;
+            Tinstance_t instance     = (*i)->_instance;
+            std::string architecture = (*i)->_architecture;
+            std::string package      = "work";
             
             if (instance & INSTANCE_LIBRARY)
@@ -176 +178 @@
                     }
                 }
-              vhdl->set_body_component ("instance_"+entity->get_name(),entity->get_name(),list_port_map);
+              vhdl->set_body_component ("instance_"+entity->get_name(),
+                                        entity->get_name(),
+                                        architecture,
+                                        package,
+                                        list_port_map);
               
             }

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

@@ -73 +73 @@
          it != _list_signal->end();
          ++it)
-      delete (*it);
+      {
+        if ((_usage & USE_SYSTEMC) and 
+            ((*it)->get_direction() == INTERNAL))
+          delete (*it)->get_sc_signal();
+        delete (*it);
+      }
     
     delete _list_signal;

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

@@ -34 +34 @@
           while (i != _list_cycle->end())
             {
-              vhdl->set_body("assert not (("+counter_name+" = "+toString(*i)+" and "+test_name+" = '1')) report \"***** <"+_name+"> Test number "+toString(j)+" is OK     *****\" severity NOTE;");
-              vhdl->set_body("assert not (("+counter_name+" = "+toString(*i)+" and "+test_name+" = '0')) report \"@@@@@ <"+_name+"> Test number "+toString(j)+" is KO !!! @@@@@\" severity NOTE;");
+              vhdl->set_body("assert not (("+counter_name+" = "+toString(*i)+" and "+test_name+" = '1')) report \"***** <"+_name+"> Test number "+toString(j)+" is OK     *****\" severity "+toString(VHDL_SEVERITY_NOTE)+";");
+              vhdl->set_body("assert not (("+counter_name+" = "+toString(*i)+" and "+test_name+" = '0')) report \"@@@@@ <"+_name+"> Test number "+toString(j)+" is KO !!! @@@@@\" severity "+toString(VHDL_SEVERITY_NOTE)+";");
               j++;
               ++i;

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

@@ -9 +9 @@
 #include "Behavioural/include/Interface_fifo.h"
 #include "Behavioural/include/Entity.h"
+#include "Common/include/Systemc.h"
 
 namespace morpheo              {
@@ -18 +19 @@
 
     // note : if defined(VHDL_TESTBENCH) then defined(SYSTEMC)
-    _list_cycle->push_back(static_cast<uint32_t>(sc_simulation_time()));
+    _list_cycle->push_back(static_cast<uint32_t>(simulation_cycle()));
 
     log_printf(FUNC,Behavioural,"testbench_cycle","End");

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

@@ -15 +15 @@
   {
     log_printf(FUNC,Behavioural,"find_signal","Begin");
+
+    LowerCase(name);
 
     std::list<Signal*>::iterator i   = _list_signal->begin();

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

@@ -26 +26 @@
           }
       }
+
     log_printf(FUNC,Behavioural,"set_port (Vhdl)","End");
   };

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

@@ -11 +11 @@
 namespace behavioural          {
 
+#undef  FUNCTION
+#define FUNCTION "Interface::set_signal"
   Signal * Interface::set_signal (std::string     name     ,
                                   direction_t     direction,
@@ -16 +18 @@
                                   presence_port_t presence_port)
   {
-    log_printf(FUNC,Behavioural,"set_signal","Begin");
+    log_begin(Behavioural,FUNCTION);
 
     std::string signame = signal_name(_name, name, direction);
@@ -24 +26 @@
     _list_signal->push_back (sig);
 
-    log_printf(FUNC,Behavioural,"set_signal","End");
+    log_end(Behavioural,FUNCTION);
 
     return sig;
@@ -36 +38 @@
   void Interface::set_signal (Vhdl * & vhdl)
   {
-    log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+    log_begin(Behavioural,FUNCTION);
     if (not _list_signal->empty())
       {
@@ -47 +49 @@
           }
       }
-    log_printf(FUNC,Behavioural,FUNCTION,"End");
+    log_end(Behavioural,FUNCTION);
   };
 #  endif

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

@@ -17 +17 @@
     log_printf(FUNC,Behavioural,"signal_name","Begin");
 
-    std::string str_direction = toString(direction);
+    std::string str_direction = (direction==INTERNAL)?"":toString(direction);
     std::string str_interface = name_interface;
     std::string str_signal    = name_signal;
 
-    LowerCase(str_direction);    
-    UpperCase(str_interface);
-    UpperCase(str_signal   );
+//     LowerCase(str_direction);    
+//     LowerCase(str_interface);
+//     LowerCase(str_signal   );
     
-    std::string signame = str_direction;
+    std::string signame = "";
+    bool need_underscore = false;
+
+    if (str_direction != "")
+      {
+        signame +=                            str_direction;
+        need_underscore = true;
+      }
     if (str_interface != "")
-      signame += "_"+str_interface;
-    if (str_signal    != "")
-      signame += "_"+str_signal;
+      {
+        signame += ((need_underscore)?"_":"")+str_interface;
+        need_underscore = true;
+      }
+    if (str_signal != "")
+      {
+        signame += ((need_underscore)?"_":"")+str_signal;
+//      need_underscore = true;
+      }
 
     log_printf(FUNC,Behavioural,"signal_name","End");

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

@@ -11 +11 @@
 namespace behavioural          {
 
-  Interfaces::Interfaces  (std::string   name,
+  Interfaces::Interfaces  (std::string name,
                            Tusage_t usage):
     _name  (name),

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

@@ -27 +27 @@
             ++i;
           }
+
+//         Signal * clock = get_clock();
+//         if (clock != NULL)
+//           vhdl->set_port_clock (clock->get_name());
       }
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

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

@@ -66 +66 @@
     vhdl->set_body("");
     vhdl->set_body("-- if the systemC simulate have multiple reset, we make the last");
-    vhdl->set_body(reset_name+" <= '1' after 150 ns;");    
+    vhdl->set_body(reset_name+" <= '1' after "+toString(2.*VHDL_TIME_PERIOD)+" "+toString(VHDL_TIME_UNIT)+";");    
 
     vhdl->set_body("");
@@ -73 +73 @@
     vhdl->set_body("------------------------------------------------------");
     vhdl->set_body("");
-    vhdl->set_body(clock_name+" <= not "+clock_name+" after 50 ns;");
+    vhdl->set_body(clock_name+" <= not "+clock_name+" after "+toString(VHDL_TIME_PERIOD/2.)+" "+toString(VHDL_TIME_UNIT)+";");
     vhdl->set_body("");
     vhdl->set_body("process ("+clock_name+")");
@@ -89 +89 @@
 #ifdef VHDL_TESTBENCH_ASSERT
     for (uint32_t cpt=0; cpt<=cycle; cpt++)
-      vhdl->set_body("\t\t\tassert not ("+counter+" = "+toString(cpt)+") report \"===== Test number "+toString(cpt)+" =====\" severity NOTE;");
+      vhdl->set_body("\t\t\tassert not ("+counter+" = "+toString(cpt)+") report \"===== Test number "+toString(cpt)+" =====\" severity "+toString(VHDL_SEVERITY_NOTE)+";");
 
     for (std::list<Interface_fifo*>::iterator it=_list_interface->begin();
@@ -106 +106 @@
 
     vhdl->set_body("");
-    vhdl->set_body("\t\t\tassert not ("+counter+" >= "+toString(cycle)+") report \"Test OK\" severity FAILURE;");
-    vhdl->set_body("\t\t\tassert not ("+test_name+" = '0') report \"Test KO\" severity FAILURE;");
+    vhdl->set_body("\t\t\tassert not ("+counter+" >= "+toString(cycle)+") report \"Test OK\" severity "+toString(VHDL_SEVERITY_FAILURE)+";");
+    vhdl->set_body("\t\t\tassert not ("+test_name+" = '0') report \"Test KO\" severity "+toString(VHDL_SEVERITY_FAILURE)+";");
     vhdl->set_body("\t\tend if;");
     vhdl->set_body("\tend if;");

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

@@ -12 +12 @@
 
 #undef  FUNCTION
-#define FUNCTION "Model::get_type"
+#define FUNCTION "Model::set_model"
   void Model::set_model (std::string component, model_type_t type, debug_verbosity_t debug)
   {

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

@@ -13 +13 @@
 #undef  FUNCTION
 #define FUNCTION "Parameters::Parameters"
-  Parameters::Parameters  (void)
+  Parameters::Parameters  (void) :
+    _type ("")
+  {
+    log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+    log_printf(FUNC,Behavioural,FUNCTION,"End");
+  };
+
+#undef  FUNCTION
+#define FUNCTION "Parameters::Parameters"
+  Parameters::Parameters  (std::string type) :
+    _type (type)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

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

@@ -20 +20 @@
     Parameters_test x = msg_error();
     
-    std::cerr << x.print();
+    msg("%s",x.print().c_str());
 
     if (x.have_error())

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

@@ -11 +11 @@
 namespace behavioural          {
 
-  Signal::Signal  (std::string          name         ,
+  Signal::Signal  (std::string     name         ,
                    direction_t     direction    ,
                    uint32_t        size         ,
@@ -20 +20 @@
   {
     log_printf(FUNC,Behavioural,"Signal","Begin");
-    _size                     = size;
+
     _is_allocate              = false;
     _is_map_as_component_src  = false;
@@ -33 +33 @@
     _list_value          = new std::list<std::string>;
 #endif
+    set_size(size);
     
     if (_size == 0)
       throw ERRORMORPHEO(FUNCTION,"Size of signal '"+_name+"' is nul");
-
 
     log_printf(FUNC,Behavioural,"Signal","End");

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

@@ -7 +7 @@
 
 #include "Behavioural/include/Signal.h"
-
+#include "Common/include/Environment.h"
 
 namespace morpheo              {
@@ -18 +18 @@
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
     uint32_t _return = _size;
+
+#ifdef MODELSIM_COSIMULATION
+    switch (_type_info)
+      {
+      case BOOL     : _return =  1; break;
+      case UINT8_T  : _return =  8; break;
+      case UINT16_T : _return = 16; break;
+      case UINT32_T : _return = 32; break;
+      case UINT64_T : _return = 64; break;
+      default       : break;
+      }
+#endif
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

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

@@ -2 +2 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */

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

@@ -13 +13 @@
 
 #undef  FUNCTION
-#define FUNCTION "Signal::presence_vhdl"
-  bool Signal::presence_vhdl (void)
+#define FUNCTION "Signal::presence_testbench"
+  bool Signal::presence_testbench (void)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");

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

@@ -21 +21 @@
         (_presence_port == CLOCK_VHDL_YES)              or
         (_presence_port == RESET_VHDL_YES))
-      vhdl->set_port (_name,_direction,_size);
+      vhdl->set_port (_name,_direction,get_size());
 
     log_printf(FUNC,Behavioural,"set_port (Vhdl)","End");
@@ -38 +38 @@
 //      or (_presence_port == RESET_VHDL_NO ) 
         )
-      vhdl->set_signal (_name        ,_size);
+      vhdl->set_signal (_name        ,get_size());
 
     if (_direction == OUT)
-      vhdl->set_signal (_name+"_test",_size);
+      vhdl->set_signal (_name+"_test",get_size());
 
     log_printf(FUNC,Behavioural,"set_signal (Vhdl)","End");

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

@@ -18 +18 @@
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
     _size = size;
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };
@@ -27 +28 @@
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
     if (size > _size)
-      _size = size;
+      set_size(size);
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

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

@@ -44 +44 @@
               switch (_direction)
                 {
-                case IN    : {str =             toBase2 (value,_size); break;}
-                case OUT   : {str =             toBase2 (value,_size); break;}
+                case IN    : {str =             toBase2 (value,get_size()); break;}
+                case OUT   : {str =             toBase2 (value,get_size()); break;}
                 default    : {break;}
                 }
@@ -56 +56 @@
               switch (_direction)
                 {
-                case IN    : {str =             toBase2 (value,_size); break;}
-                case OUT   : {str =             toBase2 (value,_size); break;}
+                case IN    : {str =             toBase2 (value,get_size()); break;}
+                case OUT   : {str =             toBase2 (value,get_size()); break;}
                 default    : {break;}           
                 }
@@ -68 +68 @@
               switch (_direction)
                 {
-                case IN    : {str =             toBase2 (value,_size); break;}
-                case OUT   : {str =             toBase2 (value,_size); break;}
+                case IN    : {str =             toBase2 (value,get_size()); break;}
+                case OUT   : {str =             toBase2 (value,get_size()); break;}
                 default    : {break;}
                 }
@@ -80 +80 @@
               switch (_direction)
                 {
-                case IN    : {str =             toBase2 (value,_size); break;}
-                case OUT   : {str =             toBase2 (value,_size); break;}
+                case IN    : {str =             toBase2 (value,get_size()); break;}
+                case OUT   : {str =             toBase2 (value,get_size()); break;}
                 default    : {break;}
                 }

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

@@ -25 +25 @@
         {
           std::string separator;
-          if (_size == 1)
+          if (get_size() == 1)
             separator = "\'";
           else
@@ -48 +48 @@
             }
           
-          if (_size == 1)
+          if (get_size() == 1)
             vhdl->set_body ("\t'0' when others;");
           else

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

@@ -8 +8 @@
 
 #include "Behavioural/include/Simulation.h"
+#include "Common/include/Systemc.h"
 
 namespace morpheo              {
@@ -14 +15 @@
   bool simulation_test_end (void)
   {
-    msg("##########[ cycle %d ]\n",static_cast<uint32_t>(sc_simulation_time()));
+    msg("##########[ cycle %d ]\n",static_cast<uint32_t>(simulation_cycle()));
 
     // Test if a stop condition is activate
@@ -26 +27 @@
 
     if (_simulation_nb_cycle != 0)
-      end_cycle = (_simulation_nb_cycle <= sc_simulation_time());
+      end_cycle = (_simulation_nb_cycle <= simulation_cycle());
     else
       end_cycle = true;

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

@@ -1 +1 @@
 #ifdef STATISTICS
 #include "Behavioural/include/Stat.h"
+#include "Common/include/Systemc.h"
 
 namespace morpheo {
@@ -6 +7 @@
   void Stat::end_cycle (void)
   {
-    cycle_t _cycle_sum = sc_simulation_time();
+    cycle_t _cycle_sum = simulation_cycle();
 
     if (_cycle_sum >= _nb_cycle_before_begin)

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

@@ -3 +3 @@
 #include "Behavioural/include/Version.h"
 #include "Common/include/Environment.h"
+#include "Common/include/Systemc.h"
 
 namespace morpheo {
@@ -13 +14 @@
     std::string body = print(1);
 
-    cycle_t _cycle_sum = sc_simulation_time();
+    cycle_t _cycle_sum = simulation_cycle();
 
     morpheo::behavioural::XML * xml = new morpheo::behavioural::XML (_name_instance);

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

@@ -1 +1 @@
 #ifdef STATISTICS
 #include "Behavioural/include/Stat.h"
+#include "Common/include/Systemc.h"
 
 namespace morpheo {
@@ -12 +13 @@
     end_simulation(); 
 
-    cycle_t _cycle_sum = sc_simulation_time();
+    cycle_t _cycle_sum = simulation_cycle();
 
     morpheo::behavioural::XML xml (_name_instance);

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

@@ -5 +5 @@
 namespace morpheo {
 namespace behavioural {
+
+#ifdef MODELSIM_COSIMULATION
+  Tusage_t usage_cosimulation(Tusage_t usage)
+  {
+    Tusage_t _return = usage;
+//  _return = usage_unset(_return,USE_SYSTEMC              );
+    _return = usage_unset(_return,USE_SYSTEMC_INTERFACE    );
+    _return = usage_unset(_return,USE_SYSTEMC_BODY         );
+    _return = usage_unset(_return,USE_VHDL                 );
+    _return = usage_unset(_return,USE_VHDL_TESTBENCH       );
+    _return = usage_unset(_return,USE_VHDL_TESTBENCH_ASSERT);
+//  _return = usage_unset(_return,USE_POSITION             );
+    _return = usage_unset(_return,USE_STATISTICS           );
+//  _return = usage_unset(_return,USE_INFORMATION          );
+//  _return = usage_unset(_return,USE_HEADER               );
+    _return = usage_set  (_return,USE_COSIMULATION         );
+    
+    return _return;
+  }
+#endif
 
   Tusage_t usage_set         (Tusage_t usage, Tusage_t flag)
@@ -22 +42 @@
 #undef  FUNCTION
 #define FUNCTION "usage_environment"
-  void     usage_environment (Tusage_t usage)
+  Tusage_t usage_environment (Tusage_t usage)
   {
 #ifndef SYSTEMC
-    if (usage_is_set(usage,USE_SYSTEMC))
-      throw ERRORMORPHEO(FUNCTION,_("Component use the flag \"USE_SYSTEMC\", but the macro's compiler \"SYSTEMC\" is unset.\n"));
+    if (usage_is_set(usage,USE_SYSTEMC_INTERFACE))
+      throw ERRORMORPHEO(FUNCTION,_("Component use the flag \"USE_SYSTEMC_INTERFACE\", but the macro's compiler \"SYSTEMC\" is unset.\n"));
+    if (usage_is_set(usage,USE_SYSTEMC_BODY))
+      throw ERRORMORPHEO(FUNCTION,_("Component use the flag \"USE_SYSTEMC_BODY\", but the macro's compiler \"SYSTEMC\" is unset.\n"));
 #endif
 #ifndef VHDL
@@ -48 +70 @@
       throw ERRORMORPHEO(FUNCTION,_("Component use the flag \"USE_STATISTICS\", but the macro's compiler \"STATISTICS\" is unset.\n"));
 #endif
-#ifndef INFORMATION
-    if (usage_is_set(usage,USE_INFORMATION))
-      throw ERRORMORPHEO(FUNCTION,_("Component use the flag \"USE_INFORMATION\", but the macro's compiler \"INFORMATION\" is unset.\n"));
-#endif
+// #ifndef INFORMATION
+//     if (usage_is_set(usage,USE_INFORMATION))
+//       throw ERRORMORPHEO(FUNCTION,_("Component use the flag \"USE_INFORMATION\", but the macro's compiler \"INFORMATION\" is unset.\n"));
+// #endif
 
 #ifndef DEBUG
 #endif
 
-    if (usage_is_set(usage,USE_STATISTICS) and not usage_is_set(usage,USE_SYSTEMC))
-      throw ERRORMORPHEO(FUNCTION,_("Usage flags conflit : to use the statistics, you must set flag USE_SYSTEMC\n"));
+    if (usage_is_set(usage,USE_STATISTICS) and not usage_is_set(usage,USE_SYSTEMC_BODY))
+      throw ERRORMORPHEO(FUNCTION,_("Usage flags conflit : to use the statistics, you must set flag USE_SYSTEMC_BODY\n"));
     
-    if (usage_is_set(usage,USE_INFORMATION) and not usage_is_set(usage,USE_STATISTICS))
-      throw ERRORMORPHEO(FUNCTION,_("Usage flags conflit : to use the information, you must set flag USE_STATISTICS\n"));
+//     if (usage_is_set(usage,USE_INFORMATION) and not usage_is_set(usage,USE_STATISTICS))
+//       throw ERRORMORPHEO(FUNCTION,_("Usage flags conflit : to use the information, you must set flag USE_STATISTICS\n"));
     
-    if (usage_is_set(usage,USE_VHDL_TESTBENCH) and not usage_is_set(usage,USE_SYSTEMC))
-      throw ERRORMORPHEO(FUNCTION,_("Usage flags conflit : to use the vhdl's test bench, you must set flag USE_SYSTEMC\n"));
+    if (usage_is_set(usage,USE_VHDL_TESTBENCH) and not usage_is_set(usage,USE_SYSTEMC_BODY))
+      throw ERRORMORPHEO(FUNCTION,_("Usage flags conflit : to use the vhdl's test bench, you must set flag USE_SYSTEMC_BODY\n"));
     
     if (usage_is_set(usage,USE_VHDL_TESTBENCH) and not usage_is_set(usage,USE_VHDL))
@@ -70 +92 @@
     if (usage_is_set(usage,USE_VHDL_TESTBENCH_ASSERT) and not usage_is_set(usage,USE_VHDL_TESTBENCH))
       throw ERRORMORPHEO(FUNCTION,_("Usage flags conflit : to use an assert in vhdl's test bench, you must set flag USE_VHDL_TESTBENCH\n"));
+
+    return usage;
   }
 
@@ -77 +101 @@
 
 #ifdef SYSTEMC
-    usage = usage_set(usage,USE_SYSTEMC);
+    usage = usage_set(usage,USE_SYSTEMC_INTERFACE);
+    usage = usage_set(usage,USE_SYSTEMC_BODY);
 #endif
 #ifdef VHDL
@@ -94 +119 @@
     usage = usage_set(usage,USE_STATISTICS);
 #endif
-#ifdef INFORMATION
-    usage = usage_set(usage,USE_INFORMATION);
-#endif
+// #ifdef INFORMATION
+//     usage = usage_set(usage,USE_INFORMATION);
+// #endif
     usage = usage_set(usage,USE_HEADER);
 #ifdef DEBUG

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

@@ -15 +15 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::Vhdl"
-  Vhdl::Vhdl  (std::string name):
-    _name   (name)
+  Vhdl::Vhdl  (std::string name,
+               std::string id):
+    _name                      (name),
+    _id                        (id),
+    _name_architecture_default ("morpheo_behavioural")
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+
+    _name_architecture = _name_architecture_default;
+//  _port_clock        = "";
+
+    set_library_default();
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

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

@@ -22 +22 @@
     directory();
 
-    std::string filename = MORPHEO_VHDL + "/" + _name + ".vhdl";
+    std::string filename = MORPHEO_VHDL + "/" + _name + VHDL_EXTENSION;
     
     msg_printf(INFORMATION,_("Generate file \"%s\"."),filename.c_str());
@@ -30 +30 @@
     file.open(filename.c_str(),std::ios::out | std::ios::trunc);
 
-    file << get_model (0,filename,_name,"behavioural");
+    file << get_model (0,filename,_name);
     file.close();
 

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

@@ -4 +4 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -23 +23 @@
 
     std::string name     = _name + "_Pack";
-    std::string filename = MORPHEO_VHDL + "/" + name + ".vhdl";
+    std::string filename = MORPHEO_VHDL + "/" + name + VHDL_EXTENSION;
 
     msg_printf(INFORMATION,_("Generate file \"%s\"."),filename.c_str());

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

@@ -20 +20 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    std::string _return = get_list(_list_alias, depth, ";", true);
+
+    test_architecture();
+    
+    std::string _return = get_list(_architecture[_name_architecture]._list_alias, depth, ";", true);
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

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

@@ -11 +11 @@
 #include "Common/include/Tabulation.h"
 
-#include <sstream>
-
 namespace morpheo              {
 namespace behavioural          {
@@ -18 +16 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_architecture"
-  std::string Vhdl::get_architecture (uint32_t depth      ,
-                                 std::string   name       ,
-                                 std::string   entity_name)
+  std::string Vhdl::get_architecture (uint32_t    depth      ,
+                                      std::string entity_name)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    std::string        tab = morpheo::tab(depth);
     std::ostringstream text;
+    std::string name_architecture_old = _name_architecture;
+    std::string tab=morpheo::tab(depth);
 
-    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;
+    for (std::map<std::string,vhdl_architecture_t>::iterator it = _architecture.begin();
+         it!=_architecture.end();
+         ++it)
+      {
+        std::string name = it->first;
+        set_architecture(name);
+
+        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;
+      }
+
+    set_architecture (name_architecture_old);
 
     log_printf(FUNC,Behavioural,FUNCTION,"End");

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

@@ -20 +20 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    std::string _return = get_list(_list_body,depth,"",true);
+
+    test_architecture();
+    std::string _return = get_list(_architecture[_name_architecture]._list_body,depth,"",true);
+
+    _return = _return + get_debug(depth);
+    
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

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

@@ -12 +12 @@
 #include <time.h>
 #include <sstream>
+#include <fstream>
 
 namespace morpheo              {
@@ -21 +22 @@
                                std::string   filename)
   {
-    log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+    log_begin(Behavioural,FUNCTION);
 
     std::string text;
@@ -32 +33 @@
     text += "-- "+toString(_("Date    : ")) + ctime (&current_time );
     text += "-- "+toString(_("Version : ")) + MORPHEO_HEADER +"\n";
+    text += "-- "+toString(_("Id      : ")) + _id +"  \n";
     text += "-- "+toString(_("Comment : ")) + _("it's a autogenerated file, don't modify") +"\n";
     text += "-------------------------------------------------------------------------------\n";
     
-    log_printf(FUNC,Behavioural,FUNCTION,"End");
+    log_end(Behavioural,FUNCTION);
 
     return text;
+  };
+
+#undef  FUNCTION
+#define FUNCTION "vhdl_get_id"
+  std::string vhdl_get_id(std::string model_name)
+  {
+    log_begin(Behavioural,FUNCTION);
+
+    std::string id="";
+
+    directory();
+
+    std::string filename = MORPHEO_VHDL + "/" + model_name + VHDL_EXTENSION;
+    std::ifstream file;
+
+    file.open(filename.c_str(),std::ios::in);
+
+    // open file
+    if (!file)
+      {
+        log_printf(INFO,Behavioural,FUNCTION,_("Can't open file : \"%s\""),filename.c_str());
+      }
+    else
+      {
+        // get line with Id
+        do
+          {
+            std::getline(file,id,'\n'); // comment
+          } while ((id.find("Id      :") == std::string::npos) and
+                   (not file.eof()));
+
+        if (file.eof())
+          log_printf(INFO,Behavioural,FUNCTION,_("\"Id\" not find in file : \"%s\""),filename.c_str());
+        else
+          {
+            // get id
+            id = id.substr(id.find_first_of(':',0)+1,std::string::npos);
+
+            // Erase all ' '
+            size_t i=id.find_first_of(' ',0);
+            while (i!=std::string::npos)
+              {
+                id.erase(i,i+1);
+                i=id.find_first_of(' ',i);
+              }
+          }
+      }
+
+    log_end(Behavioural,FUNCTION);
+
+    return id;
   };
   

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

@@ -16 +16 @@
   
 #undef  FUNCTION
-#define FUNCTION "Vhdl::get_library_work"
-  std::string Vhdl::get_library_work (uint32_t depth)
+#define FUNCTION "Vhdl::get_library"
+  std::string Vhdl::get_library (uint32_t depth)
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    std::list<std::string>::iterator i   = _list_library_work.begin();
+    std::list<std::string>::iterator i   = _list_library.begin();
     std::string                 tab = morpheo::tab(depth);
     std::ostringstream          text;
 
-    if (i != _list_library_work.end())
-      text << tab                    << std::endl
-           << tab << "library work;" << std::endl
-           << get_list(_list_library_work,depth,";",true);
+    if (i != _list_library.end())
+      text << get_list(_list_library,depth,";",true);
 
     log_printf(FUNC,Behavioural,FUNCTION,"End");

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

@@ -17 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::get_list"
-  std::string Vhdl::get_list (std::list<std::string> liste                ,
-                              uint32_t     depth                ,
-                              std::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");

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

@@ -15 +15 @@
 namespace behavioural          {
   
-  std::string Vhdl::get_model(uint32_t depth            ,
-                         std::string   filename         ,
-                         std::string   entity_name      ,
-                         std::string   architecture_name)
+  std::string Vhdl::get_model(uint32_t depth                 ,
+                              std::string   filename         ,
+                              std::string   entity_name      )
   {
     log_printf(FUNC,Behavioural,"get_model","Begin");
@@ -25 +24 @@
     std::ostringstream text;
 
-    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;
+    std::string configuration_name = "configuration_"+entity_name;
+
+    text << tab << get_header       (depth,filename)    << std::endl
+         << tab << get_library      (depth)             << std::endl
+         << tab << get_entity       (depth,entity_name) << std::endl
+         << tab << get_architecture (depth,entity_name) << std::endl
+         << tab << get_configuration(depth,entity_name,configuration_name) << std::endl
+      ;
     
     log_printf(FUNC,Behavioural,"get_model","End");

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

@@ -27 +27 @@
     std::ostringstream text;
 
-    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;
+    text << tab << get_header          (depth,filename)     << std::endl
+         << tab << get_library_default (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_signal.cpp

@@ -20 +20 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    std::string _return = get_list (_list_signal, depth, ";", true);
+
+    test_architecture();
+
+    std::string _return = get_list (_architecture[_name_architecture]._list_signal, depth, ";", true);
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

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

@@ -20 +20 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    std::string _return = get_list (_list_type, depth, ";", true);
+
+    test_architecture();
+    std::string _return = get_list (_architecture[_name_architecture]._list_type, depth, ";", true);
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
 

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

@@ -23 +23 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    set_list(_list_alias, "alias "+ name1+"\t: "+type1+"\tis "+name2+"\t"+range2);
+    
+    test_architecture();
+    
+    set_list(_architecture[_name_architecture]._list_alias, "alias "+ name1+"\t: "+type1+"\tis "+name2+"\t"+range2);
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

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

@@ -30 +30 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    set_list(_list_body, morpheo::tab(depth)+text);
+
+    test_architecture();
+
+    set_list(_architecture[_name_architecture]._list_body, morpheo::tab(depth)+text);
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };
@@ -40 +43 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+
+    test_architecture();
     
     std::string tab=morpheo::tab(depth);
 
-    for (std::list<std::string>::iterator it=vhdl->_list_body.begin();
-         it!=vhdl->_list_body.end();
+    for (std::list<std::string>::iterator it=vhdl->_architecture[_name_architecture]._list_body.begin();
+         it!=vhdl->_architecture[_name_architecture]._list_body.end();
          ++it)
-      set_list(_list_body,tab+*it);
+      set_list(_architecture[_name_architecture]._list_body,tab+*it);
 
     log_printf(FUNC,Behavioural,FUNCTION,"End");

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

@@ -17 +17 @@
 #undef  FUNCTION
 #define FUNCTION "Vhdl::set_body_component"
-  void Vhdl::set_body_component (std::string         name_instance      ,
-                                 std::string         name_component     ,
-                                 std::list<std::string>   list_port_map      )
+  void Vhdl::set_body_component (std::string            name_instance    ,
+                                 std::string            name_component   ,
+                                 std::string            name_architecture,
+                                 std::string            name_package     ,
+                                 std::list<std::string> list_port_map )
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
 
-    set_body(name_instance + " : " + name_component);
+    name_architecture = test_architecture(name_architecture);
+
+    set_body(name_instance + " : entity " + name_package + "." + name_component + " (" + name_architecture + ")");
+//  set_body(name_instance + " : " + name_component);
     set_body("port map (");
-    set_list(_list_body, get_list(list_port_map, 1, ",", false));
+    set_list(_architecture[name_architecture]._list_body, get_list(list_port_map, 1, ",", false));
     set_body(");");
 

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

@@ -22 +22 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    set_list(_list_type, "constant "+ name+"\t: "+type+"\t:= "+init);
+
+    test_architecture();
+    
+    set_list(_architecture[_name_architecture]._list_type, "constant "+ name+"\t: "+type+"\t:= "+init);
+    
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

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

@@ -4 +4 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -17 +17 @@
   
 #undef  FUNCTION
-#define FUNCTION "Vhdl::get_library_ieee"
-  std::string Vhdl::get_library_ieee (uint32_t depth)
+#define FUNCTION "Vhdl::set_library_default"
+  void Vhdl::set_library_default (void)
   {
-    log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-
-    std::string        tab = morpheo::tab(depth);
-    std::ostringstream text;
-
-    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_begin(Behavioural,FUNCTION);
+    
+    set_library("ieee","numeric_bit"       ,"all");
+    set_library("ieee","numeric_std"       ,"all");
+    set_library("ieee","std_logic_1164"    ,"all");
+    set_library("ieee","std_logic_arith"   ,"all");
+    set_library("ieee","std_logic_misc"    ,"all");
+//  set_library("ieee","std_logic_signed"  ,"all");
+    set_library("ieee","std_logic_unsigned","all");
+//  set_library("ieee","std_logic_textio"  ,"all");
       
-    log_printf(FUNC,Behavioural,FUNCTION,"End");
-
-    return text.str();
+    log_end(Behavioural,FUNCTION);
   };
   

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

@@ -19 +19 @@
   void Vhdl::set_library_work (std::string      package_name)
   {
-    log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    set_list(_list_library_work, "use work."+ package_name + ".all");
-    log_printf(FUNC,Behavioural,FUNCTION,"End");
+    log_begin(Behavioural,FUNCTION);
+    
+    set_library("work",package_name,"all");
+
+    log_end(Behavioural,FUNCTION);
   };
   

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

@@ -34 +34 @@
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };
+
+// #undef  FUNCTION
+// #define FUNCTION "Vhdl::set_port_clock"
+//   void Vhdl::set_port_clock (std::string name)
+//   {
+//     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
+
+//     _port_clock = name;
+
+//     log_printf(FUNC,Behavioural,FUNCTION,"End");
+//   };
     
 }; // end namespace behavioural          

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

@@ -22 +22 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    set_list(_list_signal, "signal "+ name + "\t: " + type);
+
+    test_architecture();
+
+    set_list(_architecture[_name_architecture]._list_signal, "signal "+ name + "\t: " + type);
+    
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };
@@ -39 +43 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    _list_signal.push_back ("signal "+ name+"\t: "+type+"\t:= "+init);
+
+    test_architecture();
+    
+    _architecture[_name_architecture]._list_signal.push_back ("signal "+ name+"\t: "+type+"\t:= "+init);
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };

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

@@ -21 +21 @@
   {
     log_printf(FUNC,Behavioural,FUNCTION,"Begin");
-    set_list(_list_type, "type "+ name + "\tis " + type);
+
+    test_architecture();
+
+    set_list(_architecture[_name_architecture]._list_type, "type "+ name + "\tis " + type);
+
     log_printf(FUNC,Behavioural,FUNCTION,"End");
   };