Changeset 42 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select

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/Generic/Select/Select_Priority_Fixed

Files:

• include/Select_Priority_Fixed.h (modified) (2 diffs)
• src/Select_Priority_Fixed.cpp (modified) (2 diffs)
• src/Select_Priority_Fixed_allocation.cpp (modified) (3 diffs)
• src/Select_Priority_Fixed_deallocation.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h

@@ -22 +22 @@
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/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"
@@ -58 +54 @@
 #endif
 
-#ifdef POSITION
-  private   : Position                       * _position;
-#endif
-
+  private   : Component                      * _component;
   private   : Interfaces                     * _interfaces;
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed.cpp

@@ -71 +71 @@
       sensitive << *(in_VAL [i]);
 
-#ifdef SYSTEMCASS_SPECIFIC
+#  ifdef SYSTEMCASS_SPECIFIC
     // List dependency information
 
@@ -85 +85 @@
       }
     
-#endif    
+#  endif    
 #endif
     log_printf(FUNC,Select_Priority_Fixed,"Select_Priority_Fixed","End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_allocation.cpp

@@ -19 +19 @@
     log_printf(FUNC,Select_Priority_Fixed,"allocation","Begin");
 
+    _component   = new Component ();
+
+    Entity * entity = _component->set_entity (_name                 
 #ifdef POSITION
-    _position   = new Position ();
-
-    Entity * entity = _position->set_entity (_name                  ,
-                                             "Select_Priority_Fixed",
-                                             COMBINATORY            );
+                                             ,"Select_Priority_Fixed"
+                                             ,COMBINATORY            
+#endif
+                                              );
     
     _interfaces = entity->set_interfaces();
-#else
-    _interfaces = new Interfaces();
-#endif
 
     // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Interface_fifo * interface_ = _interfaces->set_interface("", IN  ,WEST, "Generalist interface");
+    Interface_fifo * interface = _interfaces->set_interface(""
+#ifdef POSITION
+                                                            ,IN  
+                                                            ,WEST
+                                                            ,"Generalist interface"
+#endif
+                                                            );
 
-     in_CLOCK        = interface_->set_signal_clk              ("clock" ,1, CLOCK_VHDL_NO);
-     in_NRESET       = interface_->set_signal_in  <Tcontrol_t> ("nreset",1);
+     in_CLOCK        = interface->set_signal_clk              ("clock" ,1, CLOCK_VHDL_NO);
+     in_NRESET       = interface->set_signal_in  <Tcontrol_t> ("nreset",1);
      in_VAL          = new SC_IN (Tcontrol_t)           * [_param._nb_entity];
     if (_param._encoding_one_hot)
@@ -43 +48 @@
     for (uint32_t i=0; i<_param._nb_entity; i++)
       {
-         in_VAL [i]    = interface_->set_signal_in  <Tcontrol_t> ("val_"+toString(i),1);
+         in_VAL [i]    = interface->set_signal_in  <Tcontrol_t> ("val_"+toString(i),1);
         if (_param._encoding_one_hot)
-        out_ACK [i]    = interface_->set_signal_out <Tcontrol_t> ("ack_"+toString(i),1);
+        out_ACK [i]    = interface->set_signal_out <Tcontrol_t> ("ack_"+toString(i),1);
       }
 
     if (_param._encoding_compact)
       {
-        out_ENTITY     = interface_->set_signal_out <Tentity_t > ("entity"    , _param._size_entity);
-        out_ENTITY_ACK = interface_->set_signal_out <Tcontrol_t> ("entity_ack", 1);
+        out_ENTITY     = interface->set_signal_out <Tentity_t > ("entity"    , _param._size_entity);
+        out_ENTITY_ACK = interface->set_signal_out <Tcontrol_t> ("entity_ack", 1);
       }
 
@@ -57 +62 @@
 
 #ifdef POSITION
-    _position->generate_file();
+    _component->generate_file();
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_deallocation.cpp

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