- Timestamp:
- Jan 19, 2008, 12:09:01 PM (16 years ago)
- Location:
- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter
- Files:
-
- 1 added
- 5 deleted
- 4 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/SelfTest/src/test.cpp
r44 r71 32 32 exit (EXIT_FAILURE); 33 33 } 34 #ifdef STATISTICS 35 morpheo::behavioural::Parameters_Statistics * param_stat = new morpheo::behavioural::Parameters_Statistics (5,50); 36 #endif 37 34 38 Counter * _Counter = new Counter (name.c_str(), 35 39 #ifdef STATISTICS 36 morpheo::behavioural::Parameters_Statistics(5,50),40 param_stat, 37 41 #endif 38 42 param); … … 119 123 TEST(Tdata_t,DATA_OUT [i].read(),data_out [i]); 120 124 121 cout << dec << endl;125 cout << std::dec << endl; 122 126 } 123 127 … … 136 140 137 141 delete _Counter; 142 #ifdef STATISTICS 143 delete param_stat; 144 #endif 145 138 146 } -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/include/Counter.h
r44 r71 20 20 #include "Behavioural/Generic/Counter/include/Types.h" 21 21 #ifdef STATISTICS 22 #include "Behavioural/ Generic/Counter/include/Statistics.h"22 #include "Behavioural/include/Stat.h" 23 23 #endif 24 24 #ifdef VHDL … … 44 44 45 45 protected : const Parameters _param; 46 //#ifdef STATISTICS47 // protected : const morpheo::behavioural::Parameters_Statistics _param_statistics;48 //#endif49 46 50 47 #ifdef STATISTICS 51 private : Stat istics* _stat;48 private : Stat * _stat; 52 49 #endif 53 50 … … 81 78 #endif 82 79 #ifdef STATISTICS 83 morpheo::behavioural::Parameters_Statistics param_statistics,80 morpheo::behavioural::Parameters_Statistics * param_statistics, 84 81 #endif 85 82 Parameters param ); … … 98 95 #endif 99 96 #ifdef STATISTICS 100 public : string statistics (uint32_t depth); 97 public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); 98 public : string statistics_print (uint32_t depth); 101 99 #endif 102 100 … … 108 106 #endif 109 107 110 #if def VHDL_TESTBENCH111 private : void vhdl_testbench_transition(void);108 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 109 private : void end_cycle (void); 112 110 #endif 113 111 }; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter.cpp
r67 r71 20 20 #endif 21 21 #ifdef STATISTICS 22 morpheo::behavioural::Parameters_Statistics 22 morpheo::behavioural::Parameters_Statistics * param_statistics, 23 23 #endif 24 24 morpheo::behavioural::generic::counter::Parameters param ): 25 25 _name (name) 26 26 ,_param (param) 27 // #ifdef STATISTICS28 // ,_param_statistics (param_statistics)29 // #endif30 27 { 31 28 log_printf(FUNC,Counter,"Counter","Begin"); … … 37 34 #ifdef STATISTICS 38 35 // Allocation of statistics 39 _stat = new Statistics (static_cast<string>(_name), 40 param_statistics , 41 param); 36 statistics_declaration(param_statistics); 42 37 #endif 43 38 … … 82 77 83 78 #ifdef STATISTICS 84 _stat->generate_file(statistics(0));85 86 79 delete _stat; 87 80 #endif -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_end_cycle.cpp
r59 r71 1 #if def VHDL_TESTBENCH1 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) 2 2 /* 3 3 * $Id$ … … 15 15 16 16 17 void Counter:: vhdl_testbench_transition()17 void Counter::end_cycle () 18 18 { 19 log_printf(FUNC,Counter," vhdl_testbench_transition","Begin");19 log_printf(FUNC,Counter,"end_cycle","Begin"); 20 20 21 // sc_start(0); 21 #ifdef STATISTICS 22 _stat->end_cycle(); 23 #endif 22 24 25 #ifdef VHDL_TESTBENCH 26 // Evaluation before read the ouput signal 27 // sc_start(0); 23 28 _interfaces->testbench(); 29 #endif 24 30 25 log_printf(FUNC,Counter," vhdl_testbench_transition","End");31 log_printf(FUNC,Counter,"end_cycle","End"); 26 32 }; 27 33 28 34 }; // end namespace counter 29 35 }; // end namespace generic 30 31 36 }; // end namespace behavioural 32 37 }; // end namespace morpheo -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_statistics_print.cpp
r59 r71 14 14 namespace counter { 15 15 16 string Counter::statistics (uint32_t depth) 16 #undef FUNCTION 17 #define FUNCTION "Counter::statistics_print" 18 string Counter::statistics_print (uint32_t depth) 17 19 { 18 log_printf(FUNC,Counter, "statistics","Begin");20 log_printf(FUNC,Counter,FUNCTION,"Begin"); 19 21 20 22 string txt = _stat->print(depth); 21 22 log_printf(FUNC,Counter, "statistics","End");23 24 log_printf(FUNC,Counter,FUNCTION,"End"); 23 25 24 26 return txt; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/src/Counter_transition.cpp
r2 r71 20 20 log_printf(FUNC,Counter,"transition","Begin"); 21 21 22 #ifdef STATISTICS 23 _stat->add(); 24 #endif 25 26 #ifdef VHDL_TESTBENCH 27 vhdl_testbench_transition (); 28 #endif 22 end_cycle(); 29 23 30 24 log_printf(FUNC,Counter,"transition","End");
Note: See TracChangeset
for help on using the changeset viewer.