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

Timestamp:

May 28, 2007, 10:38:18 PM (17 years ago)

Author:

rosiere

Message:

Class Position qui encapsule la génération des fichiers de positions

Location:

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

Files:

• Entity.cpp (added)
• Entity_find_interface.cpp (added)
• Entity_get_comment.cpp (added)
• Entity_get_interfaces.cpp (added)
• Entity_map.cpp (added)
• Entity_print.cpp (added)
• Entity_set_comment.cpp (added)
• Entity_set_interfaces.cpp (added)
• Entity_toXML.cpp (added)
• Interface.cpp (modified) (1 diff)
• Interface_get_signal.cpp (modified) (3 diffs)
• Interface_port_map.cpp (added)
• Interface_set_port.cpp (modified) (2 diffs)
• Interface_set_signal.cpp (modified) (2 diffs)
• Interface_toXML.cpp (modified) (4 diffs)
• Interfaces.cpp (modified) (1 diff)
• Interfaces_find_interface.cpp (added)
• Interfaces_get_interface.cpp (modified) (3 diffs)
• Interfaces_print.cpp (modified) (1 diff)
• Interfaces_set_interface.cpp (modified) (1 diff)
• Interfaces_set_port.cpp (modified) (2 diffs)
• Interfaces_toXML.cpp (modified) (2 diffs)
• Position.cpp (added)
• Position_find_entity.cpp (added)
• Position_find_interface.cpp (added)
• Position_generate_file.cpp (added)
• Position_get_component.cpp (added)
• Position_get_entity.cpp (added)
• Position_port_map.cpp (added)
• Position_print.cpp (added)
• Position_set_component.cpp (added)
• Position_set_entity.cpp (added)
• Position_toXML.cpp (added)
• Signal.cpp (modified) (1 diff)
• XML.cpp (modified) (1 diff)
• XML_filename_extension.cpp (added)
• XML_generate_file.cpp (modified) (1 diff)

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

@@ -18 +18 @@
     _localisation (localisation)
   {
+    _list_signal = new list<Signal>;
+#ifdef POSITION
+    _is_map      = false;
+#endif
+  };
+
+  Interface::Interface  (const Interface & interface):
+    _name         (interface._name        ),
+    _direction    (interface._direction   ),
+    _localisation (interface._localisation)
+  {
+    _comment     = interface._comment    ;
+    _list_signal = interface._list_signal;
+#ifdef POSITION
+    _is_map      = interface._is_map     ;
+#endif
   };
   
   Interface::~Interface ()
   {
+    delete _list_signal;
   };
   

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

@@ -19 +19 @@
 
 
-    list<Signal>::iterator i     = _list_signal.begin();
-    bool                   empty = _list_signal.empty();
+    list<Signal>::iterator i     = _list_signal->begin();
+    bool                   empty = _list_signal->empty();
 
     string                 tab   = string(depth,'\t');
@@ -28 +28 @@
       {
         // First
-        if (i != _list_signal.end())
+        if (i != _list_signal->end())
           {
             text << tab << *i;
@@ -34 +34 @@
           }
         
-        while (i != _list_signal.end())
+        while (i != _list_signal->end())
           {
             text << separator;

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

@@ -15 +15 @@
   void Interface::set_port (Vhdl * & vhdl)
   {
-    if (not _list_signal.empty())
+    if (not _list_signal->empty())
       {
-        list<Signal>::iterator i     = _list_signal.begin();
+        list<Signal>::iterator i     = _list_signal->begin();
         
-        while (i != _list_signal.end())
+        while (i != _list_signal->end())
           {
             presence_port_t p = (*i)._presence_port;
@@ -32 +32 @@
   void Interface::set_port (Vhdl_Testbench * & vhdl_testbench)
   {
-    if (not _list_signal.empty())
+    if (not _list_signal->empty())
       {
-        list<Signal>::iterator i     = _list_signal.begin();
+        list<Signal>::iterator i     = _list_signal->begin();
         
-        while (i != _list_signal.end())
+        while (i != _list_signal->end())
           {
             presence_port_t p = (*i)._presence_port;

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

@@ -12 +12 @@
 namespace behavioural          {
 
-  string Interface::set_signal (Signal signal)
-  {
-    return set_signal(signal._name     ,
-                      signal._direction,
-                      signal._size     );
-    
-  };
+//   string Interface::set_signal (Signal signal)
+//   {
+//     return set_signal(signal._name     ,
+//                    signal._direction,
+//                    signal._size     );
+//   };
 
-  string Interface::set_signal (string          name     ,
-                                direction_t     direction,
-                                uint32_t        size     ,
-                                presence_port_t presence_port)
+  Signal * Interface::set_signal (string          name     ,
+                                  direction_t     direction,
+                                  uint32_t        size     ,
+                                  presence_port_t presence_port)
   {
     string str_direction =  toString(direction);
@@ -39 +38 @@
       signame += "_"+str_signal;
     
-    _list_signal.push_back (Signal (signame      ,
-                                    direction    ,
-                                    size         ,
-                                    presence_port));
+    Signal * sig = new Signal (signame      ,
+                               direction    ,
+                               size         ,
+                               presence_port);
+    _list_signal->push_back (*sig);
 
-    return signame;
+    return sig;
   };
 

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

@@ -7 +7 @@
 
 #include "Behavioural/include/Interface.h"
+#include "Behavioural/include/Entity.h"
 
 namespace morpheo              {
@@ -15 +16 @@
     XML xml ("interface");
     
-    xml.balise_open_begin ("interface");
+    xml.balise_open_begin ("port");
     xml.  attribut        ("name"         ,_name                 );
     xml.  attribut        ("direction"   ,toString(_direction   ));
@@ -22 +23 @@
     xml.  text            (get_comment());
 
-    if (_list_signal.empty()== false)
+    if (_list_signal->empty()== false)
       {
-        list<Signal>::iterator i     = _list_signal.begin();
+        list<Signal>::iterator i     = _list_signal->begin();
 
-        while (i != _list_signal.end())
+        while (i != _list_signal->end())
           {
             xml.  insert_XML ((*i).toXML());
@@ -38 +39 @@
   };
 
+#ifdef POSITION
+  XML Interface::toXML_mapping (void)
+  {
+    if (_is_map != true)
+      throw (ErrorMorpheo ("Interface \""+_name+"\" is never mapped"));
+
+    XML xml ("interface");
+    
+    xml.singleton_begin ("port_map");
+    xml.  attribut      ("name"     ,_name               );
+    xml.  attribut      ("component",(static_cast<Entity    *>(_entity_map   ))->_name);
+    xml.  attribut      ("port"     ,(static_cast<Interface *>(_interface_map))->_name);
+    xml.singleton_end   ();
+     
+    return xml;
+  };
+#endif
 }; // end namespace behavioural          
 }; // end namespace morpheo              

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

@@ -13 +13 @@
   Interfaces::Interfaces  (void)
   {
+    _list_interface = new list<Interface>;
+  };
+
+  Interfaces::Interfaces  (const Interfaces & interfaces)
+  {
+    _list_interface = interfaces._list_interface;
   };
   
   Interfaces::~Interfaces ()
   {
+    delete _list_interface;
   };
   

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

@@ -15 +15 @@
   {
     uint32_t               depth          = 0;
-    string                 separator      = ",\n";
+    string                 separator      = "\n";
     bool                   last_separator = false;
 
-
-    list<Interface>::iterator i  = _list_interface.begin();
-    bool                   empty = _list_interface.empty();
+    list<Interface>::iterator i  = _list_interface->begin();
+    bool                   empty = _list_interface->empty();
 
     string                 tab   = string(depth,'\t');
@@ -28 +27 @@
       {
         // First
-        if (i != _list_interface.end())
+        if (i != _list_interface->end())
           {
             text << tab << *i;
@@ -34 +33 @@
           }
         
-        while (i != _list_interface.end())
+        while (i != _list_interface->end())
           {
             text << separator;

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

@@ -12 +12 @@
 namespace behavioural          {
 
-  ostream& operator<< (ostream& output_stream,
+  ostream& operator<< (ostream& output_stream ,
                        morpheo::behavioural::Interfaces & x)
   {

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

@@ -11 +11 @@
 namespace behavioural          {
 
-  void Interfaces::set_interface (Interface interface)
+  Interface * Interfaces::set_interface (string         name        ,
+                                         direction_t    direction   ,
+                                         localisation_t localisation)
   {
-    _list_interface.push_back (interface);
+    Interface * interface = new Interface (name, direction, localisation);
+    
+    _list_interface->push_back (*interface);
+
+    return interface;
+  };
+
+  Interface * Interfaces::set_interface (string         name        ,
+                                         direction_t    direction   ,
+                                         localisation_t localisation,
+                                         string         comment     )
+  {
+    Interface * interface = set_interface(name, direction, localisation);
+    
+    interface->set_comment (comment);
+
+    return interface;
   };
 

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

@@ -15 +15 @@
   void Interfaces::set_port (Vhdl * & vhdl)
   {
-    if (not _list_interface.empty())
+    if (not _list_interface->empty())
       {
-        list<Interface>::iterator i     = _list_interface.begin();
+        list<Interface>::iterator i     = _list_interface->begin();
         
-        while (i != _list_interface.end())
+        while (i != _list_interface->end())
           {
             (*i).set_port (vhdl);
@@ -29 +29 @@
   void Interfaces::set_port (Vhdl_Testbench * & vhdl_testbench)
   {
-    if (not _list_interface.empty())
+    if (not _list_interface->empty())
       {
-        list<Interface>::iterator i     = _list_interface.begin();
+        list<Interface>::iterator i     = _list_interface->begin();
         
-        while (i != _list_interface.end())
+        while (i != _list_interface->end())
           {
             (*i).set_port (vhdl_testbench);

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

@@ -15 +15 @@
     XML xml ("interfaces");
     
-//     xml.balise_open ("interfaces");
+    if (_list_interface->empty()== false)
+      {
+        list<Interface>::iterator i     = _list_interface->begin();
 
-    if (_list_interface.empty()== false)
-      {
-        list<Interface>::iterator i     = _list_interface.begin();
-
-        while (i != _list_interface.end())
+        while (i != _list_interface->end())
           {
             xml.  insert_XML ((*i).toXML());
@@ -27 +25 @@
           }
       }
-
-//     xml.balise_close      ();
      
     return xml;
   };
 
+#ifdef POSITION
+  XML Interfaces::toXML_mapping (void)
+  {
+    XML xml ("interfaces");
+    
+    if (_list_interface->empty()== false)
+      {
+        list<Interface>::iterator i     = _list_interface->begin();
+
+        while (i != _list_interface->end())
+          {
+            xml.  insert_XML ((*i).toXML_mapping());
+            ++i;
+          }
+      }
+     
+    return xml;
+  };
+#endif
 }; // end namespace behavioural          
 }; // end namespace morpheo              

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

@@ -21 +21 @@
   {
   };
-  
+
+  Signal::Signal  (const Signal & signal):
+    _name          (signal._name         ),
+    _direction     (signal._direction    ),
+    _size          (signal._size         ),
+    _presence_port (signal._presence_port)
+  {
+  };
+
   Signal::~Signal ()
   {
   };
-  
 
 }; // end namespace behavioural          

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

@@ -14 +14 @@
     _name (name)
   {
+    _filename_extension="xml";
   };
 

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

@@ -18 +18 @@
 
     string name     = _name;
-    string filename =  name + ".xml";
+    string filename =  name + "." + _filename_extension;
 
     cout << "Generate file \""<< filename << "\"" << endl;