Changeset 71 for trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/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/New_Component/src

Files:

• New_Component.cpp (modified) (3 diffs)
• New_Component_end_cycle.cpp (modified) (3 diffs)
• New_Component_statistics_declaration.cpp (added)
• New_Component_statistics_print.cpp (moved) (moved from trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/New_Component_statistics.cpp) (2 diffs)
• New_Component_transition.cpp (modified) (1 diff)
• Parameters_msg_error.cpp (modified) (2 diffs)
• Parameters_print.cpp (modified) (2 diffs)
• Statistics.cpp (deleted)
• Statistics_add.cpp (deleted)
• Statistics_print.cpp (deleted)
• Statistics_print_body.cpp (deleted)

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/New_Component.cpp

@@ -30 +30 @@
     ,_param            (param)
     ,_usage            (usage)
-// #ifdef STATISTICS
-//                            ,_param_statistics (param_statistics)
-// #endif
   {
     log_printf(FUNC,@COMPONENT,FUNCTION,"Begin");
@@ -43 +40 @@
       { 
         log_printf(INFO,@COMPONENT,FUNCTION,"Allocation of statistics");
-        
-        // Allocation of statistics
-        _stat = new Statistics (static_cast<string>(_name),
-                                param_statistics          ,
-                                param);
+
+        statistics_declaration(param_statistics);
       }
 #endif
@@ -90 +84 @@
         log_printf(INFO,@COMPONENT,FUNCTION,"Generate Statistics file");
         
-        _stat->generate_file(statistics(0));
         delete _stat;
       }

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/New_Component_end_cycle.cpp

@@ +1 @@
+#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
 /*
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -19 +20 @@
 
 #ifdef STATISTICS
-    _stat->add();
+    _stat->end_cycle();
 #endif    
 
@@ -34 +35 @@
 }; // end namespace behavioural
 }; // end namespace morpheo              
+#endif

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/New_Component_statistics_print.cpp

@@ -3 +3 @@
  * $Id$
  *
- * [ Description ]
+ * [ Description ]
  * 
  */
@@ -14 +14 @@
 
 #undef  FUNCTION
-#define FUNCTION "@COMPONENT::statistics"
-  string @COMPONENT::statistics (uint32_t depth)
+#define FUNCTION "@COMPONENT::statistics_print"
+  std::string @COMPONENT::statistics_print (uint32_t depth)
   {
     log_printf(FUNC,@COMPONENT,FUNCTION,"Begin");
 
-    string txt = _stat->print(depth);
+    std::string txt = _stat->print(depth);
     
     log_printf(FUNC,@COMPONENT,FUNCTION,"End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/New_Component_transition.cpp

@@ -20 +20 @@
     log_printf(FUNC,@COMPONENT,FUNCTION,"Begin");
 
+#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     end_cycle ();
+#endif
 
     log_printf(FUNC,@COMPONENT,FUNCTION,"End");

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/Parameters_msg_error.cpp

@@ -9 +9 @@
 #include "Behavioural/@DIRECTORY/include/Parameters.h"
 #include <sstream>
-using namespace std;
 
 namespace morpheo                    {
@@ -17 +16 @@
 #undef  FUNCTION
 #define FUNCTION "@COMPONENT::msg_error"
-  string Parameters::msg_error(void)
+  std::string Parameters::msg_error(void)
   {
     log_printf(FUNC,@COMPONENT,FUNCTION,"Begin");
 
-    string msg = "";
+    std::string msg = "";
 
     return msg;

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/Parameters_print.cpp

@@ -8 +8 @@
 #include "Behavioural/@DIRECTORY/include/Parameters.h"
 #include "Behavioural/include/XML.h"
-using namespace std;
 
 namespace morpheo                    {
@@ -16 +15 @@
 #undef  FUNCTION
 #define FUNCTION "@COMPONENT::print"
-  string Parameters::print (uint32_t depth)
+  std::string Parameters::print (uint32_t depth)
   {
     log_printf(FUNC,@COMPONENT,FUNCTION,"Begin");