Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile.cpp (revision 10) +++ (revision ) @@ -1,95 +1,0 @@ -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - -#ifdef SYSTEMC - RegisterFile::RegisterFile (sc_module_name name, -#else - RegisterFile::RegisterFile (string name , -#endif -#ifdef STATISTICS - morpheo::behavioural::Parameters_Statistics param_statistics, -#endif - morpheo::behavioural::generic::registerfile::Parameters param ): - _name (name) - ,_param (param) - { -#ifdef STATISTICS - _stat = new Statistics (static_cast(_name), - param_statistics , - param); -#endif - -#ifdef VHDL_TESTBENCH - _vhdl_testbench = new Vhdl_Testbench (_name); - vhdl_testbench_port (*_vhdl_testbench); - _vhdl_testbench->set_clock ("in_CLOCK",true); -#endif - -#ifdef VHDL - // generate the vhdl - vhdl(); -#endif - -#ifdef SYSTEMC - allocation (); - - SC_METHOD (transition); - dont_initialize (); - sensitive_pos << *(in_CLOCK); - - SC_METHOD (genMealy_read); - dont_initialize (); - sensitive_neg << *(in_CLOCK); - for (uint32_t i=0; i<_param._nb_port_read; i++) - sensitive << *(in_READ_VAL [i]) - << *(in_READ_ADDRESS [i]); - -#ifdef SYSTEMCASS_SPECIFIC - // List dependency information - for (uint32_t i=0; i<_param._nb_port_read; i++) - { - (*(out_READ_DATA [i])) (*( in_READ_VAL [i])); - (*(out_READ_DATA [i])) (*( in_READ_ADDRESS [i])); - } -#endif - - for (uint32_t i=0; i<_param._nb_port_read ; i++) - PORT_WRITE(out_READ_ACK [i], 1); - for (uint32_t i=0; i<_param._nb_port_write; i++) - PORT_WRITE(out_WRITE_ACK [i], 1); -#endif - }; - - RegisterFile::~RegisterFile (void) - { -#ifdef SYSTEMC - deallocation (); -#endif - -#ifdef VHDL_TESTBENCH - // generate the test bench - _vhdl_testbench->generate_file(); - delete _vhdl_testbench; -#endif - -#ifdef STATISTICS - _stat->generate_file(statistics(0)); - delete _stat; -#endif - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp (revision 11) @@ -0,0 +1,95 @@ +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + +#ifdef SYSTEMC + RegisterFile::RegisterFile (sc_module_name name, +#else + RegisterFile::RegisterFile (string name , +#endif +#ifdef STATISTICS + morpheo::behavioural::Parameters_Statistics param_statistics, +#endif + morpheo::behavioural::generic::registerfile::Parameters param ): + _name (name) + ,_param (param) + { +#ifdef STATISTICS + _stat = new Statistics (static_cast(_name), + param_statistics , + param); +#endif + +#ifdef VHDL_TESTBENCH + _vhdl_testbench = new Vhdl_Testbench (_name); + vhdl_testbench_port (*_vhdl_testbench); + _vhdl_testbench->set_clock ("in_CLOCK",true); +#endif + +#ifdef VHDL + // generate the vhdl + vhdl(); +#endif + +#ifdef SYSTEMC + allocation (); + + SC_METHOD (transition); + dont_initialize (); + sensitive_pos << *(in_CLOCK); + + SC_METHOD (genMealy_read); + dont_initialize (); + sensitive_neg << *(in_CLOCK); + for (uint32_t i=0; i<_param._nb_port_read; i++) + sensitive << *(in_READ_VAL [i]) + << *(in_READ_ADDRESS [i]); + +#ifdef SYSTEMCASS_SPECIFIC + // List dependency information + for (uint32_t i=0; i<_param._nb_port_read; i++) + { + (*(out_READ_DATA [i])) (*( in_READ_VAL [i])); + (*(out_READ_DATA [i])) (*( in_READ_ADDRESS [i])); + } +#endif + + for (uint32_t i=0; i<_param._nb_port_read ; i++) + PORT_WRITE(out_READ_ACK [i], 1); + for (uint32_t i=0; i<_param._nb_port_write; i++) + PORT_WRITE(out_WRITE_ACK [i], 1); +#endif + }; + + RegisterFile::~RegisterFile (void) + { +#ifdef SYSTEMC + deallocation (); +#endif + +#ifdef VHDL_TESTBENCH + // generate the test bench + _vhdl_testbench->generate_file(); + delete _vhdl_testbench; +#endif + +#ifdef STATISTICS + _stat->generate_file(statistics(0)); + delete _stat; +#endif + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_allocation.cpp (revision 10) +++ (revision ) @@ -1,81 +1,0 @@ -#ifdef SYSTEMC -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::allocation (void) - { - in_CLOCK = new SC_CLOCK ("in_CLOCK"); - in_NRESET = new SC_IN (Tcontrol_t) ("in_NRESET"); - - // ----- Interface Read - in_READ_VAL = new SC_IN (Tcontrol_t) * [_param._nb_port_read]; - out_READ_ACK = new SC_OUT(Tcontrol_t) * [_param._nb_port_read]; - in_READ_ADDRESS = new SC_IN (Taddress_t) * [_param._nb_port_read]; - out_READ_DATA = new SC_OUT(Tdata_t ) * [_param._nb_port_read]; - - for (uint32_t i=0; i<_param._nb_port_read; i++) - { - string rename; - - rename = "in_READ_VAL[" + toString(i) + "]"; - in_READ_VAL [i] = new SC_IN (Tcontrol_t) (rename.c_str()); - - rename = "out_READ_ACK[" + toString(i) + "]"; - out_READ_ACK [i] = new SC_OUT(Tcontrol_t) (rename.c_str()); - - rename = "in_READ_ADDRESS[" + toString(i) + "]"; - in_READ_ADDRESS [i] = new SC_IN (Taddress_t) (rename.c_str()); - - rename = "out_READ_DATA[" + toString(i) + "]"; - out_READ_DATA [i] = new SC_OUT(Tdata_t) (rename.c_str()); - } - - // ----- Interface Write - in_WRITE_VAL = new SC_IN (Tcontrol_t) * [_param._nb_port_write]; - out_WRITE_ACK = new SC_OUT(Tcontrol_t) * [_param._nb_port_write]; - in_WRITE_ADDRESS = new SC_IN (Taddress_t) * [_param._nb_port_write]; - in_WRITE_DATA = new SC_IN (Tdata_t ) * [_param._nb_port_write]; - - for (uint32_t i=0; i<_param._nb_port_write; i++) - { - string rename; - - rename = "in_WRITE_VAL[" + toString(i) + "]"; - in_WRITE_VAL [i] = new SC_IN (Tcontrol_t) (rename.c_str()); - - rename = "out_WRITE_VAL[" + toString(i) + "]"; - out_WRITE_ACK [i] = new SC_OUT(Tcontrol_t) (rename.c_str()); - - rename = "in_WRITE_ADDRESS[" + toString(i) + "]"; - in_WRITE_ADDRESS [i] = new SC_IN (Taddress_t) (rename.c_str()); - - rename = "in_WRITE_DATA[" + toString(i) + "]"; - in_WRITE_DATA [i] = new SC_IN (Tdata_t) (rename.c_str()); - } - - // ----- Register - reg_DATA = new SC_REGISTER (Tdata_t) * [_param._nb_word]; - - for (uint32_t i=0; i<_param._nb_word; i++) - { - string rename = "reg_DATA[" + toString(i) + "]"; - reg_DATA [i] = new SC_REGISTER (Tdata_t) (rename.c_str()); - } - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_allocation_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_allocation_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_allocation_Monolithic.cpp (revision 11) @@ -0,0 +1,81 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::allocation (void) + { + in_CLOCK = new SC_CLOCK ("in_CLOCK"); + in_NRESET = new SC_IN (Tcontrol_t) ("in_NRESET"); + + // ----- Interface Read + in_READ_VAL = new SC_IN (Tcontrol_t) * [_param._nb_port_read]; + out_READ_ACK = new SC_OUT(Tcontrol_t) * [_param._nb_port_read]; + in_READ_ADDRESS = new SC_IN (Taddress_t) * [_param._nb_port_read]; + out_READ_DATA = new SC_OUT(Tdata_t ) * [_param._nb_port_read]; + + for (uint32_t i=0; i<_param._nb_port_read; i++) + { + string rename; + + rename = "in_READ_VAL[" + toString(i) + "]"; + in_READ_VAL [i] = new SC_IN (Tcontrol_t) (rename.c_str()); + + rename = "out_READ_ACK[" + toString(i) + "]"; + out_READ_ACK [i] = new SC_OUT(Tcontrol_t) (rename.c_str()); + + rename = "in_READ_ADDRESS[" + toString(i) + "]"; + in_READ_ADDRESS [i] = new SC_IN (Taddress_t) (rename.c_str()); + + rename = "out_READ_DATA[" + toString(i) + "]"; + out_READ_DATA [i] = new SC_OUT(Tdata_t) (rename.c_str()); + } + + // ----- Interface Write + in_WRITE_VAL = new SC_IN (Tcontrol_t) * [_param._nb_port_write]; + out_WRITE_ACK = new SC_OUT(Tcontrol_t) * [_param._nb_port_write]; + in_WRITE_ADDRESS = new SC_IN (Taddress_t) * [_param._nb_port_write]; + in_WRITE_DATA = new SC_IN (Tdata_t ) * [_param._nb_port_write]; + + for (uint32_t i=0; i<_param._nb_port_write; i++) + { + string rename; + + rename = "in_WRITE_VAL[" + toString(i) + "]"; + in_WRITE_VAL [i] = new SC_IN (Tcontrol_t) (rename.c_str()); + + rename = "out_WRITE_VAL[" + toString(i) + "]"; + out_WRITE_ACK [i] = new SC_OUT(Tcontrol_t) (rename.c_str()); + + rename = "in_WRITE_ADDRESS[" + toString(i) + "]"; + in_WRITE_ADDRESS [i] = new SC_IN (Taddress_t) (rename.c_str()); + + rename = "in_WRITE_DATA[" + toString(i) + "]"; + in_WRITE_DATA [i] = new SC_IN (Tdata_t) (rename.c_str()); + } + + // ----- Register + reg_DATA = new SC_REGISTER (Tdata_t) * [_param._nb_word]; + + for (uint32_t i=0; i<_param._nb_word; i++) + { + string rename = "reg_DATA[" + toString(i) + "]"; + reg_DATA [i] = new SC_REGISTER (Tdata_t) (rename.c_str()); + } + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_deallocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_deallocation.cpp (revision 10) +++ (revision ) @@ -1,61 +1,0 @@ -#ifdef SYSTEMC -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::deallocation (void) - { - delete in_CLOCK; - delete in_NRESET; - // ----- Interface Read - for (uint32_t i=0; i<_param._nb_port_read; i++) - { - delete in_READ_VAL [i]; - delete out_READ_ACK [i]; - delete in_READ_ADDRESS [i]; - delete out_READ_DATA [i]; - } - - delete in_READ_VAL ; - delete out_READ_ACK ; - delete in_READ_ADDRESS; - delete out_READ_DATA ; - - // ----- Interface Write - for (uint32_t i=0; i<_param._nb_port_write; i++) - { - delete in_WRITE_VAL [i]; - delete out_WRITE_ACK [i]; - delete in_WRITE_ADDRESS [i]; - delete in_WRITE_DATA [i]; - } - - delete in_WRITE_VAL ; - delete out_WRITE_ACK ; - delete in_WRITE_ADDRESS; - delete in_WRITE_DATA ; - - // ----- Register - for (uint32_t i=0; i<_param._nb_word; i++) - { - delete reg_DATA [i]; - } - - delete reg_DATA; - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_deallocation_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_deallocation_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_deallocation_Monolithic.cpp (revision 11) @@ -0,0 +1,61 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::deallocation (void) + { + delete in_CLOCK; + delete in_NRESET; + // ----- Interface Read + for (uint32_t i=0; i<_param._nb_port_read; i++) + { + delete in_READ_VAL [i]; + delete out_READ_ACK [i]; + delete in_READ_ADDRESS [i]; + delete out_READ_DATA [i]; + } + + delete in_READ_VAL ; + delete out_READ_ACK ; + delete in_READ_ADDRESS; + delete out_READ_DATA ; + + // ----- Interface Write + for (uint32_t i=0; i<_param._nb_port_write; i++) + { + delete in_WRITE_VAL [i]; + delete out_WRITE_ACK [i]; + delete in_WRITE_ADDRESS [i]; + delete in_WRITE_DATA [i]; + } + + delete in_WRITE_VAL ; + delete out_WRITE_ACK ; + delete in_WRITE_ADDRESS; + delete in_WRITE_DATA ; + + // ----- Register + for (uint32_t i=0; i<_param._nb_word; i++) + { + delete reg_DATA [i]; + } + + delete reg_DATA; + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_genMealy_read.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_genMealy_read.cpp (revision 10) +++ (revision ) @@ -1,54 +1,0 @@ -#ifdef SYSTEMC -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::genMealy_read (void) - { - log_printf(FUNC,Register_File,"genMealy_read","Begin"); - -#ifdef STATISTICS - _stat_nb_read = 0; -#endif - - for (uint32_t i=0; i<_param._nb_port_read; i++) - { - // Have a write? - if ( PORT_READ(in_READ_VAL [i]) == 1) - { - Taddress_t address = PORT_READ(in_READ_ADDRESS[i]); - Tdata_t data = REGISTER_READ(reg_DATA[address]); - - log_printf(TRACE,Register_File,"genMealy_read","[%d] -> %.8x",static_cast(address),static_cast(data)); - -#ifdef STATISTICS - _stat_nb_read ++; -#endif - // Write in registerFile - PORT_WRITE(out_READ_DATA[i],data); - } - else - { - //log_printf(TRACE,Register_File,"genMealy_read","Read  [%d] : No transaction",i); - PORT_WRITE(out_READ_DATA[i],0); - } - } - log_printf(FUNC,Register_File,"genMealy_read","End"); - - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_genMealy_read_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_genMealy_read_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_genMealy_read_Monolithic.cpp (revision 11) @@ -0,0 +1,54 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::genMealy_read (void) + { + log_printf(FUNC,Register_File,"genMealy_read","Begin"); + +#ifdef STATISTICS + _stat_nb_read = 0; +#endif + + for (uint32_t i=0; i<_param._nb_port_read; i++) + { + // Have a write? + if ( PORT_READ(in_READ_VAL [i]) == 1) + { + Taddress_t address = PORT_READ(in_READ_ADDRESS[i]); + Tdata_t data = REGISTER_READ(reg_DATA[address]); + + log_printf(TRACE,Register_File,"genMealy_read","[%d] -> %.8x",static_cast(address),static_cast(data)); + +#ifdef STATISTICS + _stat_nb_read ++; +#endif + // Write in registerFile + PORT_WRITE(out_READ_DATA[i],data); + } + else + { + //log_printf(TRACE,Register_File,"genMealy_read","Read  [%d] : No transaction",i); + PORT_WRITE(out_READ_DATA[i],0); + } + } + log_printf(FUNC,Register_File,"genMealy_read","End"); + + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_statistics.cpp (revision 10) +++ (revision ) @@ -1,25 +1,0 @@ -#ifdef STATISTICS -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - string RegisterFile::statistics (uint32_t depth) - { - return _stat->print(depth); - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_statistics_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_statistics_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_statistics_Monolithic.cpp (revision 11) @@ -0,0 +1,25 @@ +#ifdef STATISTICS +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + string RegisterFile::statistics (uint32_t depth) + { + return _stat->print(depth); + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_transition.cpp (revision 10) +++ (revision ) @@ -1,56 +1,0 @@ -#ifdef SYSTEMC -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::transition (void) - { - log_printf(FUNC,Register_File,"transition","Begin"); -#ifdef STATISTICS - _stat_nb_write = 0; -#endif - - for (uint32_t i=0; i<_param._nb_port_write; i++) - { - // Have a write? - if ( PORT_READ(in_WRITE_VAL[i]) == true) - { -#ifdef STATISTICS - _stat_nb_write ++; -#endif - - Taddress_t address = PORT_READ(in_WRITE_ADDRESS[i]); - Tdata_t data = PORT_READ(in_WRITE_DATA [i]); - - log_printf(TRACE,Register_File,"transition","[%d] <- %.8x",static_cast(address),static_cast(data)); - - // Write in registerFile - REGISTER_WRITE(reg_DATA[address],data); - } - } - -#ifdef STATISTICS - _stat->add(_stat_nb_read,_stat_nb_write); -#endif - -#ifdef VHDL_TESTBENCH - vhdl_testbench_transition (*_vhdl_testbench); -#endif - log_printf(FUNC,Register_File,"transition","End"); - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_transition_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_transition_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_transition_Monolithic.cpp (revision 11) @@ -0,0 +1,56 @@ +#ifdef SYSTEMC +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::transition (void) + { + log_printf(FUNC,Register_File,"transition","Begin"); +#ifdef STATISTICS + _stat_nb_write = 0; +#endif + + for (uint32_t i=0; i<_param._nb_port_write; i++) + { + // Have a write? + if ( PORT_READ(in_WRITE_VAL[i]) == true) + { +#ifdef STATISTICS + _stat_nb_write ++; +#endif + + Taddress_t address = PORT_READ(in_WRITE_ADDRESS[i]); + Tdata_t data = PORT_READ(in_WRITE_DATA [i]); + + log_printf(TRACE,Register_File,"transition","[%d] <- %.8x",static_cast(address),static_cast(data)); + + // Write in registerFile + REGISTER_WRITE(reg_DATA[address],data); + } + } + +#ifdef STATISTICS + _stat->add(_stat_nb_read,_stat_nb_write); +#endif + +#ifdef VHDL_TESTBENCH + vhdl_testbench_transition (*_vhdl_testbench); +#endif + log_printf(FUNC,Register_File,"transition","End"); + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl.cpp (revision 10) +++ (revision ) @@ -1,35 +1,0 @@ -#ifdef VHDL -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" -#include "Behavioural/include/Vhdl.h" -#include "Include/ToString.h" -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::vhdl (void) - { - Vhdl vhdl (_name); - - vhdl.set_library_work (_name + "_Pack"); - - vhdl_port (vhdl); - vhdl_type (vhdl); - vhdl_signal (vhdl); - vhdl_body (vhdl); - - vhdl.generate_file(); - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_Monolithic.cpp (revision 11) @@ -0,0 +1,35 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" +#include "Behavioural/include/Vhdl.h" +#include "Include/ToString.h" +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::vhdl (void) + { + Vhdl vhdl (_name); + + vhdl.set_library_work (_name + "_Pack"); + + vhdl_port (vhdl); + vhdl_type (vhdl); + vhdl_signal (vhdl); + vhdl_body (vhdl); + + vhdl.generate_file(); + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_body.cpp (revision 10) +++ (revision ) @@ -1,57 +1,0 @@ -#ifdef VHDL -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::vhdl_body (Vhdl & vhdl) - { - vhdl.set_body (""); - vhdl.set_body ("-----------------------------------------------------------------------------"); - vhdl.set_body ("-- Read RegisterFile"); - vhdl.set_body ("-----------------------------------------------------------------------------"); - vhdl.set_body (""); - - for (uint32_t i = 0; i < _param._nb_port_read; i++) - { - vhdl.set_body ("out_READ_ACK_"+toString(i)+" <= '1';"); - vhdl.set_body ("out_READ_DATA_"+toString(i)+" <= reg_DATA (conv_integer(in_READ_ADDRESS_"+toString(i)+")) when in_READ_VAL_"+toString(i)+" = '1' else "+std_logic_others(_param._size_word,0)+";"); - } - vhdl.set_body (""); - vhdl.set_body ("-----------------------------------------------------------------------------"); - vhdl.set_body ("-- Write RegisterFile"); - vhdl.set_body ("-----------------------------------------------------------------------------"); - vhdl.set_body (""); - - vhdl.set_body ("RegisterFile_write: process (in_CLOCK)"); - vhdl.set_body ("begin -- process RegisterFile_write"); - vhdl.set_body ("\tif in_CLOCK'event and in_CLOCK = '1' then"); - - for (uint32_t i = 0; i < _param._nb_port_write; i++) - { - vhdl.set_body ("\t\tif (in_WRITE_VAL_"+toString(i)+" = '1') then"); - vhdl.set_body ("\t\t\treg_DATA(conv_integer(in_WRITE_ADDRESS_"+toString(i)+")) <= in_WRITE_DATA_"+toString(i)+";"); - vhdl.set_body ("\t\tend if;"); - } - - vhdl.set_body ("\tend if;"); - vhdl.set_body ("end process RegisterFile_write;"); - - for (uint32_t i = 0; i < _param._nb_port_write; i++) - vhdl.set_body ("out_WRITE_ACK_"+toString(i)+"<= '1';"); - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_body_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_body_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_body_Monolithic.cpp (revision 11) @@ -0,0 +1,57 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::vhdl_body (Vhdl & vhdl) + { + vhdl.set_body (""); + vhdl.set_body ("-----------------------------------------------------------------------------"); + vhdl.set_body ("-- Read RegisterFile"); + vhdl.set_body ("-----------------------------------------------------------------------------"); + vhdl.set_body (""); + + for (uint32_t i = 0; i < _param._nb_port_read; i++) + { + vhdl.set_body ("out_READ_ACK_"+toString(i)+" <= '1';"); + vhdl.set_body ("out_READ_DATA_"+toString(i)+" <= reg_DATA (conv_integer(in_READ_ADDRESS_"+toString(i)+")) when in_READ_VAL_"+toString(i)+" = '1' else "+std_logic_others(_param._size_word,0)+";"); + } + vhdl.set_body (""); + vhdl.set_body ("-----------------------------------------------------------------------------"); + vhdl.set_body ("-- Write RegisterFile"); + vhdl.set_body ("-----------------------------------------------------------------------------"); + vhdl.set_body (""); + + vhdl.set_body ("RegisterFile_write: process (in_CLOCK)"); + vhdl.set_body ("begin -- process RegisterFile_write"); + vhdl.set_body ("\tif in_CLOCK'event and in_CLOCK = '1' then"); + + for (uint32_t i = 0; i < _param._nb_port_write; i++) + { + vhdl.set_body ("\t\tif (in_WRITE_VAL_"+toString(i)+" = '1') then"); + vhdl.set_body ("\t\t\treg_DATA(conv_integer(in_WRITE_ADDRESS_"+toString(i)+")) <= in_WRITE_DATA_"+toString(i)+";"); + vhdl.set_body ("\t\tend if;"); + } + + vhdl.set_body ("\tend if;"); + vhdl.set_body ("end process RegisterFile_write;"); + + for (uint32_t i = 0; i < _param._nb_port_write; i++) + vhdl.set_body ("out_WRITE_ACK_"+toString(i)+"<= '1';"); + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_port.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_port.cpp (revision 10) +++ (revision ) @@ -1,42 +1,0 @@ -#ifdef VHDL -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::vhdl_port (Vhdl & vhdl) - { - vhdl.set_port ("in_CLOCK" , IN, 1); - vhdl.set_port ("in_NRESET", IN, 1); - - for (uint32_t i = 0; i < _param._nb_port_read; i ++) - { - vhdl.set_port (" in_READ_VAL_"+toString(i)+" ",IN ,std_logic(1) ); - vhdl.set_port ("out_READ_ACK_"+toString(i)+" ",OUT,std_logic(1) ); - vhdl.set_port (" in_READ_ADDRESS_"+toString(i)+"",IN ,std_logic(static_cast(log2(_param._nb_word)))); - vhdl.set_port ("out_READ_DATA_"+toString(i)+" ",OUT,std_logic(_param._size_word )); - } - - for (uint32_t i = 0; i < _param._nb_port_write; i ++) - { - vhdl.set_port (" in_WRITE_VAL_"+toString(i)+" ",IN ,std_logic(1) ); - vhdl.set_port ("out_WRITE_ACK_"+toString(i)+" ",OUT,std_logic(1) ); - vhdl.set_port (" in_WRITE_ADDRESS_"+toString(i)+"",IN ,std_logic(static_cast(log2(_param._nb_word)))); - vhdl.set_port (" in_WRITE_DATA_"+toString(i)+" ",IN ,std_logic(_param._size_word )); - } - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_port_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_port_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_port_Monolithic.cpp (revision 11) @@ -0,0 +1,42 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::vhdl_port (Vhdl & vhdl) + { + vhdl.set_port ("in_CLOCK" , IN, 1); + vhdl.set_port ("in_NRESET", IN, 1); + + for (uint32_t i = 0; i < _param._nb_port_read; i ++) + { + vhdl.set_port (" in_READ_VAL_"+toString(i)+" ",IN ,std_logic(1) ); + vhdl.set_port ("out_READ_ACK_"+toString(i)+" ",OUT,std_logic(1) ); + vhdl.set_port (" in_READ_ADDRESS_"+toString(i)+"",IN ,std_logic(static_cast(log2(_param._nb_word)))); + vhdl.set_port ("out_READ_DATA_"+toString(i)+" ",OUT,std_logic(_param._size_word )); + } + + for (uint32_t i = 0; i < _param._nb_port_write; i ++) + { + vhdl.set_port (" in_WRITE_VAL_"+toString(i)+" ",IN ,std_logic(1) ); + vhdl.set_port ("out_WRITE_ACK_"+toString(i)+" ",OUT,std_logic(1) ); + vhdl.set_port (" in_WRITE_ADDRESS_"+toString(i)+"",IN ,std_logic(static_cast(log2(_param._nb_word)))); + vhdl.set_port (" in_WRITE_DATA_"+toString(i)+" ",IN ,std_logic(_param._size_word )); + } + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_signal.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_signal.cpp (revision 10) +++ (revision ) @@ -1,25 +1,0 @@ -#ifdef VHDL -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::vhdl_signal (Vhdl & vhdl) - { - vhdl.set_signal ("reg_DATA", "Tregfile"); - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_signal_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_signal_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_signal_Monolithic.cpp (revision 11) @@ -0,0 +1,25 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::vhdl_signal (Vhdl & vhdl) + { + vhdl.set_signal ("reg_DATA", "Tregfile"); + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_port.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_port.cpp (revision 10) +++ (revision ) @@ -1,41 +1,0 @@ -#ifdef VHDL_TESTBENCH -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::vhdl_testbench_port (Vhdl_Testbench & vhdl_testbench) - { - vhdl_testbench.set_port (" in_NRESET",IN ,1); - - for (uint32_t i = 0; i < _param._nb_port_read; i ++) - { - vhdl_testbench.set_port (" in_READ_VAL_"+toString(i)+" ",IN ,1); - vhdl_testbench.set_port ("out_READ_ACK_"+toString(i)+" ",OUT,1); - vhdl_testbench.set_port (" in_READ_ADDRESS_"+toString(i)+"",IN ,static_cast(log2(_param._nb_word))); - vhdl_testbench.set_port ("out_READ_DATA_"+toString(i)+" ",OUT,_param._size_word); - } - - for (uint32_t i = 0; i < _param._nb_port_write; i ++) - { - vhdl_testbench.set_port (" in_WRITE_VAL_"+toString(i)+" ",IN ,1); - vhdl_testbench.set_port ("out_WRITE_ACK_"+toString(i)+" ",OUT,1); - vhdl_testbench.set_port (" in_WRITE_ADDRESS_"+toString(i)+"",IN ,static_cast(log2(_param._nb_word))); - vhdl_testbench.set_port (" in_WRITE_DATA_"+toString(i)+" ",IN ,_param._size_word ); - } - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_port_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_port_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_port_Monolithic.cpp (revision 11) @@ -0,0 +1,41 @@ +#ifdef VHDL_TESTBENCH +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::vhdl_testbench_port (Vhdl_Testbench & vhdl_testbench) + { + vhdl_testbench.set_port (" in_NRESET",IN ,1); + + for (uint32_t i = 0; i < _param._nb_port_read; i ++) + { + vhdl_testbench.set_port (" in_READ_VAL_"+toString(i)+" ",IN ,1); + vhdl_testbench.set_port ("out_READ_ACK_"+toString(i)+" ",OUT,1); + vhdl_testbench.set_port (" in_READ_ADDRESS_"+toString(i)+"",IN ,static_cast(log2(_param._nb_word))); + vhdl_testbench.set_port ("out_READ_DATA_"+toString(i)+" ",OUT,_param._size_word); + } + + for (uint32_t i = 0; i < _param._nb_port_write; i ++) + { + vhdl_testbench.set_port (" in_WRITE_VAL_"+toString(i)+" ",IN ,1); + vhdl_testbench.set_port ("out_WRITE_ACK_"+toString(i)+" ",OUT,1); + vhdl_testbench.set_port (" in_WRITE_ADDRESS_"+toString(i)+"",IN ,static_cast(log2(_param._nb_word))); + vhdl_testbench.set_port (" in_WRITE_DATA_"+toString(i)+" ",IN ,_param._size_word ); + } + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_transition.cpp (revision 10) +++ (revision ) @@ -1,47 +1,0 @@ -#ifdef VHDL_TESTBENCH -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::vhdl_testbench_transition (Vhdl_Testbench & vhdl_testbench) - { -#ifndef SYSTEMCASS_SPECIFIC - sc_cycle(0); -#endif - vhdl_testbench.add_input (PORT_READ( in_NRESET)); - - for (uint32_t i = 0; i < _param._nb_port_read ; i ++) - { - vhdl_testbench.add_input (PORT_READ( in_READ_VAL [i])); - vhdl_testbench.add_output(PORT_READ(out_READ_ACK [i])); - vhdl_testbench.add_input (PORT_READ( in_READ_ADDRESS [i])); - vhdl_testbench.add_output(PORT_READ(out_READ_DATA [i])); - } - for (uint32_t i = 0; i < _param._nb_port_write; i ++) - { - vhdl_testbench.add_input (PORT_READ( in_WRITE_VAL [i])); - vhdl_testbench.add_output(PORT_READ(out_WRITE_ACK [i])); - vhdl_testbench.add_input (PORT_READ( in_WRITE_ADDRESS[i])); - vhdl_testbench.add_input (PORT_READ( in_WRITE_DATA [i])); - } - - vhdl_testbench.add_test(true); - - vhdl_testbench.new_cycle (); // always at the end - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_transition_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_transition_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_testbench_transition_Monolithic.cpp (revision 11) @@ -0,0 +1,47 @@ +#ifdef VHDL_TESTBENCH +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::vhdl_testbench_transition (Vhdl_Testbench & vhdl_testbench) + { +#ifndef SYSTEMCASS_SPECIFIC + sc_cycle(0); +#endif + vhdl_testbench.add_input (PORT_READ( in_NRESET)); + + for (uint32_t i = 0; i < _param._nb_port_read ; i ++) + { + vhdl_testbench.add_input (PORT_READ( in_READ_VAL [i])); + vhdl_testbench.add_output(PORT_READ(out_READ_ACK [i])); + vhdl_testbench.add_input (PORT_READ( in_READ_ADDRESS [i])); + vhdl_testbench.add_output(PORT_READ(out_READ_DATA [i])); + } + for (uint32_t i = 0; i < _param._nb_port_write; i ++) + { + vhdl_testbench.add_input (PORT_READ( in_WRITE_VAL [i])); + vhdl_testbench.add_output(PORT_READ(out_WRITE_ACK [i])); + vhdl_testbench.add_input (PORT_READ( in_WRITE_ADDRESS[i])); + vhdl_testbench.add_input (PORT_READ( in_WRITE_DATA [i])); + } + + vhdl_testbench.add_test(true); + + vhdl_testbench.new_cycle (); // always at the end + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif Index: unk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_type.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_type.cpp (revision 10) +++ (revision ) @@ -1,25 +1,0 @@ -#ifdef VHDL -/* - * $Id$ - * - * [ Description ] - * - */ - -#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" - -namespace morpheo { -namespace behavioural { -namespace generic { -namespace registerfile { - - void RegisterFile::vhdl_type (Vhdl & vhdl) - { - vhdl.set_type ("Tregfile", "array (" + toString(_param._nb_word-1) + " downto 0) of " + std_logic(_param._size_word)); - }; - -}; // end namespace registerfile -}; // end namespace generic -}; // end namespace behavioural -}; // end namespace morpheo -#endif Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_type_Monolithic.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_type_Monolithic.cpp (revision 11) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_vhdl_type_Monolithic.cpp (revision 11) @@ -0,0 +1,25 @@ +#ifdef VHDL +/* + * $Id$ + * + * [ Description ] + * + */ + +#include "Behavioural/Generic/RegisterFile/include/RegisterFile.h" + +namespace morpheo { +namespace behavioural { +namespace generic { +namespace registerfile { + + void RegisterFile::vhdl_type (Vhdl & vhdl) + { + vhdl.set_type ("Tregfile", "array (" + toString(_param._nb_word-1) + " downto 0) of " + std_logic(_param._size_word)); + }; + +}; // end namespace registerfile +}; // end namespace generic +}; // end namespace behavioural +}; // end namespace morpheo +#endif