Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp (revision 113) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp (revision 114) @@ -66,6 +66,6 @@ if (fromString(_simulator->getParam("use_statistics"))) _usage = usage_set(_usage, USE_STATISTICS); - if (fromString(_simulator->getParam("use_information"))) - _usage = usage_set(_usage, USE_INFORMATION); +// if (fromString(_simulator->getParam("use_information"))) +// _usage = usage_set(_usage, USE_INFORMATION); if (fromString(_simulator->getParam("use_header"))) _usage = usage_set(_usage, USE_HEADER); Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp (revision 113) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp (revision 114) @@ -141,27 +141,32 @@ // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - _param_queue = new morpheo::behavioural::generic::queue::Parameters - (_param->_size_queue, - _param->_size_internal_queue, - _param->_nb_bypass_write, - false, - false - ); - - std::string queue_name = _name + "_queue"; - _component_queue = new morpheo::behavioural::generic::queue::Queue - (queue_name.c_str() +#ifdef VHDL + if (usage_is_set(_usage,USE_VHDL)) + { + _param_queue = new morpheo::behavioural::generic::queue::Parameters + (_param->_size_queue, + _param->_size_internal_queue, + _param->_nb_bypass_write, + false, + false + ); + + std::string queue_name = _name + "_queue"; + _component_queue = new morpheo::behavioural::generic::queue::Queue + (queue_name.c_str() #ifdef STATISTICS - ,NULL + ,NULL #endif - ,_param_queue - ,USE_VHDL); - - _component->set_component(_component_queue->_component + ,_param_queue + ,USE_VHDL); + + _component->set_component(_component_queue->_component #ifdef POSITION - , 50, 50, 50, 50 + , 50, 50, 50, 50 #endif - , INSTANCE_LIBRARY - ); + , INSTANCE_LIBRARY + ); + } +#endif #ifdef POSITION 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 113) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (revision 114) @@ -427,9 +427,9 @@ instruction_log_file [num_thread] << "[" << simulation_cycle() << "] " - << "{" << ((retire_ok)?" OK ":"!KO!") << "} " << std::hex - << "0x" << entry->address << " (0x" << (entry->address<<2) << ") " + << (entry->address<<2) << " (" << (entry->address) << ") " << std::dec << "[" << entry->cycle_rob_in << ", " << entry->cycle_commit << "] " + << "{" << ((retire_ok)?" OK ":"!KO!") << "} " << std::endl; #endif Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 113) +++ trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h (revision 114) @@ -10,8 +10,8 @@ #define MORPHEO_MAJOR_VERSION "0" #define MORPHEO_MINOR_VERSION "2" -#define MORPHEO_REVISION "113" +#define MORPHEO_REVISION "114" #define MORPHEO_CODENAME "Castor" -#define MORPHEO_DATE_DAY "14" +#define MORPHEO_DATE_DAY "17" #define MORPHEO_DATE_MONTH "04" #define MORPHEO_DATE_YEAR "2009" Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg (revision 113) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_debug.cfg (revision 114) @@ -1,12 +1,12 @@ - + - - - - - + + + + + @@ -16,7 +16,7 @@ - - - + + + @@ -25,32 +25,32 @@ - - + + - - - - + + + + - - - + + + - - - - + + + + - + - - - - + + + + @@ -59,5 +59,5 @@ - + @@ -69,9 +69,4 @@ - - - - - @@ -83,55 +78,44 @@ - - + + - - + + - - - - - - - + + + - - - - - - - + + + - - - - - + + - + - + - - + + - - + + - + @@ -139,15 +123,22 @@ - - - + + - - + + - - + + + + + + + + + + @@ -168,22 +159,8 @@ - - - - - - - - - - - - - - @@ -191,71 +168,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_min.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_min.cfg (revision 113) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_min.cfg (revision 114) @@ -17,4 +17,5 @@ + @@ -61,5 +62,13 @@ - + + + + + + + + + @@ -76,31 +85,16 @@ - - - - - - - + + - - - - - - - + + - - - - - - - + + @@ -120,4 +114,5 @@ + Index: trunk/IPs/systemC/processor/Morpheo/Files/Instance_w4_1.cfg =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Instance_w4_1.cfg (revision 114) +++ trunk/IPs/systemC/processor/Morpheo/Files/Instance_w4_1.cfg (revision 114) @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 113) +++ trunk/IPs/systemC/processor/Morpheo/Files/Morpheo.sim (revision 114) @@ -8,12 +8,12 @@ - + - + - + @@ -24,6 +24,6 @@ - - + + Index: trunk/IPs/systemC/processor/Morpheo/Script/instruction_flow.sh =================================================================== --- trunk/IPs/systemC/processor/Morpheo/Script/instruction_flow.sh (revision 114) +++ trunk/IPs/systemC/processor/Morpheo/Script/instruction_flow.sh (revision 114) @@ -0,0 +1,108 @@ +#!/bin/bash + +#----------------------------------------------------------- +# $Id$ +#----------------------------------------------------------- + +#-----[ usage ]--------------------------------------------- +function usage () +{ + echo "Usage : ${0} file1 file2"; + echo "Arguments : "; + echo " * file1 : instruction flow file"; + echo " * file2 : symbol file"; + echo "format for file1 : xxx address xxx. address is in hexadecimal without 0x or additionnal 0"; + exit; +} + +#-----[ test_usage ]---------------------------------------- +function test_usage () +{ + if test ${#} -ne 2; then + usage ${*}; + fi; +} + +#-----[ main ]---------------------------------------------- +function main () +{ + test_usage ${*}; + + # Read symbol file and take function address and function name + local -ai array_address_begin; + local -ai array_address_end; + local -a array_name; + + # first slot + array_address_begin[0]=0; + array_name[0]="???"; + + local -i cpt=1; + while read line; do + local type=$(echo ${line} | cut -d' ' -f2); + + # Test if the symbol is in text section + if test "${type}" = "T"; then + local address_begin=$(echo ${line} | cut -d' ' -f1); + local name=$( echo ${line} | cut -d' ' -f3); + + # erase additionnal 0 + declare str=$(expr match "${address_begin}" '.*\(^[0]*\)'); + address_begin=$(printf %d 0x${address_begin#${str}}); + + local address_end=$((${address_begin}-1)); + + array_address_begin[${cpt}]=${address_begin}; + array_address_end[$((${cpt}-1))]=${address_end}; + array_name[${cpt}]="${name}"; + + #echo "${address_begin} ${name}"; + + cpt=$((${cpt}+1)); + fi; + done < ${2}; + + # last slot + array_address_end[$((${cpt}-1))]=$(printf %d 0xffffffff); + +# cpt=0; +# while test ${cpt} -ne ${#array_address_begin[*]}; do +# address_begin=${array_address_begin[${cpt}]}; +# address_end=${array_address_end[${cpt}]}; +# name=${array_name[${cpt}]}; +# +# echo "${address_begin} ${address_end} ${name}"; +# +# cpt=$((${cpt}+1)); +# done; + + # Read instruction flow file + while read line; do + # extract address + + local name=""; + local -i address_current=$(printf %d 0x$(echo ${line} | cut -d' ' -f2)); + + # search in address file if match + cpt=0; + while test ${cpt} -ne ${#array_address_begin[*]}; do + local -i address_begin=${array_address_begin[${cpt}]}; + local -i address_end=${array_address_end[${cpt}]}; + + # test if address_curent match with a address in symbol file + if test ${address_current} -ge ${address_begin} -a ${address_current} -lt ${address_end}; then + name=${array_name[${cpt}]}; + break; + fi; + + cpt=$((${cpt}+1)); + done; + + echo "${line} ${name}"; + + done < ${1}; + +} + +#-----[ Corps ]--------------------------------------------- +main ${*};