Changeset 77 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src

Timestamp:

Feb 5, 2008, 5:21:20 PM (16 years ago)

Author:

rosiere

Message:

• Add two component :
  • network between read unit and execute unit
  • network between execute unit and write unit
• remove parameters "nb_operation" and "nb_type"
• in write_queue add the special case : load_speculative

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src

Files:

• Functionnal_unit_allocation.cpp (modified) (1 diff)
• Functionnal_unit_transition.cpp (modified) (1 diff)
• Parameters.cpp (modified) (5 diffs)
• Parameters_msg_error.cpp (modified) (1 diff)
• Parameters_print.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_allocation.cpp

@@ -153 +153 @@
        }
 
-     _function_execute = new function_execute_t ** [MAX_TYPE];
+     _function_execute = new function_execute_t ** [_param->_nb_type];
      
      // Initialisation
-     for (uint32_t i=0; i<MAX_TYPE; i++)
+     for (uint32_t i=0; i<_param->_nb_type; i++)
        {
-         _function_execute [i] = new function_execute_t * [MAX_OPERATION];
+         _function_execute [i] = new function_execute_t * [_param->_nb_operation];
          
-         for (uint32_t j=0; j<MAX_OPERATION; j++)
+         for (uint32_t j=0; j<_param->_nb_operation; j++)
            _function_execute [i][j] = &(operation_unimplemented);
        }

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_transition.cpp

@@ -86 +86 @@
 
 #ifdef DEBUG_TEST
-            if (operation >= MAX_OPERATION)
-              throw ERRORMORPHEO(FUNCTION,"Invalid operation : '"+toString(operation)+"' is higher that MAX_OPERATION");
+            if (type >= _param->_nb_type)
+              throw ERRORMORPHEO(FUNCTION,"Invalid type : '"+toString(type)+"' is higher that _nb_type");
+            if (operation >= _param->_nb_operation)
+              throw ERRORMORPHEO(FUNCTION,"Invalid operation : '"+toString(operation)+"' is higher that _nb_operation");
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Parameters.cpp

@@ -28 +28 @@
                           uint32_t           size_special_data  ,
                           uint32_t           nb_special_register,
-                          uint32_t           nb_operation       ,
-                          uint32_t           nb_type            ,
                           execute_timing_t** timing             ,
                           morpheo::behavioural::custom::custom_information_t (*get_custom_information) (uint32_t)) :
@@ -40 +38 @@
     _size_special_data       (size_special_data     ),
     _nb_special_register     (nb_special_register   ),
-    _nb_operation            (nb_operation          ),
-    _nb_type                 (nb_type               ),
     
     _size_context_id         (log2(nb_context      )),
@@ -49 +45 @@
     _size_general_register   (log2(_size_general_register)),
     _size_special_register   (log2(_size_special_register)),
-    _size_operation          (log2(_size_operation       )),
-    _size_type               (log2(_size_type            )),
 
     _have_port_context_id    (_size_context_id    > 0),
@@ -82 +76 @@
     _size_special_data       (param._size_special_data      ),
     _nb_special_register     (param._nb_special_register    ),
-    _nb_operation            (param._nb_operation           ),
-    _nb_type                 (param._nb_type                ),
 
     _size_context_id         (param._size_context_id        ),
@@ -91 +83 @@
     _size_general_register   (param._size_general_register  ),
     _size_special_register   (param._size_special_register  ),
-    _size_operation          (param._size_operation         ),
-    _size_type               (param._size_type              ),
 
     _have_port_context_id    (param._have_port_context_id   ),

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Parameters_msg_error.cpp

@@ -28 +28 @@
     std::string msg = "";
 
-    for (uint32_t i=0; i<MAX_TYPE; i++)
-      for (uint32_t j=0; j<MAX_OPERATION; j++)
+    for (uint32_t i=0; i<_nb_type; i++)
+      for (uint32_t j=0; j<_nb_operation; j++)
         if (_timing[i][j]._delay != _timing[i][j]._latence)
           msg = "  - For the type '"+toString(i)+"', and the operation '"+toString(j)+"', the delay and the latence must be equal.";

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Parameters_print.cpp

@@ -35 +35 @@
     xml.singleton_begin("size_special_data  "); xml.attribut("value",toString(_size_special_data  )); xml.singleton_end();
     xml.singleton_begin("nb_special_register"); xml.attribut("value",toString(_nb_special_register)); xml.singleton_end();
-    xml.singleton_begin("nb_operation       "); xml.attribut("value",toString(_nb_operation       )); xml.singleton_end();
-    xml.singleton_begin("nb_type            "); xml.attribut("value",toString(_nb_type            )); xml.singleton_end();
     xml.balise_close();