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

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/Sort

Files:

• SelfTest/Makefile (modified) (1 diff)
• SelfTest/src/test.cpp (modified) (3 diffs)
• include/Parameters.h (modified) (1 diff)
• src/Parameters.cpp (modified) (1 diff)
• src/Sort.cpp (modified) (5 diffs)
• src/Sort_allocation.cpp (modified) (2 diffs)
• src/Sort_deallocation.cpp (modified) (1 diff)
• src/Sort_end_cycle.cpp (modified) (2 diffs)

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

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

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

@@ -31 +31 @@
 #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          );
+
   Sort * _Sort = new Sort (name.c_str(),
 #ifdef STATISTICS
@@ -36 +46 @@
 #endif
                            _param,
-                           USE_ALL);
+                           _usage);
   
 #ifdef SYSTEMC
@@ -154 +164 @@
               tab [ptr]._val = false;
 
-              LABEL("OUTPUT [%d] %d - %d",i, out_OUTPUT_VAL [i]->read(), out_OUTPUT_DATA [i]->read(), out_OUTPUT_INDEX [i]->read());
+              LABEL("OUTPUT [%d] %d %d - %d",i, out_OUTPUT_VAL [i]->read(), out_OUTPUT_DATA [i]->read(), out_OUTPUT_INDEX [i]->read());
 
               TEST(Tcontrol_t,out_OUTPUT_VAL   [i]->read(),find);

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

@@ -42 +42 @@
   public : ~Parameters () ;
 
+  public :        void            copy       (void);
+
   public :        Parameters_test msg_error  (void);
 

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

@@ -55 +55 @@
   };
 
+#undef  FUNCTION
+#define FUNCTION "Sort::copy"
+  void Parameters::copy (void) 
+  {
+    log_printf(FUNC,Sort,FUNCTION,"Begin");
+    log_printf(FUNC,Sort,FUNCTION,"End");
+  };
+
 }; // end namespace sort
 }; // end namespace generic

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

@@ -35 +35 @@
     log_printf(FUNC,Sort,FUNCTION,"Begin");
 
+#if DEBUG_Sort == true
+    log_printf(INFO,Sort,FUNCTION,_("<%s> Parameters"),_name.c_str());
+
+    std::cout << *param << std::endl;
+#endif    
+
     log_printf(INFO,Sort,FUNCTION,"Allocation");
 
@@ -44 +50 @@
 
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       { 
         log_printf(INFO,Sort,FUNCTION,"Allocation of statistics");
@@ -53 +59 @@
 
 #ifdef VHDL
-    if (_usage & USE_VHDL)
+    if (usage_is_set(_usage,USE_VHDL))
       {
         // generate the vhdl
@@ -63 +69 @@
 
 #ifdef SYSTEMC
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         log_printf(INFO,Sort,FUNCTION,"Method - transition");
@@ -117 +123 @@
 
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       {
         statistics_deallocation();

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort_allocation.cpp

@@ -13 +13 @@
 namespace generic {
 namespace sort {
-
-
 
 #undef  FUNCTION
@@ -75 +73 @@
 
 #ifdef POSITION
-    _component->generate_file();
+    if (usage_is_set(_usage,USE_POSTION))
+      _component->generate_file();
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort_deallocation.cpp

@@ -20 +20 @@
     log_printf(FUNC,Sort,FUNCTION,"Begin");
 
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         delete     in_CLOCK ;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Sort/src/Sort_end_cycle.cpp

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