Changeset 42 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src

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/RegisterFile/RegisterFile_Monolithic/src

Files:

• RegisterFile_Monolithic_allocation.cpp (modified) (4 diffs)
• RegisterFile_Monolithic_deallocation.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_allocation.cpp

@@ -17 +17 @@
   void RegisterFile_Monolithic::allocation (void)
   {
+    _component   = new Component ();
+
+    Entity * entity = _component->set_entity (_name                   
+                                             ,"RegisterFile_Monolithic"
 #ifdef POSITION
-    _position   = new Position ();
-
-    Entity * entity = _position->set_entity (_name                    ,
-                                             "RegisterFile_Monolithic",
-                                             REGISTER                 );
+                                             ,REGISTER                 
+#endif
+                                              );
     
     _interfaces = entity->set_interfaces();
-#else
-    _interfaces = new Interfaces();
-#endif
 
     // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    Interface * interface_ = _interfaces->set_interface("", IN  ,SOUTH, "Generalist interface");
-
-     in_CLOCK              = interface_->set_signal_clk              ("clock" ,1);
-     in_NRESET             = interface_->set_signal_in  <Tcontrol_t> ("nreset",1);
-
+    {
+      Interface * interface = _interfaces->set_interface(""
+#ifdef POSITION
+                                                         , IN
+                                                         ,SOUTH
+                                                         , "Generalist interface"
+#endif
+                                                         );
+      
+      in_CLOCK              = interface->set_signal_clk              ("clock" ,1);
+      in_NRESET             = interface->set_signal_in  <Tcontrol_t> ("nreset",1, RESET_VHDL_YES);
+    }
     // ~~~~~[ Interface : "read" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -44 +50 @@
     for (uint32_t i=0; i<_param._nb_port_read; i++)
       { 
-        Interface_fifo * interface_read = _interfaces->set_interface("read_"+toString(i), IN  ,WEST, "Interface Read");
+        Interface_fifo * interface = _interfaces->set_interface("read_"+toString(i)
+#ifdef POSITION
+                                                                , IN  
+                                                                ,WEST
+                                                                , "Interface Read"
+#endif
+                                                                );
 
-         in_READ_VAL     [i]  = interface_read->set_signal_valack_in        ("val"    , VAL);
-        out_READ_ACK     [i]  = interface_read->set_signal_valack_out       ("ack"    , ACK);
-         in_READ_ADDRESS [i]  = interface_read->set_signal_in  <Taddress_t> ("address", static_cast<uint32_t>(log2(_param._nb_word)));
-        out_READ_DATA    [i]  = interface_read->set_signal_out <Tdata_t   > ("data"   , _param._size_word);
+         in_READ_VAL     [i]  = interface->set_signal_valack_in        ("val"    , VAL);
+        out_READ_ACK     [i]  = interface->set_signal_valack_out       ("ack"    , ACK);
+         in_READ_ADDRESS [i]  = interface->set_signal_in  <Taddress_t> ("address", static_cast<uint32_t>(log2(_param._nb_word)));
+        out_READ_DATA    [i]  = interface->set_signal_out <Tdata_t   > ("data"   , _param._size_word);
       }
 
@@ -61 +73 @@
     for (uint32_t i=0; i<_param._nb_port_write; i++)
       {
-        Interface_fifo * interface_write = _interfaces->set_interface("write_"+toString(i), IN  ,EAST, "Interface Write");
+        Interface_fifo * interface = _interfaces->set_interface("write_"+toString(i)
+#ifdef POSITION
+                                                                , IN  
+                                                                ,EAST
+                                                                , "Interface Write"
+#endif
+                                                                );
 
-         in_WRITE_VAL     [i]  = interface_write->set_signal_valack_in        ("val"    , VAL);
-        out_WRITE_ACK     [i]  = interface_write->set_signal_valack_out       ("ack"    , ACK);
-         in_WRITE_ADDRESS [i]  = interface_write->set_signal_in  <Taddress_t> ("address", static_cast<uint32_t>(log2(_param._nb_word)));
-         in_WRITE_DATA    [i]  = interface_write->set_signal_in  <Tdata_t   > ("data"   , _param._size_word);
+         in_WRITE_VAL     [i]  = interface->set_signal_valack_in        ("val"    , VAL);
+        out_WRITE_ACK     [i]  = interface->set_signal_valack_out       ("ack"    , ACK);
+         in_WRITE_ADDRESS [i]  = interface->set_signal_in  <Taddress_t> ("address", static_cast<uint32_t>(log2(_param._nb_word)));
+         in_WRITE_DATA    [i]  = interface->set_signal_in  <Tdata_t   > ("data"   , _param._size_word);
       }
 
@@ -79 +97 @@
 
 #ifdef POSITION
-    _position->generate_file();
+    _component->generate_file();
 #endif
   };

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_deallocation.cpp

@@ -17 +17 @@
   void RegisterFile_Monolithic::deallocation (void)
   {
+    delete _component;
+
     delete    in_CLOCK;
     delete    in_NRESET;
@@ -33 +35 @@
     // ----- Register
     delete [] reg_DATA;
-
-#ifdef POSITION
-    delete _position;
-#else
-    delete _interfaces;
-#endif
   };