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

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/include/Victim_Pseudo_LRU.h

@@ -35 +35 @@
 #include "Behavioural/Generic/Victim/Victim_Pseudo_LRU/include/Types.h"
 #ifdef STATISTICS
-#include "Behavioural/Generic/Victim/Victim_Pseudo_LRU/include/Statistics.h"
+#include "Behavioural/include/Stat.h"
 #endif
 #ifdef VHDL
 #include "Behavioural/include/Vhdl.h"
 #endif
-#ifdef POSITION
 #include "Behavioural/include/Component.h"
-#else
-#include "Behavioural/include/Interfaces.h"
-#endif
-
-using namespace std;
 
 namespace morpheo {
@@ -157 +151 @@
     }
 
-  public : string print ()
-    {
-      string res = "";
+  public : std::string print ()
+    {
+      std::string res = "";
 
       for (int32_t i=static_cast<int32_t>(_size)-1; i>=0; i--)
@@ -170 +164 @@
     // -----[ fields ]----------------------------------------------------
     // Parameters
-  protected : const string     _name;
+  protected : const std::string     _name;
 
   protected : const Parameters _param;
 #ifdef STATISTICS
-  private   : Statistics                     * _stat;
-#endif
-
-#ifdef POSITION
-  private   : Component                      * _component;
-#endif
+  public    : Stat                           * _stat;
+#endif
+
+  public    : Component                      * _component;
   private   : Interfaces                     * _interfaces;
 
@@ -215 +207 @@
   public  :          Victim_Pseudo_LRU              (
 #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,
-#endif
-                                              Parameters                                  param );
+                                              morpheo::behavioural::Parameters_Statistics * param_statistics,
+#endif
+                                              Parameters                                    param );
                                                
   public  :          Victim_Pseudo_LRU              (Parameters param );
@@ -233 +225 @@
   public  : void     transition                (void);
   public  : void     genMealy_access           (void);
-#endif                                         
-#ifdef STATISTICS
-  public  : string   statistics                (uint32_t depth);
 #endif
                                                
@@ -244 +233 @@
 #endif                                         
                                                
-#ifdef VHDL_TESTBENCH                          
-  private : void     vhdl_testbench_transition (void);
-#endif
-
+#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
   };