Changeset 71 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src

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)

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src

Files:

• Counter.cpp (modified) (3 diffs)
• Counter_end_cycle.cpp (moved) (moved from trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_vhdl_testbench_transition.cpp) (2 diffs)
• Counter_statistics_declaration.cpp (added)
• Counter_statistics_print.cpp (moved) (moved from trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_statistics.cpp) (1 diff)
• Counter_transition.cpp (modified) (1 diff)
• Statistics.cpp (deleted)
• Statistics_add.cpp (deleted)
• Statistics_print.cpp (deleted)
• Statistics_print_body.cpp (deleted)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter.cpp

@@ -20 +20 @@
 #endif
 #ifdef STATISTICS
-                              morpheo::behavioural::Parameters_Statistics             param_statistics,
+                              morpheo::behavioural::Parameters_Statistics * param_statistics,
 #endif
                               morpheo::behavioural::generic::counter::Parameters param ):
                               _name              (name)
                               ,_param            (param)
-// #ifdef STATISTICS
-//                            ,_param_statistics (param_statistics)
-// #endif
   {
     log_printf(FUNC,Counter,"Counter","Begin");
@@ -37 +34 @@
 #ifdef STATISTICS
     // Allocation of statistics
-    _stat = new Statistics (static_cast<string>(_name),
-                            param_statistics          ,
-                            param);
+    statistics_declaration(param_statistics);
 #endif
 
@@ -82 +77 @@
 
 #ifdef STATISTICS
-    _stat->generate_file(statistics(0));
-    
     delete _stat;
 #endif

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_end_cycle.cpp

@@ -1 @@
-#ifdef VHDL_TESTBENCH
+#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
 /*
  * $Id$
@@ -15 +15 @@
 
 
-  void Counter::vhdl_testbench_transition ()
+  void Counter::end_cycle ()
   {
-    log_printf(FUNC,Counter,"vhdl_testbench_transition","Begin");
+    log_printf(FUNC,Counter,"end_cycle","Begin");
 
-//     sc_start(0);
+#ifdef STATISTICS
+    _stat->end_cycle();
+#endif    
 
+#ifdef VHDL_TESTBENCH
+    // Evaluation before read the ouput signal
+//  sc_start(0);
     _interfaces->testbench();
+#endif
 
-    log_printf(FUNC,Counter,"vhdl_testbench_transition","End");
+    log_printf(FUNC,Counter,"end_cycle","End");
   };
 
 }; // end namespace counter
 }; // end namespace generic
-
 }; // end namespace behavioural
 }; // end namespace morpheo              

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_statistics_print.cpp

@@ -14 +14 @@
 namespace counter {
 
-  string Counter::statistics (uint32_t depth)
+#undef  FUNCTION
+#define FUNCTION "Counter::statistics_print"
+  string Counter::statistics_print (uint32_t depth)
   {
-    log_printf(FUNC,Counter,"statistics","Begin");
+    log_printf(FUNC,Counter,FUNCTION,"Begin");
 
     string txt = _stat->print(depth);
-
-    log_printf(FUNC,Counter,"statistics","End");
+    
+    log_printf(FUNC,Counter,FUNCTION,"End");
 
     return txt;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_transition.cpp

@@ -20 +20 @@
     log_printf(FUNC,Counter,"transition","Begin");
 
-#ifdef STATISTICS
-    _stat->add();
-#endif    
-
-#ifdef VHDL_TESTBENCH
-    vhdl_testbench_transition ();
-#endif
+    end_cycle();
 
     log_printf(FUNC,Counter,"transition","End");