Changeset 71 for trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/include/New_Component.h

Timestamp:

Jan 19, 2008, 12:09:01 PM (16 years ago)

Author:

rosiere

Message:

Modification of Statisctics
Add a new systemC component : Load_Store_Queue (tested with one benchmark and one configuration). Store don't supported the Data Buss Error (Load is supported)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/include/New_Component.h (modified) (8 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/include/New_Component.h

@@ -5 +5 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -20 +20 @@
 #include "Behavioural/@DIRECTORY/include/Parameters.h"
 #ifdef STATISTICS
-#include "Behavioural/@DIRECTORY/include/Statistics.h"
+#include "Behavioural/include/Stat.h"
 #endif
 #include "Behavioural/include/Component.h"
@@ -27 +27 @@
 #endif
 #include "Behavioural/include/Usage.h"
-
-using namespace std;
 
 namespace morpheo {
@@ -40 +38 @@
 #endif
   {
-    // -----[ fields ]----------------------------------------------------
+    // -----[ fields ]----------------------------------------------------
     // Parameters
-  protected : const string       _name;
+  protected : const std::string  _name;
   protected : const Parameters * _param;
   private   : const Tusage_t     _usage;
 
-//#ifdef STATISTICS
-//  protected : const morpheo::behavioural::Parameters_Statistics * _param_statistics;
-//#endif
-
 #ifdef STATISTICS
-  private   : Statistics                     * _stat;
+  private   : Stat                           * _stat;
 #endif
 
@@ -58 +52 @@
 
 #ifdef SYSTEMC
-    // ~~~~~[ Interface ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~[ Interface ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Interface
   public    : SC_CLOCK                      *  in_CLOCK        ;
   public    : SC_IN (Tcontrol_t)            *  in_NRESET       ;
 
-    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
+    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
-    // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
+    // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
-    // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // ~~~~~[ Internal ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #endif
 
-    // -----[ methods ]---------------------------------------------------
+    // -----[ Methods ]---------------------------------------------------
 
 #ifdef SYSTEMC
@@ -80 +74 @@
    sc_module_name                                name,
 #else                                          
-   string                                        name,
+   std::string                                   name,
 #endif                                         
 #ifdef STATISTICS
@@ -99 +93 @@
 #endif                                         
 #ifdef STATISTICS
-  public  : string   statistics                (uint32_t depth);
+  public  : void        statistics_declaration    (morpheo::behavioural::Parameters_Statistics * param_statistics);
+  public  : std::string statistics_print          (uint32_t depth);
 #endif
                                                
@@ -108 +103 @@
 #endif                                         
                                                
+#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
   private : void     end_cycle                 (void);
+#endif
   };