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

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

Files:

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

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/SelfTest/configuration.cfg

@@ -1 +1 @@
 Select_Priority_Fixed
-16      16      *2      # nb_entity
-0       0       +1      # encoding_one_hot
+2       16      *2      # nb_entity
+0       1       +1      # encoding_one_hot
 1       1       +1      # encoding_compact

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

@@ -19 +19 @@
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h"
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Types.h"
+#ifdef POSITION
+#include "Behavioural/include/Position.h"
+#else
 #include "Behavioural/include/Interfaces.h"
+#endif
 
 #ifdef STATISTICS
@@ -62 +66 @@
 #endif
 
-  private   : Interfaces                     * interfaces;
+#ifdef POSITION
+  private   : Position                       * _position;
+#endif
+
+  private   : Interfaces                     * _interfaces;
 
 #ifdef SYSTEMC

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

@@ -9 +9 @@
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
 
-namespace morpheo                    {
+namespace morpheo{
 namespace behavioural {
 namespace generic {
@@ -21 +21 @@
     log_printf(FUNC,Select_Priority_Fixed,"allocation","Begin");
 
-    interfaces = new Interfaces;
+#ifdef POSITION
+    _position   = new Position ();
+
+    Entity * entity = _position->set_entity (_name                  ,
+                                             "Select_Priority_Fixed",
+                                             COMBINATORY            );
+
+    _interfaces = entity->set_interfaces();
+#else
+    _interfaces = new Interfaces();
+#endif
 
     // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    Interface interface_ ("", IN, WEST);
-    
-    in_CLOCK        = interface_.set_signal_clk              ("clock" ,1, PORT_VHDL_YES_TESTBENCH_NO);
-    in_NRESET       = interface_.set_signal_in  <Tcontrol_t> ("nreset",1);
 
+    Interface * interface_ = _interfaces->set_interface(""  ,
+                                                        IN  ,
+                                                        WEST,
+                                                        "...");
+
+     in_CLOCK        = interface_->set_signal_clk              ("clock" ,1, PORT_VHDL_YES_TESTBENCH_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)
@@ -35 +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);
       }
 
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
+
+#ifdef POSITION
+    _position->generate_file();
+#endif
 
     log_printf(FUNC,Select_Priority_Fixed,"allocation","End");

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

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

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

@@ -20 +20 @@
 
 #ifdef VHDL
-    interfaces->set_port(vhdl);
+    _interfaces->set_port(vhdl);
 #endif
 #ifdef VHDL_TESTBENCH
-    interfaces->set_port(_vhdl_testbench);                      
+    _interfaces->set_port(_vhdl_testbench);                     
    _vhdl_testbench->set_clock    ("in_CLOCK",true);
 #endif