Changeset 88 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue

Timestamp:

Dec 10, 2008, 7:31:39 PM (16 years ago)

Author:

rosiere

Message:

Almost complete design
with Test and test platform

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue

Files:

• SelfTest/Makefile (modified) (1 diff)
• SelfTest/src/test.cpp (modified) (2 diffs)
• include/Parameters.h (modified) (1 diff)
• src/Parameters.cpp (modified) (1 diff)
• src/Queue.cpp (modified) (4 diffs)
• src/Queue_allocation.cpp (modified) (1 diff)
• src/Queue_deallocation.cpp (modified) (2 diffs)
• src/Queue_end_cycle.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/Makefile

@@ -24 +24 @@
 library_clean                   : Queue_library_clean
 
+local_clean                     :
+
 include                         ../Makefile.deps
 include                         $(DIR_MORPHEO)/Behavioural/Makefile.flags

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/SelfTest/src/test.cpp

@@ -22 +22 @@
 #endif
 
+  Tusage_t _usage = USE_ALL;
+
+//   _usage = usage_unset(_usage,USE_SYSTEMC              );
+//   _usage = usage_unset(_usage,USE_VHDL                 );
+//   _usage = usage_unset(_usage,USE_VHDL_TESTBENCH       );
+//   _usage = usage_unset(_usage,USE_VHDL_TESTBENCH_ASSERT);
+//   _usage = usage_unset(_usage,USE_POSITION             );
+//   _usage = usage_unset(_usage,USE_STATISTICS           );
+//   _usage = usage_unset(_usage,USE_INFORMATION          );
+
   Queue * _Queue = new Queue 
     (name.c_str(),
@@ -28 +38 @@
 #endif
      _param,
-     USE_ALL);
+     _usage);
   
 #ifdef SYSTEMC

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/include/Parameters.h

@@ -29 +29 @@
   public : Parameters  (uint32_t size_queue,
                         uint32_t size_data );
-  public : Parameters  (Parameters & param) ;
+//   public : Parameters  (Parameters & param) ;
   public : ~Parameters () ;
+
+  public :        void            copy       (void);
 
   public :        Parameters_test msg_error  (void);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Parameters.cpp

@@ -26 +26 @@
   };
   
+// #undef  FUNCTION
+// #define FUNCTION "Queue::Parameters (copy)"
+//   Parameters::Parameters (Parameters & param):
+//     _size_queue (param._size_queue),
+//     _size_data  (param._size_data )
+//   {
+//     log_printf(FUNC,Queue,FUNCTION,"Begin");
+//     test();
+//     log_printf(FUNC,Queue,FUNCTION,"End");
+//   };
+
 #undef  FUNCTION
-#define FUNCTION "Queue::Parameters (copy)"
-  Parameters::Parameters (Parameters & param):
-    _size_queue (param._size_queue),
-    _size_data  (param._size_data )
+#define FUNCTION "Queue::~Parameters"
+  Parameters::~Parameters () 
   {
     log_printf(FUNC,Queue,FUNCTION,"Begin");
-    test();
     log_printf(FUNC,Queue,FUNCTION,"End");
   };
 
 #undef  FUNCTION
-#define FUNCTION "Queue::~Parameters"
-  Parameters::~Parameters () 
+#define FUNCTION "Queue::copy"
+  void Parameters::copy (void) 
   {
     log_printf(FUNC,Queue,FUNCTION,"Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue.cpp

@@ -35 +35 @@
     log_printf(FUNC,Queue,FUNCTION,"Begin");
 
+#if DEBUG_Core == true
+    log_printf(INFO,Core,FUNCTION,_("<%s> Parameters"),_name.c_str());
+
+    std::cout << *param << std::endl;
+#endif    
+
     log_printf(INFO,Queue,FUNCTION,"Allocation");
     allocation ();
 
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       { 
         log_printf(INFO,Queue,FUNCTION,"Allocation of statistics");
@@ -48 +54 @@
 
 #ifdef VHDL
-    if (_usage & USE_VHDL)
+    if (usage_is_set(_usage,USE_VHDL))
       {
         // generate the vhdl
@@ -58 +64 @@
 
 #ifdef SYSTEMC
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         log_printf(INFO,Queue,FUNCTION,"Method - transition");
@@ -92 +98 @@
 
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       {
         log_printf(INFO,Queue,FUNCTION,"Generate Statistics file");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_allocation.cpp

@@ -75 +75 @@
     }
      
+    if (usage_is_set(_usage,USE_SYSTEMC))
+      {
     // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
     _queue_control = new morpheo::behavioural::generic::queue_control::Queue_Control::Queue_Control(_param->_size_queue);
     _queue_data    = new Tdata_t [_param->_size_queue];
+      }
 
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
 #ifdef POSITION
-    _component->generate_file();
+    if (usage_is_set(_usage,USE_POSITION))
+      _component->generate_file();
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_deallocation.cpp

@@ -20 +20 @@
     log_printf(FUNC,Queue,FUNCTION,"Begin");
 
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       { 
         delete    in_CLOCK ;
@@ -33 +33 @@
         delete   out_RETIRE_DATA;
         
+        // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
+        delete _queue_control;
+        delete _queue_data;
       }
-    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-    delete _queue_control;
-    delete _queue_data;
+
     delete _component;
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_end_cycle.cpp

@@ -21 +21 @@
 
 #ifdef STATISTICS
-    _stat->end_cycle();
+    if (usage_is_set(_usage,USE_STATISTICS))
+      _stat->end_cycle();
 #endif    
 
@@ -27 +28 @@
     // Evaluation before read the ouput signal
 //  sc_start(0);
-    _interfaces->testbench();
+    if (usage_is_set(_usage,USE_VHDL_TESTBENCH))
+      _interfaces->testbench();
 #endif