Changeset 113 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src

Timestamp:

Apr 14, 2009, 8:39:12 PM (15 years ago)

Author:

rosiere

Message:

1) Add modelsim simulation systemC
2) Modelsim cosimulation systemC / VHDL is not finish !!!! (cf execute_queue and write_unit)
3) Add multi architecture
5) Add template for comparator, multiplier and divider
6) Change Message
Warning) Various test macro have change, many selftest can't compile

Location:

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

Files:

• Parameters.cpp (modified) (1 diff)
• Queue.cpp (modified) (8 diffs)
• Queue_allocation.cpp (modified) (3 diffs)
• Queue_deallocation.cpp (modified) (2 diffs)
• Queue_statistics_declaration.cpp (modified) (1 diff)

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

@@ -21 +21 @@
                           bool     have_port_ptr_write,
                           bool     have_port_ptr_read ):
+    behavioural::Parameters("Queue"),
     _size_queue          (size_queue),
     _size_data           (size_data ),

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

@@ -33 +33 @@
     ,_usage            (usage)
   {
-    log_printf(FUNC,Queue,FUNCTION,"Begin");
+    log_begin(Queue,FUNCTION);
+    
+// #if DEBUG_Core == true
+//     log_printf(INFO,Core,FUNCTION,_("<%s> Parameters"),_name.c_str());
 
-#if DEBUG_Core == true
-    log_printf(INFO,Core,FUNCTION,_("<%s> Parameters"),_name.c_str());
+//     std::cout << *param << std::endl;
+// #endif    
 
-    std::cout << *param << std::endl;
-#endif    
-
-    log_printf(INFO,Queue,FUNCTION,"Allocation");
+    log_printf(INFO,Queue,FUNCTION,_("<%s> Allocation"),_name.c_str());
     allocation ();
 
@@ -47 +47 @@
     if (usage_is_set(_usage,USE_STATISTICS))
       { 
-        log_printf(INFO,Queue,FUNCTION,"Allocation of statistics");
+        log_printf(INFO,Queue,FUNCTION,_("<%s> Allocation of statistics"),_name.c_str());
         
         statistics_declaration(param_statistics);
@@ -57 +57 @@
       {
         // generate the vhdl
-        log_printf(INFO,Queue,FUNCTION,"Generate the vhdl");
+        log_printf(INFO,Queue,FUNCTION,_("<%s> Generate the vhdl"),_name.c_str());
         
         vhdl();
@@ -66 +66 @@
     if (usage_is_set(_usage,USE_SYSTEMC))
       {
-        log_printf(INFO,Queue,FUNCTION,"Method - transition");
+        log_printf(INFO,Queue,FUNCTION,_("<%s> Method - transition"),_name.c_str());
         
         SC_METHOD (transition);
@@ -76 +76 @@
 # endif    
         
-        log_printf(INFO,Queue,FUNCTION,"Method - genMoore");
+        log_printf(INFO,Queue,FUNCTION,_("<%s> Method - genMoore"),_name.c_str());
         
         SC_METHOD (genMoore);
@@ -88 +88 @@
 #endif
       }
-    log_printf(FUNC,Queue,FUNCTION,"End");
+    log_end(Queue,FUNCTION);
   };
   
@@ -95 +95 @@
   Queue::~Queue (void)
   {
-    log_printf(FUNC,Queue,FUNCTION,"Begin");
+    log_begin(Queue,FUNCTION);
 
 #ifdef STATISTICS
     if (usage_is_set(_usage,USE_STATISTICS))
       {
-        log_printf(INFO,Queue,FUNCTION,"Generate Statistics file");
+        log_printf(INFO,Queue,FUNCTION,_("<%s> Generate Statistics file"),_name.c_str());
         
         delete _stat;
@@ -106 +106 @@
 #endif
 
-    log_printf(INFO,Queue,FUNCTION,"Deallocation");
+    log_printf(INFO,Queue,FUNCTION,_("<%s> Deallocation"),_name.c_str());
     deallocation ();
 
-    log_printf(FUNC,Queue,FUNCTION,"End");
+    log_end(Queue,FUNCTION);
   };
 

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

@@ -9 +9 @@
 #include "Behavioural/include/Allocation.h"
 
-namespace morpheo                    {
+namespace morpheo {
 namespace behavioural {
 namespace generic {
 namespace queue {
-
-
 
 #undef  FUNCTION
@@ -25 +23 @@
 
     Entity * entity = _component->set_entity (_name       
-                                              ,"Queue"
+                                              ,_param->_type
 #ifdef POSITION
                                               ,COMBINATORY 
@@ -111 +109 @@
 }; // end namespace queue
 }; // end namespace generic
-
 }; // end namespace behavioural
 }; // end namespace morpheo              

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

@@ -21 +21 @@
     log_printf(FUNC,Queue,FUNCTION,"Begin");
 
-    if (usage_is_set(_usage,USE_SYSTEMC))
+//     if (usage_is_set(_usage,USE_SYSTEMC))
       { 
-        delete    in_CLOCK ;
-        delete    in_NRESET;
+        DELETE0_SIGNAL( in_CLOCK ,1);
+        DELETE0_SIGNAL( in_NRESET,1);
 
         DELETE0_SIGNAL( in_INSERT_VAL                        ,1);
@@ -41 +41 @@
         if (_param->_have_port_ptr_read )
         DELETE0_SIGNAL(out_PTR_READ    ,_param->_size_ptr);
+      }
         
-        // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
+      if (usage_is_set(_usage,USE_SYSTEMC))
+      { 
+        // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
         delete _queue_control;
         delete _queue_data;

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

@@ -21 +21 @@
 
     _stat = new Stat (static_cast<std::string>(_name),
-                      "Queue",
+                      _param->_type,
                       param_statistics);