Index: trunk/IPs/systemC/Environment/Data/include/Segment.h =================================================================== --- trunk/IPs/systemC/Environment/Data/include/Segment.h (revision 133) +++ trunk/IPs/systemC/Environment/Data/include/Segment.h (revision 134) @@ -23,5 +23,5 @@ protected : type_target_t type; - public : Segment (void); +//public : Segment (void); public : Segment (SEGMENT_TABLE_ENTRY * segment); public : ~Segment (void); Index: trunk/IPs/systemC/Environment/Data/selftest/main.cpp =================================================================== --- trunk/IPs/systemC/Environment/Data/selftest/main.cpp (revision 133) +++ trunk/IPs/systemC/Environment/Data/selftest/main.cpp (revision 134) @@ -31,17 +31,17 @@ { - Segment * seg1 = new Segment (); +// Segment * seg1 = new Segment (); - TEST(seg1->getType (), TYPE_TARGET_MEMORY); - TEST(seg1->getIndex (), 0); - TEST(seg1->getBase (), 0); - TEST(seg1->getSize (), 0); - TEST(seg1->getUncached (), false); +// TEST(seg1->getType (), TYPE_TARGET_MEMORY); +// TEST(seg1->getIndex (), 0); +// TEST(seg1->getBase (), 0); +// TEST(seg1->getSize (), 0); +// TEST(seg1->getUncached (), false); - seg1->define_target(TYPE_TARGET_SIM2OS,4); - TEST(seg1->getType (), TYPE_TARGET_SIM2OS); - TEST(seg1->getIndex (), 4); +// seg1->define_target(TYPE_TARGET_SIM2OS,4); +// TEST(seg1->getType (), TYPE_TARGET_SIM2OS); +// TEST(seg1->getIndex (), 4); - cout << *seg1 << endl; +// cout << *seg1 << endl; SEGMENT_TABLE_ENTRY * entry = new SEGMENT_TABLE_ENTRY("entry", 0x100, 0x1024, 21, 7, true); @@ -104,5 +104,5 @@ delete seg2; delete entry; - delete seg1; +// delete seg1; } Index: trunk/IPs/systemC/Environment/Data/src/Data_read.cpp =================================================================== --- trunk/IPs/systemC/Environment/Data/src/Data_read.cpp (revision 133) +++ trunk/IPs/systemC/Environment/Data/src/Data_read.cpp (revision 134) @@ -6,17 +6,18 @@ bool Data::read (uint32_t address, uint32_t size, char * & data_dest) { +// for (uint32_t i=0; itest (address,size) == true) { segment[num_seg]->read (address,size,data_dest); - res = true; break; } - return res; + return (num_seg < nb_seg); } Index: trunk/IPs/systemC/Environment/Data/src/Segment.cpp =================================================================== --- trunk/IPs/systemC/Environment/Data/src/Segment.cpp (revision 133) +++ trunk/IPs/systemC/Environment/Data/src/Segment.cpp (revision 134) @@ -4,14 +4,14 @@ namespace data { - Segment::Segment (void) - { - name = ""; - base = 0; - size = 0; - uncached = false; - data = NULL; - type = TYPE_TARGET_MEMORY; - index = 0; - } +// Segment::Segment (void) +// { +// name = ""; +// base = 0; +// size = 0; +// uncached = false; +// data = NULL; +// type = TYPE_TARGET_MEMORY; +// index = 0; +// } Segment::Segment (SEGMENT_TABLE_ENTRY * segment) @@ -25,4 +25,5 @@ type = TYPE_TARGET_MEMORY; index = 0; + memset((void*)data,0,size * sizeof(char)); } Index: trunk/IPs/systemC/Environment/Data/src/Segment_read.cpp =================================================================== --- trunk/IPs/systemC/Environment/Data/src/Segment_read.cpp (revision 133) +++ trunk/IPs/systemC/Environment/Data/src/Segment_read.cpp (revision 134) @@ -1,3 +1,4 @@ #include "../include/Segment.h" +#include "../../Common/include/Debug.h" namespace environment { @@ -6,6 +7,11 @@ void Segment::read (uint32_t address, uint32_t size, char * & data_dest) { +// _cout(true," * kane\n"); +// _cout(true," * address : %.8x\n",address); for (uint32_t it = 0; it < size ; it ++) - data_dest [it] = data[address-base+it]; + { + data_dest [it] = data[address-base+it]; +// _cout(true," * [%d] : %.8x\n",address-base+it,static_cast(data_dest [it])); + } } Index: trunk/IPs/systemC/Environment/Data/src/loadexec.c =================================================================== --- trunk/IPs/systemC/Environment/Data/src/loadexec.c (revision 133) +++ trunk/IPs/systemC/Environment/Data/src/loadexec.c (revision 134) @@ -142,4 +142,7 @@ *eoffset = ringo.ladr; ringo.mem = malloc(*esize * sizeof(char)); + + memset((void *)ringo.mem,0,*esize * sizeof(char)); + /* Start over again from the start of the memory */ bfd_map_over_sections(exec, bindsection, &ringo); Index: trunk/IPs/systemC/Environment/src/Environment_transition.cpp =================================================================== --- trunk/IPs/systemC/Environment/src/Environment_transition.cpp (revision 133) +++ trunk/IPs/systemC/Environment/src/Environment_transition.cpp (revision 134) @@ -105,5 +105,5 @@ bus_error |= !component_data->read(addr,size,read_iram[k]); - + // Swap if endienness is different if (endianness::isSameEndianness(context) == false) Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/SelfTest/src/test.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/SelfTest/src/test.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/SelfTest/src/test.cpp (revision 134) @@ -1,3 +1,3 @@ -/* +cd /* * $Id$ * Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_transition.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_transition.cpp (revision 134) @@ -48,4 +48,20 @@ } } + + _execute_operation_out->_context_id = 0; // not necessary + _execute_operation_out->_front_end_id = 0; // not necessary + _execute_operation_out->_ooo_engine_id = 0; // not necessary + _execute_operation_out->_packet_id = 0; // not necessary + // _execute_operation_out->_operation = 0; // not necessary + // _execute_operation_out->_type = 0; // not necessary + _execute_operation_out->_write_rd = 0; // not necessary + _execute_operation_out->_num_reg_rd = 0; // not necessary + _execute_operation_out->_data_rd = 0; // not necessary + _execute_operation_out->_write_re = 0; // not necessary + _execute_operation_out->_num_reg_re = 0; // not necessary + _execute_operation_out->_data_re = 0; // not necessary + _execute_operation_out->_exception = 0; // not necessary + _execute_operation_out->_no_sequence = 0; // not necessary + _execute_operation_out->_address = 0; // not necessary } else Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_allocation.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_allocation.cpp (revision 134) @@ -179,21 +179,24 @@ #if defined(DEBUG) and defined(DEBUG_Load_store_unit) and (DEBUG_Load_store_unit == true) - directory_init (); - - memory_log_file = new std::ofstream [_param->_nb_thread]; - for (uint32_t i=0; i<_param->_nb_thread; ++i) - if (_param->_num_thread_valid [i]) - { - - std::string filename = morpheo::filename(MORPHEO_LOG, - "Memory_access-thread_"+toString(i), - "", - "log", - _simulation_file_with_date, - _simulation_file_with_pid , - true); - - memory_log_file [i].open(filename.c_str() ,std::ios::out | std::ios::trunc); - } + if (log_file_generate) + { + directory_init (); + + memory_log_file = new std::ofstream [_param->_nb_thread]; + for (uint32_t i=0; i<_param->_nb_thread; ++i) + if (_param->_num_thread_valid [i]) + { + + std::string filename = morpheo::filename(MORPHEO_LOG, + "Memory_access-thread_"+toString(i), + "", + "log", + _simulation_file_with_date, + _simulation_file_with_pid , + true); + + memory_log_file [i].open(filename.c_str() ,std::ios::out | std::ios::trunc); + } + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_deallocation.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_deallocation.cpp (revision 134) @@ -122,12 +122,13 @@ #if defined(DEBUG) and defined(DEBUG_Load_store_unit) and (DEBUG_Load_store_unit == true) - { - for (uint32_t i=0; i<_param->_nb_thread; ++i) - if (_param->_num_thread_valid [i]) - { - memory_log_file [i].close(); - } - delete [] memory_log_file; - } + if (log_file_generate) + { + for (uint32_t i=0; i<_param->_nb_thread; ++i) + if (_param->_num_thread_valid [i]) + { + memory_log_file [i].close(); + } + delete [] memory_log_file; + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Load_store_unit/src/Load_store_unit_function_speculative_load_commit_transition.cpp (revision 134) @@ -999,4 +999,5 @@ #if defined(DEBUG) and defined(DEBUG_Load_store_unit) and (DEBUG_Load_store_unit == true) + if (log_file_generate) { // log file @@ -1193,19 +1194,20 @@ #if defined(DEBUG) and defined(DEBUG_Load_store_unit) and (DEBUG_Load_store_unit == true) - { - // log file - Tcontext_t num_thread = get_num_thread(_load_queue [packet_id]._context_id , _param->_size_context_id , - _load_queue [packet_id]._front_end_id , _param->_size_front_end_id , - _load_queue [packet_id]._ooo_engine_id, _param->_size_ooo_engine_id); - - memory_log_file [num_thread] - << "[" << simulation_cycle() << "] " - << std::hex - << "@ 0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << _load_queue [packet_id]._address << " -[ Read ]-> 0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << _load_queue [packet_id]._rdata << " " - << std::dec - << "{" << toString(_load_queue [packet_id]._operation) << "}"; - - memory_log_file [num_thread] << std::endl; - } + if (log_file_generate) + { + // log file + Tcontext_t num_thread = get_num_thread(_load_queue [packet_id]._context_id , _param->_size_context_id , + _load_queue [packet_id]._front_end_id , _param->_size_front_end_id , + _load_queue [packet_id]._ooo_engine_id, _param->_size_ooo_engine_id); + + memory_log_file [num_thread] + << "[" << simulation_cycle() << "] " + << std::hex + << "@ 0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << _load_queue [packet_id]._address << " -[ Read ]-> 0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << _load_queue [packet_id]._rdata << " " + << std::dec + << "{" << toString(_load_queue [packet_id]._operation) << "}"; + + memory_log_file [num_thread] << std::endl; + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Instruction/include/Types.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Instruction/include/Types.h (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/Instruction/include/Types.h (revision 134) @@ -55,5 +55,5 @@ Texception_t _exception ; Tbranch_condition_t _branch_condition ; -// Tcontrol_t _branch_stack_write; +// Tcontrol_t _branch_stack_write; Tcontrol_t _branch_direction ; Tevent_type_t _event_type ; Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_genMealy.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_genMealy.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Decod_unit/Decod/src/Decod_genMealy.cpp (revision 134) @@ -101,10 +101,33 @@ Tgeneral_data_t addr = PORT_READ(in_IFETCH_ADDRESS [x])+y; - _decod_instruction->_instruction = PORT_READ(in_IFETCH_INSTRUCTION [x][y]); - _decod_instruction->_context_id = x; - _decod_instruction->_address_previous = internal_CONTEXT_ADDRESS_PREVIOUS [x]; - _decod_instruction->_address = addr; //Compute the current address - _decod_instruction->_address_next = addr+1; - _decod_instruction->_is_delay_slot = internal_CONTEXT_IS_DELAY_SLOT [x]; + _decod_instruction->_instruction = PORT_READ(in_IFETCH_INSTRUCTION [x][y]); + _decod_instruction->_context_id = x; + _decod_instruction->_address_previous = internal_CONTEXT_ADDRESS_PREVIOUS [x]; + _decod_instruction->_address = addr; //Compute the current address + _decod_instruction->_address_next = addr+1; + _decod_instruction->_is_delay_slot = internal_CONTEXT_IS_DELAY_SLOT [x]; + _decod_instruction->_type = 0; // not necessary + _decod_instruction->_operation = 0; // not necessary + _decod_instruction->_no_execute = 0; // not necessary + _decod_instruction->_has_immediat = 0; // not necessary + _decod_instruction->_immediat = 0; // not necessary + _decod_instruction->_read_ra = 0; // not necessary + _decod_instruction->_num_reg_ra = 0; // not necessary + _decod_instruction->_read_rb = 0; // not necessary + _decod_instruction->_num_reg_rb = 0; // not necessary + _decod_instruction->_read_rc = 0; // not necessary + _decod_instruction->_num_reg_rc = 0; // not necessary + _decod_instruction->_write_rd = 0; // not necessary + _decod_instruction->_num_reg_rd = 0; // not necessary + _decod_instruction->_write_re = 0; // not necessary + _decod_instruction->_num_reg_re = 0; // not necessary + _decod_instruction->_exception_use = EXCEPTION_USE_NONE; // not necessary + _decod_instruction->_exception = EXCEPTION_DECOD_NONE; // not necessary + _decod_instruction->_branch_condition = 0; // not necessary +// _decod_instruction->_branch_stack_write = 0; // not necessary + _decod_instruction->_branch_direction = 0; // not necessary + _decod_instruction->_event_type = EVENT_TYPE_NONE; // not necessary + + // Test IFetch exception @@ -181,4 +204,5 @@ // Branch predictor can accept : the depth is valid log_printf(TRACE,Decod,FUNCTION," * context_depth_val : %d",PORT_READ(in_CONTEXT_DEPTH_VAL [x])); + decod_val [i] &= PORT_READ(in_CONTEXT_DEPTH_VAL [x]); ifetch_ack [x][y] &= PORT_READ(in_CONTEXT_DEPTH_VAL [x]); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_allocation.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_allocation.cpp (revision 134) @@ -248,20 +248,23 @@ #if defined(DEBUG) and defined(DEBUG_Update_Prediction_Table) and (DEBUG_Update_Prediction_Table == true) - directory_init (); - - branchement_log_file = new std::ofstream [_param->_nb_thread]; - for (uint32_t i=0; i<_param->_nb_thread; ++i) - if (_param->_have_thread [i]) - { - std::string filename = morpheo::filename(MORPHEO_LOG, - "Branchement_prediction-thread_"+toString(i), - "", - "log", - _simulation_file_with_date, - _simulation_file_with_pid, - true); - - branchement_log_file [i] .open(filename.c_str() ,std::ios::out | std::ios::trunc); - } + if (log_file_generate) + { + directory_init (); + + branchement_log_file = new std::ofstream [_param->_nb_thread]; + for (uint32_t i=0; i<_param->_nb_thread; ++i) + if (_param->_have_thread [i]) + { + std::string filename = morpheo::filename(MORPHEO_LOG, + "Branchement_prediction-thread_"+toString(i), + "", + "log", + _simulation_file_with_date, + _simulation_file_with_pid, + true); + + branchement_log_file [i] .open(filename.c_str() ,std::ios::out | std::ios::trunc); + } + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_deallocation.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_deallocation.cpp (revision 134) @@ -172,12 +172,13 @@ #if defined(DEBUG) and defined(DEBUG_Update_Prediction_Table) and (DEBUG_Update_Prediction_Table == true) - { - for (uint32_t i=0; i<_param->_nb_thread; ++i) - if (_param->_have_thread [i]) - { - branchement_log_file [i].close(); - } - delete [] branchement_log_file; - } + if (log_file_generate) + { + for (uint32_t i=0; i<_param->_nb_thread; ++i) + if (_param->_have_thread [i]) + { + branchement_log_file [i].close(); + } + delete [] branchement_log_file; + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_transition.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Update_Prediction_Table/src/Update_Prediction_Table_transition.cpp (revision 134) @@ -149,19 +149,20 @@ { #if defined(DEBUG) and defined(DEBUG_Update_Prediction_Table) and (DEBUG_Update_Prediction_Table == true) - if (reg_UPDATE_PREDICTION_TABLE [i][bottom]._retire_ok) - { - uint32_t num_thread = _param->_translate_num_context_to_num_thread [i]; - branchement_log_file [num_thread] - << std::hex - << "0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << reg_UPDATE_PREDICTION_TABLE [i][bottom]._address_src << " " - << "0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << reg_UPDATE_PREDICTION_TABLE [i][bottom]._address_dest << " " - << std::dec - << reg_UPDATE_PREDICTION_TABLE [i][bottom]._good_take << " - " - << "[" << simulation_cycle() << "] " << " " - << reg_UPDATE_PREDICTION_TABLE [i][bottom]._miss_prediction << " " - << reg_UPDATE_PREDICTION_TABLE [i][bottom]._ifetch_prediction << " " - << "(" << toString(reg_UPDATE_PREDICTION_TABLE [i][bottom]._condition) << ")" - << std::endl; - } + if (log_file_generate) + if (reg_UPDATE_PREDICTION_TABLE [i][bottom]._retire_ok) + { + uint32_t num_thread = _param->_translate_num_context_to_num_thread [i]; + branchement_log_file [num_thread] + << std::hex + << "0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << reg_UPDATE_PREDICTION_TABLE [i][bottom]._address_src << " " + << "0x" << std::setfill('0') << std::setw(_param->_size_general_data/4) << reg_UPDATE_PREDICTION_TABLE [i][bottom]._address_dest << " " + << std::dec + << reg_UPDATE_PREDICTION_TABLE [i][bottom]._good_take << " - " + << "[" << simulation_cycle() << "] " << " " + << reg_UPDATE_PREDICTION_TABLE [i][bottom]._miss_prediction << " " + << reg_UPDATE_PREDICTION_TABLE [i][bottom]._ifetch_prediction << " " + << "(" << toString(reg_UPDATE_PREDICTION_TABLE [i][bottom]._condition) << ")" + << std::endl; + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_allocation.cpp (revision 134) @@ -358,21 +358,24 @@ #if defined(DEBUG) and defined(DEBUG_Commit_unit) and (DEBUG_Commit_unit == true) - directory_init (); - - instruction_log_file = new std::ofstream [_param->_nb_thread]; - for (uint32_t i=0; i<_param->_nb_thread; ++i) - if (_param->_have_thread [i]) - { - - std::string filename = morpheo::filename(MORPHEO_LOG, - "Instruction_flow-thread_"+toString(i), - "", - "log", - _simulation_file_with_date, - _simulation_file_with_pid , - true); - - instruction_log_file [i].open(filename.c_str() ,std::ios::out | std::ios::trunc); - } + if (log_file_generate) + { + directory_init (); + + instruction_log_file = new std::ofstream [_param->_nb_thread]; + for (uint32_t i=0; i<_param->_nb_thread; ++i) + if (_param->_have_thread [i]) + { + + std::string filename = morpheo::filename(MORPHEO_LOG, + "Instruction_flow-thread_"+toString(i), + "", + "log", + _simulation_file_with_date, + _simulation_file_with_pid , + true); + + instruction_log_file [i].open(filename.c_str() ,std::ios::out | std::ios::trunc); + } + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_deallocation.cpp (revision 134) @@ -239,12 +239,13 @@ #if defined(DEBUG) and defined(DEBUG_Commit_unit) and (DEBUG_Commit_unit == true) - { - for (uint32_t i=0; i<_param->_nb_thread; ++i) - if (_param->_have_thread [i]) - { - instruction_log_file [i].close(); - } - delete [] instruction_log_file; - } + if (log_file_generate) + { + for (uint32_t i=0; i<_param->_nb_thread; ++i) + if (_param->_have_thread [i]) + { + instruction_log_file [i].close(); + } + delete [] instruction_log_file; + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (revision 134) @@ -831,19 +831,20 @@ #if defined(DEBUG) and defined(DEBUG_Commit_unit) and (DEBUG_Commit_unit == true) - { - // log file - instruction_log_file [num_thread] - << "[" << simulation_cycle() << "] " - << std::hex - << (entry->address<<2) << " (" << (entry->address) << ") " - << std::dec - << "[" << entry->cycle_rob_in << ", " << entry->cycle_commit << "] " - << "{" << ((retire_ok)?"OK":"KO") << "} "; - - if ((type == TYPE_MEMORY) and is_operation_memory_load(entry->operation)) - instruction_log_file [num_thread] << std::hex << entry->load_data << std::dec; - - instruction_log_file [num_thread] << std::endl; - } + if (log_file_generate) + { + // log file + instruction_log_file [num_thread] + << "[" << simulation_cycle() << "] " + << std::hex + << (entry->address<<2) << " (" << (entry->address) << ") " + << std::dec + << "[" << entry->cycle_rob_in << ", " << entry->cycle_commit << "] " + << "{" << ((retire_ok)?"OK":"KO") << "} "; + + if ((type == TYPE_MEMORY) and is_operation_memory_load(entry->operation)) + instruction_log_file [num_thread] << std::hex << entry->load_data << std::dec; + + instruction_log_file [num_thread] << std::endl; + } #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 134) @@ -10,8 +10,8 @@ #define MORPHEO_MAJOR_VERSION "0" #define MORPHEO_MINOR_VERSION "2" -#define MORPHEO_REVISION "133" +#define MORPHEO_REVISION "134" #define MORPHEO_CODENAME "Castor" -#define MORPHEO_DATE_DAY "13" +#define MORPHEO_DATE_DAY "15" #define MORPHEO_DATE_MONTH "07" #define MORPHEO_DATE_YEAR "2009" Index: trunk/IPs/systemC/processor/Morpheo/Common/include/Message.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Common/include/Message.h (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Common/include/Message.h (revision 134) @@ -44,4 +44,5 @@ extern FILE * log_stream; +extern bool log_file_generate; FILE * log (FILE * stream); Index: trunk/IPs/systemC/processor/Morpheo/Common/src/Message.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Common/src/Message.cpp (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Common/src/Message.cpp (revision 134) @@ -16,4 +16,5 @@ static bool log_initialized; FILE * log_stream; + bool log_file_generate; #undef FUNCTION @@ -35,5 +36,6 @@ if (not log_initialized) { - log_initialized = true; + log_initialized = true; + log_file_generate = have_file; if (have_file) @@ -49,5 +51,5 @@ log_stream = fopen (filename.c_str(), "w"); - + if (log_stream==NULL) { Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg (revision 134) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg (revision 134) @@ -0,0 +1,780 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_02.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_02.cfg (revision 134) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_02.cfg (revision 134) @@ -0,0 +1,710 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_03.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_03.cfg (revision 134) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_03.cfg (revision 134) @@ -0,0 +1,722 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_04.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_04.cfg (revision 134) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_04.cfg (revision 134) @@ -0,0 +1,723 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_05.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_05.cfg (revision 134) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_05.cfg (revision 134) @@ -0,0 +1,714 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x4_w8_01.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x4_w8_01.cfg (revision 133) +++ (revision ) @@ -1,707 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_x4_w8_02.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_x4_w8_02.cfg (revision 133) +++ (revision ) @@ -1,710 +1,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Files/Morpheo-Dhrystone.sim (revision 134) @@ -17,8 +17,8 @@ - + - + Index: trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 134) @@ -17,5 +17,5 @@ - + Index: trunk/IPs/systemC/processor/Morpheo/Files/debug.sim =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/debug.sim (revision 133) +++ trunk/IPs/systemC/processor/Morpheo/Files/debug.sim (revision 134) @@ -25,5 +25,5 @@ - + Index: trunk/Makefile.tools =================================================================== --- trunk/Makefile.tools (revision 133) +++ trunk/Makefile.tools (revision 134) @@ -59,5 +59,6 @@ #VALGRIND = valgrind --tool=memcheck --leak-check=yes --show-reachable=yes VALGRIND = valgrind --tool=memcheck --leak-check=full --show-reachable=yes --leak-resolution=high --partial-loads-ok=yes --undef-value-errors=yes -labs_CC_PREFIX = $(DISTCC) +labs_network_CC_PREFIX = $(DISTCC) +labs_local_CC_PREFIX = $(DISTCC) home_CC_PREFIX = CC_PREFIX = $($(MORPHEO_LOCALIZATION)_CC_PREFIX) Index: trunk/Makefile.tools_path =================================================================== --- trunk/Makefile.tools_path (revision 133) +++ trunk/Makefile.tools_path (revision 134) @@ -10,15 +10,27 @@ # LABS #---------------------------------------------------------- -labs_ENV = export PATH=$${PATH}:/bin:/usr/bin:/users/chaos/kane/Softwares/distcc/bin -labs_SYSTEMC_systemc = /users/chaos/kane/Softwares/systemc -labs_SYSTEMC_systemcass = /users/chaos/kane/Softwares/systemcass -labs_SYSTEMC_systemcass_deps = $(SYSTEMC_systemcass) -labs_XILINX = /users/chaos/kane/Softwares/Xilinx92i -labs_XILINX_CORELIB = /users/chaos/kane/Softwares/XilinxCoreLib -labs_MODELTECH = /users/chaos/kane/Softwares/modeltech -labs_MODELTECH_LICENCE = /users/soft/mentor/mgls_v8-5_0-5-0.ss5/etc/cust/mgc/license.anacad.2008 -labs_OR1K = /users/chaos/kane/Softwares/or32-elf -labs_NEWLIB = /users/chaos/kane/Softwares/newlib/or32-elf -labs_QT = /users/chaos/kane/Softwares/qt-x11-opensource-4.2.3 +labs_network_ENV = export PATH=$${PATH}:/bin:/usr/bin:/users/chaos/kane/Softwares/distcc/bin +labs_network_SYSTEMC_systemc = /users/chaos/kane/Softwares/systemc +labs_network_SYSTEMC_systemcass = /users/chaos/kane/Softwares/systemcass +labs_network_SYSTEMC_systemcass_deps = $(labs_network_SYSTEMC_systemcass) +labs_network_XILINX = /users/chaos/kane/Softwares/Xilinx92i +labs_network_XILINX_CORELIB = /users/chaos/kane/Softwares/XilinxCoreLib +labs_network_MODELTECH = /users/chaos/kane/Softwares/modeltech +labs_network_MODELTECH_LICENCE = /users/soft/mentor/mgls_v8-5_0-5-0.ss5/etc/cust/mgc/license.anacad.2008 +labs_network_OR1K = /users/chaos/kane/Softwares/or32-elf +labs_network_NEWLIB = /users/chaos/kane/Softwares/newlib/or32-elf +labs_network_QT = /users/chaos/kane/Softwares/qt-x11-opensource-4.2.3 + +labs_local_ENV = $(labs_network_ENV) +labs_local_SYSTEMC_systemc = $(labs_network_SYSTEMC_systemc) +labs_local_SYSTEMC_systemcass = $(labs_network_SYSTEMC_systemcass) +labs_local_SYSTEMC_systemcass_deps = $(labs_network_SYSTEMC_systemcass_deps) +labs_local_XILINX = $(labs_network_XILINX) +labs_local_XILINX_CORELIB = $(labs_network_XILINX_CORELIB) +labs_local_MODELTECH = $(labs_network_MODELTECH) +labs_local_MODELTECH_LICENCE = $(labs_network_MODELTECH_LICENCE) +labs_local_OR1K = $(labs_network_OR1K) +labs_local_NEWLIB = $(labs_network_NEWLIB) +labs_local_QT = $(labs_network_QT) #---------------------------------------------------------- @@ -28,5 +40,5 @@ home_SYSTEMC_systemc = /home/data/Tools/systemc-2.2.0 home_SYSTEMC_systemcass = /home/data/Tools/systemcass -home_SYSTEMC_systemcass_deps = $(SYSTEMC_systemcass) +home_SYSTEMC_systemcass_deps = $(home_SYSTEMC_systemcass) home_XILINX = /home/data/Tools/Xilinx91i home_XILINX_CORELIB = /home/data/Tools/XilinxCoreLib Index: trunk/Platforms/Test/Makefile =================================================================== --- trunk/Platforms/Test/Makefile (revision 133) +++ trunk/Platforms/Test/Makefile (revision 134) @@ -78,6 +78,6 @@ BIN = Platforms_Test.x -EXEC = $(PATH_BIN)/$(BIN) -EXEC_PREFIX = $(NICE) -n $(PRIORITY) +EXEC = $(PATH_BIN)/$(BIN) +EXEC_PREFIX = $(NICE) -n $(PRIORITY) # $(VALGRIND) EXEC_PARAMS = $(SYSTEMC_EXEC_PARAMS_$(SIMULATOR_SYSTEMC)) Index: trunk/Platforms/Test/data/debug/debug.cfg =================================================================== --- trunk/Platforms/Test/data/debug/debug.cfg (revision 133) +++ trunk/Platforms/Test/data/debug/debug.cfg (revision 134) @@ -1,6 +1,6 @@ ${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/debug.sim ${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen -${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w1_1.cfg -${MORPHEO_TOPLEVEL}/Softwares/Test/Test_000/bin/soft.x +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x1_w8_2.cfg +${MORPHEO_TOPLEVEL}/Softwares/Test/Test_070/bin/soft.x 0 0 Index: trunk/Platforms/Test/data/x04_w08_01/Test_x000.cfg =================================================================== --- trunk/Platforms/Test/data/x04_w08_01/Test_x000.cfg (revision 134) +++ trunk/Platforms/Test/data/x04_w08_01/Test_x000.cfg (revision 134) @@ -0,0 +1,8 @@ +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg +${MORPHEO_TOPLEVEL}/Softwares/Test/Test_x000/bin/soft.x +0 +0 +4096 +2 Index: trunk/Platforms/Test/data/x04_w08_01/Test_x001.cfg =================================================================== --- trunk/Platforms/Test/data/x04_w08_01/Test_x001.cfg (revision 134) +++ trunk/Platforms/Test/data/x04_w08_01/Test_x001.cfg (revision 134) @@ -0,0 +1,8 @@ +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg +${MORPHEO_TOPLEVEL}/Softwares/Test/Test_x001/bin/soft.x +0 +0 +4096 +2 Index: trunk/Platforms/Test/data/x04_w08_01/Test_x002.cfg =================================================================== --- trunk/Platforms/Test/data/x04_w08_01/Test_x002.cfg (revision 134) +++ trunk/Platforms/Test/data/x04_w08_01/Test_x002.cfg (revision 134) @@ -0,0 +1,8 @@ +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg +${MORPHEO_TOPLEVEL}/Softwares/Test/Test_x002/bin/soft.x +0 +0 +4096 +2 Index: trunk/Platforms/Test/data/x04_w08_01/Test_x003.cfg =================================================================== --- trunk/Platforms/Test/data/x04_w08_01/Test_x003.cfg (revision 134) +++ trunk/Platforms/Test/data/x04_w08_01/Test_x003.cfg (revision 134) @@ -0,0 +1,8 @@ +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg +${MORPHEO_TOPLEVEL}/Softwares/Test/Test_x003/bin/soft.x +0 +0 +4096 +2 Index: trunk/Platforms/Test/data/x04_w08_01/Test_x004.cfg =================================================================== --- trunk/Platforms/Test/data/x04_w08_01/Test_x004.cfg (revision 134) +++ trunk/Platforms/Test/data/x04_w08_01/Test_x004.cfg (revision 134) @@ -0,0 +1,8 @@ +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg +${MORPHEO_TOPLEVEL}/Softwares/Test/Test_x004/bin/soft.x +0 +0 +4096 +2 Index: trunk/Platforms/Test/data/x04_w08_01/Test_x005.cfg =================================================================== --- trunk/Platforms/Test/data/x04_w08_01/Test_x005.cfg (revision 134) +++ trunk/Platforms/Test/data/x04_w08_01/Test_x005.cfg (revision 134) @@ -0,0 +1,8 @@ +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg +${MORPHEO_TOPLEVEL}/Softwares/Test/Test_x005/bin/soft.x +0 +0 +4096 +2 Index: trunk/Platforms/Test/data/x04_w08_01/Test_x006.cfg =================================================================== --- trunk/Platforms/Test/data/x04_w08_01/Test_x006.cfg (revision 134) +++ trunk/Platforms/Test/data/x04_w08_01/Test_x006.cfg (revision 134) @@ -0,0 +1,8 @@ +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.sim +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Morpheo.gen +${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Files/Instance_x04_w08_01.cfg +${MORPHEO_TOPLEVEL}/Softwares/Test/Test_x006/bin/soft.x +0 +0 +4096 +2 Index: trunk/environment.sh =================================================================== --- trunk/environment.sh (revision 133) +++ trunk/environment.sh (revision 134) @@ -25,5 +25,5 @@ # Export environement -export MORPHEO_LOCALIZATION="labs"; +export MORPHEO_LOCALIZATION="labs_network"; export MORPHEO_TOPLEVEL=${PWD}; export MORPHEO_SCRIPT=${MORPHEO_TOPLEVEL}/IPs/systemC/processor/Morpheo/Script; @@ -32,8 +32,11 @@ case ${MORPHEO_LOCALIZATION} in - "labs") + "labs_network") export MORPHEO_PREFIX=/users/chaos/kane/Morpheo; export MORPHEO_TMP=${MORPHEO_PREFIX}; - + ;; + "labs_local") + export MORPHEO_PREFIX=/dsk/l1/misc/Morpheo; + export MORPHEO_TMP=${MORPHEO_PREFIX}; ;; "home")