Changeset 77 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit
- Timestamp:
- Feb 5, 2008, 5:21:20 PM (16 years ago)
- Location:
- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit
- Files:
-
- 14 edited
-
Functionnal_unit/SelfTest/configuration.cfg (modified) (1 diff)
-
Functionnal_unit/SelfTest/src/main.cpp (modified) (4 diffs)
-
Functionnal_unit/include/Parameters.h (modified) (3 diffs)
-
Functionnal_unit/src/Functionnal_unit_allocation.cpp (modified) (1 diff)
-
Functionnal_unit/src/Functionnal_unit_transition.cpp (modified) (1 diff)
-
Functionnal_unit/src/Parameters.cpp (modified) (5 diffs)
-
Functionnal_unit/src/Parameters_msg_error.cpp (modified) (1 diff)
-
Functionnal_unit/src/Parameters_print.cpp (modified) (1 diff)
-
Load_store_unit/SelfTest/configuration.cfg (modified) (1 diff)
-
Load_store_unit/SelfTest/src/main.cpp (modified) (4 diffs)
-
Load_store_unit/SelfTest/src/test2.cpp (modified) (1 diff)
-
Load_store_unit/include/Parameters.h (modified) (3 diffs)
-
Load_store_unit/src/Parameters.cpp (modified) (5 diffs)
-
Load_store_unit/src/Parameters_print.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/SelfTest/configuration.cfg
r72 r77 8 8 2 2 +1 # size_special_data 9 9 16 16 +1 # nb_special_register 10 10 10 +1 # nb_operation11 4 4 +1 # nb_type -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/SelfTest/src/main.cpp
r76 r77 9 9 #include "Behavioural/Custom/include/Custom_example.h" 10 10 11 #define NB_PARAMS 1011 #define NB_PARAMS 8 12 12 13 13 void usage (int argc, char * argv[]) … … 23 23 err (_(" * size_special_data (uint32_t)\n")); 24 24 err (_(" * nb_special_register (uint32_t)\n")); 25 err (_(" * nb_operation (uint32_t)\n"));26 err (_(" * nb_type (uint32_t)\n"));27 25 exit (1); 28 26 } … … 48 46 const uint32_t size_special_data = atoi(argv[x++]); 49 47 const uint32_t nb_special_register = atoi(argv[x++]); 50 const uint32_t nb_operation = atoi(argv[x++]);51 const uint32_t nb_type = atoi(argv[x++]);52 48 53 49 execute_timing_t ** timing = new execute_timing_t * [MAX_TYPE]; … … 72 68 size_special_data , 73 69 nb_special_register , 74 nb_operation ,75 nb_type ,76 70 timing , 77 71 &(morpheo::behavioural::custom::example_get_custom_information) -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/include/Parameters.h
r76 r77 36 36 public : const uint32_t _size_special_data ; 37 37 public : const uint32_t _nb_special_register ; 38 public : const uint32_t _nb_operation ;39 public : const uint32_t _nb_type ;40 38 public : execute_timing_t ** _timing ; 41 39 public : morpheo::behavioural::custom::custom_information_t (*_get_custom_information) (uint32_t); … … 47 45 public : const uint32_t _size_general_register ; 48 46 public : const uint32_t _size_special_register ; 49 public : const uint32_t _size_operation ;50 public : const uint32_t _size_type ;51 47 52 48 public : const bool _have_port_context_id ; … … 66 62 uint32_t size_special_data , 67 63 uint32_t nb_special_register, 68 uint32_t nb_operation ,69 uint32_t nb_type ,70 64 execute_timing_t** timing , 71 65 morpheo::behavioural::custom::custom_information_t (*get_custom_information) (uint32_t)); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_allocation.cpp
r76 r77 153 153 } 154 154 155 _function_execute = new function_execute_t ** [ MAX_TYPE];155 _function_execute = new function_execute_t ** [_param->_nb_type]; 156 156 157 157 // Initialisation 158 for (uint32_t i=0; i< MAX_TYPE; i++)158 for (uint32_t i=0; i<_param->_nb_type; i++) 159 159 { 160 _function_execute [i] = new function_execute_t * [ MAX_OPERATION];160 _function_execute [i] = new function_execute_t * [_param->_nb_operation]; 161 161 162 for (uint32_t j=0; j< MAX_OPERATION; j++)162 for (uint32_t j=0; j<_param->_nb_operation; j++) 163 163 _function_execute [i][j] = &(operation_unimplemented); 164 164 } -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_transition.cpp
r76 r77 86 86 87 87 #ifdef DEBUG_TEST 88 if (operation >= MAX_OPERATION) 89 throw ERRORMORPHEO(FUNCTION,"Invalid operation : '"+toString(operation)+"' is higher that MAX_OPERATION"); 88 if (type >= _param->_nb_type) 89 throw ERRORMORPHEO(FUNCTION,"Invalid type : '"+toString(type)+"' is higher that _nb_type"); 90 if (operation >= _param->_nb_operation) 91 throw ERRORMORPHEO(FUNCTION,"Invalid operation : '"+toString(operation)+"' is higher that _nb_operation"); 90 92 #endif 91 93 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Parameters.cpp
r76 r77 28 28 uint32_t size_special_data , 29 29 uint32_t nb_special_register, 30 uint32_t nb_operation ,31 uint32_t nb_type ,32 30 execute_timing_t** timing , 33 31 morpheo::behavioural::custom::custom_information_t (*get_custom_information) (uint32_t)) : … … 40 38 _size_special_data (size_special_data ), 41 39 _nb_special_register (nb_special_register ), 42 _nb_operation (nb_operation ),43 _nb_type (nb_type ),44 40 45 41 _size_context_id (log2(nb_context )), … … 49 45 _size_general_register (log2(_size_general_register)), 50 46 _size_special_register (log2(_size_special_register)), 51 _size_operation (log2(_size_operation )),52 _size_type (log2(_size_type )),53 47 54 48 _have_port_context_id (_size_context_id > 0), … … 82 76 _size_special_data (param._size_special_data ), 83 77 _nb_special_register (param._nb_special_register ), 84 _nb_operation (param._nb_operation ),85 _nb_type (param._nb_type ),86 78 87 79 _size_context_id (param._size_context_id ), … … 91 83 _size_general_register (param._size_general_register ), 92 84 _size_special_register (param._size_special_register ), 93 _size_operation (param._size_operation ),94 _size_type (param._size_type ),95 85 96 86 _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
r76 r77 28 28 std::string msg = ""; 29 29 30 for (uint32_t i=0; i< MAX_TYPE; i++)31 for (uint32_t j=0; j< MAX_OPERATION; j++)30 for (uint32_t i=0; i<_nb_type; i++) 31 for (uint32_t j=0; j<_nb_operation; j++) 32 32 if (_timing[i][j]._delay != _timing[i][j]._latence) 33 33 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
r72 r77 35 35 xml.singleton_begin("size_special_data "); xml.attribut("value",toString(_size_special_data )); xml.singleton_end(); 36 36 xml.singleton_begin("nb_special_register"); xml.attribut("value",toString(_nb_special_register)); xml.singleton_end(); 37 xml.singleton_begin("nb_operation "); xml.attribut("value",toString(_nb_operation )); xml.singleton_end();38 xml.singleton_begin("nb_type "); xml.attribut("value",toString(_nb_type )); xml.singleton_end();39 37 xml.balise_close(); 40 38 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/SelfTest/configuration.cfg
r71 r77 11 11 32 32 *2 # size_general_data 12 12 32 32 *2 # nb_general_register 13 4 4 *2 # nb_operation14 4 4 *2 # nb_type -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/SelfTest/src/main.cpp
r71 r77 10 10 #define number_of_test 2 11 11 12 #define NB_PARAMS 1 312 #define NB_PARAMS 11 13 13 14 14 void usage (int argc, char * argv[]) … … 27 27 << " - size_general_data (uint32_t)" << endl 28 28 << " - nb_general_register (uint32_t)" << endl 29 << " - nb_operation (uint32_t)" << endl30 << " - nb_type (uint32_t)" << endl31 29 << "" << endl; 32 30 … … 66 64 const uint32_t _size_general_data = atoi(argv[x++]); 67 65 const uint32_t _nb_general_register = atoi(argv[x++]); 68 const uint32_t _nb_operation = atoi(argv[x++]);69 const uint32_t _nb_type = atoi(argv[x++]);70 66 71 67 try … … 83 79 _nb_packet , 84 80 _size_general_data , 85 _nb_general_register , 86 _nb_operation , 87 _nb_type 88 ); 81 _nb_general_register ); 89 82 90 83 cout << param->print(1); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/SelfTest/src/test2.cpp
r72 r77 57 57 128,//_nb_packet 58 58 32, //_size_general_data 59 64, //_nb_general_register 60 4, //_nb_operation 61 4 //_nb_type 59 64 //_nb_general_register 62 60 ); 63 61 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/include/Parameters.h
r71 r77 39 39 public : const uint32_t _size_general_data ; 40 40 public : const uint32_t _nb_general_register ; 41 public : const uint32_t _nb_operation ;42 public : const uint32_t _nb_type ;43 41 44 42 public : const uint32_t _size_address_store_queue ; … … 50 48 public : const uint32_t _size_packet_id ; 51 49 public : const uint32_t _size_general_register ; 52 public : const uint32_t _size_operation ;53 public : const uint32_t _size_type ;54 50 public : const uint32_t _size_dcache_context_id ; 55 51 public : const uint32_t _size_dcache_packet_id ; … … 75 71 uint32_t nb_packet , 76 72 uint32_t size_general_data , 77 uint32_t nb_general_register , 78 uint32_t nb_operation , 79 uint32_t nb_type 80 ); 73 uint32_t nb_general_register ); 81 74 82 75 public : Parameters (Parameters & param) ; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Parameters.cpp
r71 r77 30 30 uint32_t nb_packet , 31 31 uint32_t size_general_data , 32 uint32_t nb_general_register , 33 uint32_t nb_operation , 34 uint32_t nb_type 35 ): 32 uint32_t nb_general_register ): 36 33 _size_store_queue (size_store_queue ), 37 34 _size_load_queue (size_load_queue ), … … 45 42 _size_general_data (size_general_data ), 46 43 _nb_general_register (nb_general_register ), 47 _nb_operation (nb_operation ),48 _nb_type (nb_type ),49 44 50 45 _size_address_store_queue (log2(size_store_queue )), … … 57 52 _size_packet_id (log2(nb_packet )), 58 53 _size_general_register (log2(nb_general_register)), 59 _size_operation (log2(nb_operation )),60 _size_type (log2(nb_type )),61 54 _size_dcache_context_id (_size_context_id + _size_front_end_id + _size_ooo_engine_id), 62 55 _size_dcache_packet_id ((log2((size_store_queue>size_load_queue)?size_store_queue:size_load_queue))+1), … … 90 83 _size_general_data (param._size_general_data ), 91 84 _nb_general_register (param._nb_general_register ), 92 _nb_operation (param._nb_operation ),93 _nb_type (param._nb_type ),94 85 95 86 _size_address_store_queue (param._size_address_store_queue ), … … 102 93 _size_packet_id (param._size_packet_id ), 103 94 _size_general_register (param._size_general_register ), 104 _size_operation (param._size_operation ),105 _size_type (param._size_type ),106 95 _size_dcache_context_id (param._size_dcache_context_id ), 107 96 _size_dcache_packet_id (param._size_dcache_packet_id ), -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Parameters_print.cpp
r71 r77 39 39 xml.singleton_begin("size_general_data "); xml.attribut("value",toString(_size_general_data )); xml.singleton_end(); 40 40 xml.singleton_begin("nb_general_register "); xml.attribut("value",toString(_nb_general_register )); xml.singleton_end(); 41 xml.singleton_begin("nb_operation "); xml.attribut("value",toString(_nb_operation )); xml.singleton_end();42 xml.singleton_begin("nb_type "); xml.attribut("value",toString(_nb_type )); xml.singleton_end();43 41 xml.balise_close(); 44 42
Note: See TracChangeset
for help on using the changeset viewer.
