Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src

Timestamp:

Jan 31, 2008, 6:46:41 PM (16 years ago)

Author:

rosiere

Message:

Update all component (except front_end) to :

• new statistics model
• no namespace std

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src

Files:

• Parameters_msg_error.cpp (modified) (2 diffs)
• Parameters_print.cpp (modified) (3 diffs)
• Read_queue.cpp (modified) (2 diffs)
• Read_queue_allocation.cpp (modified) (2 diffs)
• Read_queue_end_cycle.cpp (moved) (moved from trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_vhdl_testbench_transition.cpp) (2 diffs)
• Read_queue_statistics_declaration.cpp (moved) (moved from trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_statistics.cpp) (1 diff)
• Read_queue_transition.cpp (modified) (1 diff)
• Read_queue_vhdl.cpp (modified) (1 diff)
• Read_queue_vhdl_body.cpp (modified) (9 diffs)
• Statistics.cpp (deleted)
• Statistics_add.cpp (deleted)
• Statistics_print.cpp (deleted)
• Statistics_print_body.cpp (deleted)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Parameters_msg_error.cpp

@@ -8 +8 @@
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/include/Parameters.h"
 #include <sstream>
-using namespace std;
 
 namespace morpheo                    {
@@ -20 +19 @@
 
 
-  string Parameters::msg_error(void)
+  std::string Parameters::msg_error(void)
   {
     log_printf(FUNC,Read_queue,"msg_error","Begin");
 
-    string msg = "";
+    std::string msg = "";
 
 //     if (_size_queue < 2)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Parameters_print.cpp

@@ -8 +8 @@
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/include/Parameters.h"
 #include "Behavioural/include/XML.h"
-using namespace std;
 
 namespace morpheo                    {
@@ -20 +19 @@
 
 
-  string Parameters::print (uint32_t depth)
+  std::string Parameters::print (uint32_t depth)
   {
     log_printf(FUNC,Read_queue,"print","Begin");
@@ -47 +46 @@
   };
 
-  ostream& operator<< (ostream& output_stream ,
-                       morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::read_queue::Parameters & x)
+  std::ostream& operator<< (std::ostream& output_stream ,
+                            morpheo::behavioural::core::multi_execute_loop::execute_loop::multi_read_unit::read_unit::read_queue::Parameters & x)
   {
     output_stream << x.print(0);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue.cpp

@@ -39 +39 @@
 
 #ifdef STATISTICS
-    log_printf(INFO,Read_queue,"Read_queue","Allocation of statistics");
-
-    // Allocation of statistics
-    _stat = new Statistics (static_cast<string>(_name),
-                            param_statistics          ,
-                            param);
+    log_printf(INFO,Read_queue,FUNCTION,"Allocation of statistics");
+    
+    statistics_declaration(param_statistics);
 #endif
 
@@ -217 +214 @@
     log_printf(INFO,Read_queue,"~Read_queue","Generate Statistics file");
 
-    _stat->generate_file(statistics(0));
-    
     delete _stat;
 #endif

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_allocation.cpp

@@ -21 +21 @@
   void Read_queue::allocation (void)
   {
-    string rename;
-
     log_printf(FUNC,Read_queue,"allocation","Begin");
 
@@ -238 +236 @@
 
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-    _queue      = new queue<Tread_queue_entry_t *>;
+    _queue      = new std::queue<Tread_queue_entry_t *>;
     _queue_head = new Tread_queue_head_entry_t;
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_end_cycle.cpp

@@ -1 @@
-#ifdef VHDL_TESTBENCH
+#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
 /*
  * $Id$
@@ -19 +19 @@
 
 
-  void Read_queue::vhdl_testbench_transition ()
+  void Read_queue::end_cycle ()
   {
     log_printf(FUNC,Read_queue,"vhdl_testbench_transition","Begin");
 
+#ifdef STATISTICS
+    _stat->end_cycle();
+#endif    
+
+#ifdef VHDL_TESTBENCH
     // Evaluation before read the ouput signal
-//     sc_start(0);
-
+//  sc_start(0);
     _interfaces->testbench();
+#endif
 
     log_printf(FUNC,Read_queue,"vhdl_testbench_transition","End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_statistics_declaration.cpp

@@ -18 +18 @@
 namespace read_queue {
 
+#undef  FUNCTION
+#define FUNCTION "Read_queue::statistics_declaration"
+  void Read_queue::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics)
+  {
+    log_printf(FUNC,Read_queue,FUNCTION,"Begin");
 
-  string Read_queue::statistics (uint32_t depth)
-  {
-    log_printf(FUNC,Read_queue,"statistics","Begin");
-
-    string txt = _stat->print(depth);
+    _stat = new Stat (static_cast<std::string>(_name),
+                      "Read_queue",
+                      param_statistics);
     
-    log_printf(FUNC,Read_queue,"statistics","End");
-
-    return txt;
+    log_printf(FUNC,Read_queue,FUNCTION,"End");
   };
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_transition.cpp

@@ -138 +138 @@
       }
 
-#ifdef STATISTICS
-    _stat->add();
-#endif    
-
-#ifdef VHDL_TESTBENCH
-    vhdl_testbench_transition ();
+#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
+    end_cycle ();
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_vhdl.cpp

@@ -35 +35 @@
        );
     
-    string queue_name = _name + "_queue";
+    std::string queue_name = _name + "_queue";
     queue = new morpheo::behavioural::generic::queue::Queue
       (queue_name.c_str()

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Read_unit/Read_unit/Read_queue/src/Read_queue_vhdl_body.cpp

@@ -208 +208 @@
       for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--)
         {
-          string cmp;
+          std::string cmp;
           
           if (_param->_have_port_ooo_engine_id)
@@ -228 +228 @@
       for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--)
         {
-          string cmp;
+          std::string cmp;
           
           if (_param->_have_port_ooo_engine_id)
@@ -248 +248 @@
       for (int32_t i=_param->_nb_spr_write-1; i>=0 ; i--)
         {
-          string cmp;
+          std::string cmp;
           
           if (_param->_have_port_ooo_engine_id)
@@ -278 +278 @@
       for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--)
         {
-          string cmp;
+          std::string cmp;
         
           if (_param->_have_port_ooo_engine_id)
@@ -298 +298 @@
       for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--)
         {
-          string cmp;
+          std::string cmp;
           
           if (_param->_have_port_ooo_engine_id)
@@ -318 +318 @@
       for (int32_t i=_param->_nb_spr_write-1; i>=0 ; i--)
         {
-          string cmp;
+          std::string cmp;
           
           if (_param->_have_port_ooo_engine_id)
@@ -343 +343 @@
       for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--)
         {
-          string cmp;
+          std::string cmp;
         
           if (_param->_have_port_ooo_engine_id)
@@ -365 +365 @@
       for (int32_t i=_param->_nb_gpr_write-1; i>=0 ; i--)
         {
-          string cmp;
+          std::string cmp;
         
           if (_param->_have_port_ooo_engine_id)
@@ -387 +387 @@
       for (int32_t i=_param->_nb_spr_write-1; i>=0 ; i--)
         {
-          string cmp;
+          std::string cmp;
         
           if (_param->_have_port_ooo_engine_id)