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

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

@@ -23 +23 @@
 #include "Behavioural/Generic/RegisterFile/include/Types.h"
 #ifdef STATISTICS
-#include "Behavioural/Generic/RegisterFile/include/Statistics.h"
+#include "Behavioural/include/Stat.h"
 #endif
 #include "Behavioural/include/Component.h"
@@ -29 +29 @@
 #include "Behavioural/include/Vhdl.h"
 #endif
-
-using namespace std;
 
 namespace morpheo {
@@ -45 +43 @@
     // -----[ fields ]----------------------------------------------------
     // Parameters
-  protected : const string       _name;
+  protected : const std::string       _name;
 
   protected : const Parameters * _param;
+
 #ifdef STATISTICS
-  protected : morpheo::behavioural::Parameters_Statistics * _param_statistics;
+  public    : Stat                           * _stat;
 #endif
 
@@ -89 +88 @@
   public  :          RegisterFile              (
 #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  :          ~RegisterFile             (void);
                                                
 #ifdef SYSTEMC                                 
-  private : void     allocation                (void);
+  private : void     allocation                (
+#ifdef STATISTICS
+                                                morpheo::behavioural::Parameters_Statistics * param_statistics
+#else
+                                                void
+#endif
+                                                );
   private : void     deallocation              (void);
 #endif                                         
-
-#ifdef STATISTICS
-  public  : string   statistics                (uint32_t depth);
-#endif
   };