Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/include/Shifter.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/Generic/Shifter/include/Shifter.h (modified) (5 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/include/Shifter.h

@@ -19 +19 @@
 #include "Behavioural/Generic/Shifter/include/Types.h"
 #ifdef STATISTICS
-#include "Behavioural/Generic/Shifter/include/Statistics.h"
+#include "Behavioural/include/Stat.h"
 #endif
 #ifdef VHDL
@@ -25 +25 @@
 #endif
 #include "Behavioural/include/Component.h"
-
-using namespace std;
 
 namespace morpheo                    {
@@ -41 +39 @@
     // -----[ fields ]----------------------------------------------------
     // Parameters
-  protected : const string     _name;
+  protected : const std::string     _name;
 
   protected : const Parameters _param;
 #ifdef STATISTICS
-  private   : Statistics                     * _stat;
+  public    : Stat                           * _stat;
 #endif
 
@@ -79 +77 @@
   public  :          Shifter              (
 #ifdef SYSTEMC
-                                           sc_module_name                              name,
+                                           sc_module_name                                name,
 #else                                          
-                                           string                                      name,
+                                           std::string                                   name,
 #endif                                         
 #ifdef STATISTICS
-                                           morpheo::behavioural::Parameters_Statistics param_statistics,
+                                           morpheo::behavioural::Parameters_Statistics * param_statistics,
 #endif
-                                           Parameters                                  param );
+                                           Parameters                                    param );
     
   public  :          Shifter              (Parameters param );
@@ -106 +104 @@
   private : void     vhdl_body                 (Vhdl * & vhdl);
 #endif                                         
+
 #ifdef STATISTICS
-  public  : string   statistics                (uint32_t depth);
+  public  : void        statistics_declaration    (morpheo::behavioural::Parameters_Statistics * param_statistics);
 #endif
-                                               
-#ifdef VHDL_TESTBENCH                          
-  private : void     vhdl_testbench_transition (void);
+#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
+  private : void        end_cycle                 (void);
 #endif
-
   };