Changeset 42 for trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component

Timestamp:

Jul 5, 2007, 5:50:19 PM (17 years ago)

Author:

rosiere

Message:

Modification des classes d'encapsulation des interfaces :

• gère les signaux à écrire dans le vhdl
• les traces pour le testbench
• la génération des vhdl structurelles

-> test sur la Pattern History Table

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component

Files:

• include/New_Component.h (modified) (3 diffs)
• src/New_Component_allocation.cpp (modified) (2 diffs)
• src/New_Component_deallocation.cpp (modified) (1 diff)
• src/New_Component_vhdl.cpp (modified) (1 diff)
• src/New_Component_vhdl_port.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/include/New_Component.h

@@ -22 +22 @@
 #include "Behavioural/@DIRECTORY/include/Statistics.h"
 #endif
-#ifdef POSITION
-#include "Behavioural/include/Position.h"
-#else
-#include "Behavioural/include/Interfaces.h"
-#endif
+#include "Behavioural/include/Component.h"
 #ifdef VHDL
 #include "Behavioural/include/Vhdl.h"
@@ -55 +51 @@
 #endif
 
-#ifdef POSITION
-  private   : Position                       * _position;
-#endif
-
+  public    : Component                      * _component;
   private   : Interfaces                     * _interfaces;
 
@@ -107 +100 @@
 #if VHDL                                       
   public  : void     vhdl                      (void);
-  private : void     vhdl_port                 (Vhdl & vhdl);
   private : void     vhdl_declaration          (Vhdl & vhdl);
   private : void     vhdl_body                 (Vhdl & vhdl);

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/New_Component_allocation.cpp

@@ -19 +19 @@
     log_printf(FUNC,@COMPONENT,"allocation","Begin");
 
+    _component   = new Component ();
+
+    Entity * entity = _component->set_entity (_name       
 #ifdef POSITION
-    _position   = new Position ();
-
-    Entity * entity = _position->set_entity (_name       ,
-                                             "@COMPONENT",
-                                             COMBINATORY );
+                                              ,"@COMPONENT"
+                                              ,COMBINATORY 
+#endif
+                                              );
 
     _interfaces = entity->set_interfaces();
-#else
-    _interfaces = new Interfaces();
-#endif
 
     // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Interface * interface_ = _interfaces->set_interface("", IN  ,WEST, "Generalist interface");
+      Interface * interface = _interfaces->set_interface(""
+#ifdef POSITION
+                                                         ,IN
+                                                         ,SOUTH,
+                                                         "Generalist interface"
+#endif
+                                                         );
 
-     in_CLOCK        = interface_->set_signal_clk              ("clock" ,1, PORT_VHDL_YES_TESTBENCH_NO);
-     in_NRESET       = interface_->set_signal_in  <Tcontrol_t> ("nreset",1);
+     in_CLOCK        = interface->set_signal_clk              ("clock" ,1, PORT_VHDL_YES_TESTBENCH_NO);
+     in_NRESET       = interface->set_signal_in  <Tcontrol_t> ("nreset",1);
 
 
@@ -42 +47 @@
 
 #ifdef POSITION
-    _position->generate_file();
+    _component->generate_file();
 #endif
 
-    log_printf(FUNC,@COMPONENT,"allocation","End");
+    Log_printf(FUNC,@COMPONENT,"allocation","End");
   };
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/New_Component_deallocation.cpp

@@ -24 +24 @@
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
-#ifdef POSITION
-    delete _position;
-#else
-    delete _interfaces;
-#endif
+    delete _component;
 
     log_printf(FUNC,@COMPONENT,"deallocation","End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/New_Component_vhdl.cpp

@@ -20 +20 @@
     Vhdl vhdl (_name);
 
-    vhdl.set_library_work (_name + "_Pack");
+    _interfaces->set_port(vhdl);
+    _component->vhdl_instance(vhdl);
 
-    vhdl_port        (vhdl);
     vhdl_declaration (vhdl);
     vhdl_body        (vhdl);

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/New_Component_vhdl_port.cpp

@@ -13 +13 @@
 @NAMESPACE_BEGIN
 
-  void @COMPONENT::vhdl_port (Vhdl & vhdl)
-  {
-    log_printf(FUNC,@COMPONENT,"vhdl_port","Begin");
+//   void @COMPONENT::vhdl_port (Vhdl & vhdl)
+//   {
+//     log_printf(FUNC,@COMPONENT,"vhdl_port","Begin");
 
-    _interfaces->set_port(vhdl);
+//     _interfaces->set_port(vhdl);
 
-    log_printf(FUNC,@COMPONENT,"vhdl_port","End");
-  };
+//     Log_printf(FUNC,@COMPONENT,"vhdl_port","End");
+//   };
 
 @NAMESPACE_END