Changeset 75 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed
- Timestamp:
- Jan 31, 2008, 6:46:41 PM (16 years ago)
- Location:
- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed
- Files:
-
- 6 deleted
- 7 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h
r44 r75 34 34 public : ~Parameters () ; 35 35 36 public : string msg_error (void); 37 38 public : string print (uint32_t depth); 39 public : friend ostream& operator<< (ostream& output_stream, 40 morpheo::behavioural::generic::select::select_priority_fixed::Parameters & x); 36 public : std::string msg_error (void); 37 public : std::string print (uint32_t depth); 38 public : friend std::ostream& operator<< (std::ostream& output_stream, 39 morpheo::behavioural::generic::select::select_priority_fixed::Parameters & x); 41 40 }; 42 41 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h
r57 r75 20 20 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Types.h" 21 21 #ifdef STATISTICS 22 #include "Behavioural/ Generic/Select/Select_Priority_Fixed/include/Statistics.h"22 #include "Behavioural/include/Stat.h" 23 23 #endif 24 24 #include "Behavioural/include/Component.h" … … 27 27 #endif 28 28 #include "Behavioural/include/Usage.h" 29 30 using namespace std;31 29 32 30 namespace morpheo { … … 44 42 // -----[ fields ]---------------------------------------------------- 45 43 // Parameters 46 protected : const st ring _name;44 protected : const std::string _name; 47 45 protected : const Parameters * _param; 48 46 private : const Tusage_t _usage; … … 52 50 53 51 #ifdef STATISTICS 54 p rivate : Statistics* _stat;52 public : Stat * _stat; 55 53 #endif 56 54 … … 87 85 sc_module_name name, 88 86 #else 89 st ringname,87 std::string name, 90 88 #endif 91 89 #ifdef STATISTICS … … 101 99 private : void deallocation (void); 102 100 103 # if defined(STATISTICS) or defined(VHDL_TESTBENCH)101 # if defined(STATISTICS) or defined(VHDL_TESTBENCH) 104 102 public : void transition (void); 105 # endif103 # endif 106 104 public : void genMealy_entity (void); 107 105 #endif 108 #ifdef STATISTICS109 public : string statistics (uint32_t depth);110 #endif111 106 112 107 #if VHDL … … 116 111 #endif 117 112 118 #ifdef VHDL_TESTBENCH 119 private : void vhdl_testbench_transition (void); 113 #ifdef STATISTICS 114 public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); 115 #endif 116 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 117 private : void end_cycle (void); 120 118 #endif 121 119 }; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Parameters_msg_error.cpp
r40 r75 9 9 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Types.h" 10 10 #include <sstream> 11 using namespace std;12 11 13 12 namespace morpheo { … … 18 17 19 18 20 st ring Parameters::msg_error(void)19 std::string Parameters::msg_error(void) 21 20 { 22 21 log_printf(FUNC,Select_Priority_Fixed,"msg_error","Begin"); 23 22 24 st ring msg = "";23 std::string msg = ""; 25 24 26 25 if ((_encoding_one_hot or _encoding_compact) == false) -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Parameters_print.cpp
r15 r75 8 8 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h" 9 9 #include "Behavioural/include/XML.h" 10 using namespace std;11 10 12 11 namespace morpheo { … … 16 15 namespace select_priority_fixed { 17 16 18 st ring Parameters::print (uint32_t depth)17 std::string Parameters::print (uint32_t depth) 19 18 { 20 19 log_printf(FUNC,Select_Priority_Fixed,"print","Begin"); … … 33 32 }; 34 33 35 ostream& operator<< (ostream& output_stream ,36 34 std::ostream& operator<< (std::ostream& output_stream , 35 morpheo::behavioural::generic::select::select_priority_fixed::Parameters & x) 37 36 { 38 37 output_stream << x.print(0); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed.cpp
r68 r75 30 30 _param (param), 31 31 _usage (usage) 32 // #ifdef STATISTICS33 // ,_param_statistics (param_statistics)34 // #endif35 32 { 36 33 log_printf(FUNC,Select_Priority_Fixed,"Select_Priority_Fixed","Begin"); … … 44 41 log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Allocation of statistics"); 45 42 46 // Allocation of statistics 47 _stat = new Statistics (static_cast<string>(_name), 48 param_statistics , 49 param); 43 statistics_declaration(param_statistics); 50 44 } 51 45 #endif … … 106 100 log_printf(INFO,Select_Priority_Fixed,"~Select_Priority_Fixed","Generate Statistics file"); 107 101 108 _stat->generate_file(statistics(0));109 102 delete _stat; 110 103 } -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_end_cycle.cpp
r59 r75 1 #if def VHDL_TESTBENCH1 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 2 2 /* 3 3 * $Id$ … … 15 15 namespace select_priority_fixed { 16 16 17 #undef FUNCTION 18 #define FUNCTION "Select_Priority_Fixed::end_cycle" 19 void Select_Priority_Fixed::end_cycle () 20 { 21 log_printf(FUNC,Select_Priority_Fixed,FUNCTION,"Begin"); 17 22 18 void Select_Priority_Fixed::vhdl_testbench_transition () 19 {20 log_printf(FUNC,Select_Priority_Fixed,"vhdl_testbench_transition","Begin"); 23 #ifdef STATISTICS 24 _stat->end_cycle(); 25 #endif 21 26 27 #ifdef VHDL_TESTBENCH 22 28 // Evaluation before read the ouput signal 23 // sc_start(0); 29 // sc_start(0); 30 _interfaces->testbench(); 31 #endif 24 32 25 _interfaces->testbench(); 26 27 log_printf(FUNC,Select_Priority_Fixed,"vhdl_testbench_transition","End"); 33 log_printf(FUNC,Select_Priority_Fixed,FUNCTION,"End"); 28 34 }; 29 35 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_statistics_declaration.cpp
r59 r75 15 15 namespace select_priority_fixed { 16 16 17 #undef FUNCTION 18 #define FUNCTION "Select_Priority_Fixed::statistics_declaration" 19 void Select_Priority_Fixed::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics) 20 { 21 log_printf(FUNC,Select_Priority_Fixed,FUNCTION,"Begin"); 17 22 18 string Select_Priority_Fixed::statistics (uint32_t depth) 19 { 20 log_printf(FUNC,Select_Priority_Fixed,"statistics","Begin"); 21 22 string txt = _stat->print(depth); 23 _stat = new Stat (static_cast<std::string>(_name), 24 "Select_Priority_Fixed", 25 param_statistics); 23 26 24 log_printf(FUNC,Select_Priority_Fixed,"statistics","End"); 25 26 return txt; 27 log_printf(FUNC,Select_Priority_Fixed,FUNCTION,"End"); 27 28 }; 28 29 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_transition.cpp
r15 r75 21 21 log_printf(FUNC,Select_Priority_Fixed,"transition","Begin"); 22 22 23 #ifdef STATISTICS 24 _stat->add(); 25 #endif 26 27 #ifdef VHDL_TESTBENCH 28 vhdl_testbench_transition (); 23 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 24 end_cycle(); 29 25 #endif 30 26 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_vhdl_body.cpp
r59 r75 38 38 if (_param->_encoding_compact) 39 39 { 40 st ring range = ((_param->_size_entity-1)==0)?"(0)":std_logic_range(_param->_size_entity-1,0);40 std::string range = ((_param->_size_entity-1)==0)?"(0)":std_logic_range(_param->_size_entity-1,0); 41 41 42 42 vhdl->set_body ("out_ENTITY <= internal_entity"+range+";");
Note: See TracChangeset
for help on using the changeset viewer.