Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Register_unit.h

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

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Register_unit.h (modified) (7 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Register_unit.h

@@ -24 +24 @@
 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Parameters.h"
 #ifdef STATISTICS
-#include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/include/Statistics.h"
+#include "Behavioural/include/Stat.h"
 #endif
 #include "Behavioural/include/Component.h"
@@ -32 +32 @@
 #include "Behavioural/include/Usage.h"
 
-using namespace std;
-
 namespace morpheo {
 namespace behavioural {
-
 namespace core {
 namespace multi_execute_loop {
@@ -50 +47 @@
     // -----[ fields ]----------------------------------------------------
     // Parameters
-  protected : const string       _name;
+  protected : const std::string       _name;
   protected : const Parameters * _param;
   private   : const Tusage_t     _usage;
 
 #ifdef STATISTICS
-  protected : morpheo::behavioural::Parameters_Statistics * _param_statistics;
-#endif
-
-#ifdef STATISTICS
-  private   : Statistics                     * _stat;
+  public    : Stat                           * _stat;
 #endif
 
@@ -143 +136 @@
    sc_module_name                                name,
 #else                                          
-   string                                        name,
+   std::string                                        name,
 #endif                                         
 #ifdef STATISTICS
@@ -153 +146 @@
   public  :          ~Register_unit             (void);
                                                
-  private : void     allocation                (void);
+  private : void     allocation                (
+#ifdef STATISTICS
+                                                morpheo::behavioural::Parameters_Statistics * param_statistics
+#else
+                                                void
+#endif
+                                                );
   private : void     deallocation              (void);
                                                
@@ -161 +160 @@
 //#endif
 #endif                                         
-#ifdef STATISTICS
-  public  : string   statistics                (uint32_t depth);
-#endif
                                                
 #if VHDL                                       
@@ -171 +167 @@
 #endif                                         
                                                
-#ifdef VHDL_TESTBENCH                          
-  private : void     vhdl_testbench_transition (void);
+#ifdef STATISTICS
+  public  : void        statistics_declaration    (morpheo::behavioural::Parameters_Statistics * param_statistics);
+#endif
+#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
+  private : void        end_cycle                 (void);
 #endif
   };
+
 
 }; // end namespace register_unit