Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit_allocation.cpp

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/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit_allocation.cpp (modified) (13 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/src/Register_unit_allocation.cpp

@@ -19 +19 @@
 #undef  FUNCTION
 #define FUNCTION "Register_unit::allocation"
-  void Register_unit::allocation (void)
+  void Register_unit::allocation (
+#ifdef STATISTICS
+                                  morpheo::behavioural::Parameters_Statistics * param_statistics
+#else
+                                  void
+#endif
+                                  )
   {
-    string rename, name_component;
-
     log_printf(FUNC,Register_unit,FUNCTION,"Begin");
 
@@ -249 +253 @@
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
 
-    string name;
+    std::string name;
      
     component_gpr        = new morpheo::behavioural::generic::registerfile::RegisterFile::RegisterFile * [_param->_nb_ooo_engine];
@@ -263 +267 @@
           (name.c_str()
 #ifdef STATISTICS
-           ,_param_statistics
+           ,param_statistics
 #endif
            ,_param->_param_gpr [i]
@@ -283 +287 @@
           (name.c_str()
 #ifdef STATISTICS
-           ,_param_statistics
+           ,param_statistics
 #endif
            ,_param->_param_gpr_status [i]
@@ -303 +307 @@
           (name.c_str()
 #ifdef STATISTICS
-           ,_param_statistics
+           ,param_statistics
 #endif
            ,_param->_param_spr [i]
@@ -322 +326 @@
           (name.c_str()
 #ifdef STATISTICS
-           ,_param_statistics
+           ,param_statistics
 #endif
            ,_param->_param_spr_status [i]
@@ -343 +347 @@
       (name.c_str()
 #ifdef STATISTICS
-       ,_param_statistics
+       ,param_statistics
 #endif
        ,_param->_param_glue
@@ -358 +362 @@
      
     // ~~~~~[ Instanciation ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-
+    std::string name_component;
+    
     for (uint32_t i=0; i<_param->_nb_ooo_engine; i++)
       {
         name_component = _name+"_gpr_"+toString(i);
         
-        cout << "Instance : " << name_component << endl;
+        std::cout << "Instance : " << name_component << std::endl;
         
 #ifdef POSITION
@@ -420 +425 @@
           name_component = _name+"_gpr_status_"+toString(i);
           
-          cout << "Instance : " << name_component << endl;
+          std::cout << "Instance : " << name_component << std::endl;
           
 #ifdef POSITION
@@ -544 +549 @@
         name_component = _name+"_spr_"+toString(i);
         
-        cout << "Instance : " << name_component << endl;
+        std::cout << "Instance : " << name_component << std::endl;
         
 #ifdef POSITION
@@ -601 +606 @@
           name_component = _name+"_spr_status_"+toString(i);
           
-          cout << "Instance : " << name_component << endl;
+          std::cout << "Instance : " << name_component << std::endl;
           
 #ifdef POSITION
@@ -724 +729 @@
       name_component = _name+"_glue";
      
-      cout << "Instance : " << name_component << endl;
+      std::cout << "Instance : " << name_component << std::endl;
      
 #ifdef POSITION
@@ -1034 +1039 @@
 #endif
 
-//     cout << *_component << endl;
+//     std::cout << *_component << std::endl;
 
     log_printf(FUNC,Register_unit,FUNCTION,"End");