Changeset 138 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src

Timestamp:

May 12, 2010, 7:34:01 PM (14 years ago)

Author:

rosiere

Message:

1) add counters_t type for interface
2) fix in check load in load_store_unit
3) add parameters (but not yet implemented)
4) change environment and add script (distcc_env.sh ...)
5) add warning if an unser change rename flag with l.mtspr instruction
6) ...

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src

Files:

• Issue_queue_allocation.cpp (modified) (1 diff)
• Issue_queue_deallocation.cpp (modified) (1 diff)
• Issue_queue_function_out_of_order_genMoore.cpp (modified) (2 diffs)
• Issue_queue_function_out_of_order_transition.cpp (modified) (2 diffs)
• Parameters_msg_error.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_allocation.cpp

@@ -191 +191 @@
                                                      _param->_nb_bank);
 
-    _priority_reg = new generic::priority::Priority (_name+"_priority_reg"  ,
-                                                     _param->_priority      ,
-                                                     _param->_nb_bank,
-                                                     _param->_nb_bank);
+    // _priority_reg = new generic::priority::Priority (_name+"_priority_reg"  ,
+    //                                               _param->_priority      ,
+    //                                               _param->_nb_bank,
+    //                                               _param->_nb_bank);
       }
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_deallocation.cpp

@@ -136 +136 @@
       {
         delete    _priority_out;
-        delete    _priority_reg;
+        // delete    _priority_reg;
       }
     delete    _component;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_function_out_of_order_genMoore.cpp

@@ -45 +45 @@
           ack [i][j] = false;
     
-      std::list<generic::priority::select_t> * select_reg = _priority_reg->select(); // same select for all issue
+      // std::list<generic::priority::select_t> * select_reg = _priority_reg->select(); // same select for all issue
       
       // issue_in interface
@@ -60 +60 @@
           
           // scan all bank
-          for (std::list<generic::priority::select_t>::iterator it=select_reg->begin();
-               it!=select_reg->end();
-               it++)
+          // for (std::list<generic::priority::select_t>::iterator it=select_reg->begin();
+          //      it!=select_reg->end();
+          //      it++)
+          for (uint32_t num_bank=0;
+               num_bank<_param->_nb_bank;
+               ++num_bank)
             {
-              uint32_t num_bank  = it->grp;
+              // uint32_t num_bank  = it->grp;
 
               log_printf(TRACE,Issue_queue,FUNCTION,"    * BANK [%d]",num_bank);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Issue_queue_function_out_of_order_transition.cpp

@@ -28 +28 @@
 //      _priority_in ->reset();
         _priority_out->reset();
-        _priority_reg->reset();
+//      _priority_reg->reset();
         
         for (uint32_t i=0; i<_param->_nb_bank; i++)
@@ -37 +37 @@
 //      _priority_in ->transition();
         _priority_out->transition();
-        _priority_reg->transition();
+//      _priority_reg->transition();
 
         // ===================================================================

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Issue_queue/src/Parameters_msg_error.cpp

@@ -41 +41 @@
       }
 
-    if (// (_queue_scheme == ISSUE_QUEUE_SCHEME_IN_BUNDLE_ORDER) or
-        (_queue_scheme == ISSUE_QUEUE_SCHEME_OUT_OF_ORDER   ))
-      test.error(toString(_("Can have deadlock with the queue scheme \"%s\".\n"),toString(_queue_scheme).c_str()));
+    // if (// (_queue_scheme == ISSUE_QUEUE_SCHEME_IN_BUNDLE_ORDER) or
+    //     (_queue_scheme == ISSUE_QUEUE_SCHEME_OUT_OF_ORDER   ))
+    //   test.error(toString(_("Can have deadlock with the queue scheme \"%s\".\n"),toString(_queue_scheme).c_str()));
 
     if (not is_multiple(_size_queue, _nb_bank))