- Timestamp:
- Mar 27, 2008, 11:04:49 AM (16 years ago)
- Location:
- trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe
- Files:
-
- 2 added
- 8 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/Makefile.deps
r77 r78 30 30 @COMPONENT_library : 31 31 @\ 32 $(MAKE) Behavioural_library; 32 $(MAKE) Behavioural_library; \ 33 33 $(MAKE) --directory=$(@COMPONENT_DIR) --makefile=Makefile; 34 34 35 35 @COMPONENT_library_clean : 36 36 @\ 37 $(MAKE) Behavioural_library_clean; 37 $(MAKE) Behavioural_library_clean; \ 38 38 $(MAKE) --directory=$(@COMPONENT_DIR) --makefile=Makefile clean; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/SelfTest/src/main.cpp
r76 r78 14 14 err (_("<Usage> %s name_instance list_params.\n"),argv[0]); 15 15 err (_("list_params is :\n")); 16 err (_(" * ()\n")); 16 17 17 18 exit (1); … … 24 25 #endif 25 26 { 26 if (argc != 2+NB_PARAMS)27 if (argc != static_cast<int>(2+NB_PARAMS)) 27 28 usage (argc, argv); 28 29 29 uint32_t 30 uint32_t x = 1; 30 31 31 const string name =argv[x++];32 string name = argv[x++]; 32 33 //const uint32_t size_data = atoi(argv[x++]); 33 34 //const uint32_t nb_port = atoi(argv[x++]); 34 35 36 int _return = EXIT_SUCCESS; 35 37 try 36 38 { … … 46 48 catch (morpheo::ErrorMorpheo & error) 47 49 { 48 msg (_("<%s> : %s.\n"),name.c_str(), error.what ());49 exit (EXIT_FAILURE);50 msg (_("<%s> :\n%s"),name.c_str(), error.what ()); 51 _return = EXIT_FAILURE; 50 52 } 51 53 catch (...) 52 54 { 53 55 err (_("<%s> : This test must generate a error.\n"),name.c_str()); 54 exit (EXIT_FAILURE);56 _return = EXIT_FAILURE; 55 57 } 56 58 57 return ( EXIT_SUCCESS);59 return (_return); 58 60 } 59 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/include/New_Component.h
r76 r78 16 16 #include "Common/include/ToString.h" 17 17 #include "Common/include/Debug.h" 18 #include "Behavioural/include/Types.h"19 18 19 #include "Behavioural/@DIRECTORY/include/Types.h" 20 20 #include "Behavioural/@DIRECTORY/include/Parameters.h" 21 21 #ifdef STATISTICS … … 53 53 #ifdef SYSTEMC 54 54 // ~~~~~[ Interface ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 55 // Interface55 // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 56 56 public : SC_CLOCK * in_CLOCK ; 57 57 public : SC_IN (Tcontrol_t) * in_NRESET ; … … 105 105 106 106 #ifdef STATISTICS 107 public : void statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics); 107 public : void statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics); 108 public : void statistics_deallocation (void); 108 109 #endif 109 110 #if defined(STATISTICS) or defined(VHDL_TESTBENCH) -
trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/include/Parameters.h
r77 r78 22 22 //-----[ methods ]----------------------------------------------------------- 23 23 public : Parameters (); 24 public : Parameters (Parameters & param) ;24 // public : Parameters (Parameters & param) ; 25 25 public : ~Parameters () ; 26 26 27 public : std::stringmsg_error (void);27 public : Parameters_test msg_error (void); 28 28 29 public : std::string print (uint32_t depth);30 public : friend std::ostream& operator<< (std::ostream& output_stream,29 public : std::string print (uint32_t depth); 30 public : friend std::ostream& operator<< (std::ostream& output_stream, 31 31 morpheo::behavioural::@NAMESPACE_USE::Parameters & x); 32 32 }; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/New_Component.cpp
r76 r78 46 46 log_printf(INFO,@COMPONENT,FUNCTION,"Allocation of statistics"); 47 47 48 statistics_ declaration(param_statistics);48 statistics_allocation(param_statistics); 49 49 } 50 50 #endif … … 87 87 if (_usage & USE_STATISTICS) 88 88 { 89 log_printf(INFO,@COMPONENT,FUNCTION,"Generate Statistics file"); 90 91 delete _stat; 89 statistics_deallocation(); 92 90 } 93 91 #endif -
trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/New_Component_allocation.cpp
r76 r78 37 37 _interfaces = entity->set_interfaces(); 38 38 39 // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~40 39 // ~~~~~[ Interface : "" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 40 { 41 41 Interface * interface = _interfaces->set_interface("" 42 42 #ifdef POSITION … … 46 46 #endif 47 47 ); 48 49 in_CLOCK = interface->set_signal_clk ("clock" ,1, CLOCK_VHDL_YES);50 in_NRESET = interface->set_signal_in <Tcontrol_t> ("nreset",1, RESET_VHDL_YES);51 48 49 in_CLOCK = interface->set_signal_clk ("clock" ,1, CLOCK_VHDL_YES); 50 in_NRESET = interface->set_signal_in <Tcontrol_t> ("nreset",1, RESET_VHDL_YES); 51 } 52 52 // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 53 53 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/New_Component_statistics_allocation.cpp
r76 r78 14 14 15 15 #undef FUNCTION 16 #define FUNCTION "@COMPONENT::statistics_ declaration"17 void @COMPONENT::statistics_ declaration (morpheo::behavioural::Parameters_Statistics * param_statistics)16 #define FUNCTION "@COMPONENT::statistics_allocation" 17 void @COMPONENT::statistics_allocation (morpheo::behavioural::Parameters_Statistics * param_statistics) 18 18 { 19 19 log_printf(FUNC,@COMPONENT,FUNCTION,"Begin"); -
trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/Parameters.cpp
r53 r78 21 21 }; 22 22 23 #undef FUNCTION24 #define FUNCTION "@COMPONENT::Parameters (copy)"25 Parameters::Parameters (Parameters & param)26 {27 log_printf(FUNC,@COMPONENT,FUNCTION,"Begin");28 test();29 log_printf(FUNC,@COMPONENT,FUNCTION,"End");30 };23 // #undef FUNCTION 24 // #define FUNCTION "@COMPONENT::Parameters (copy)" 25 // Parameters::Parameters (Parameters & param) 26 // { 27 // log_printf(FUNC,@COMPONENT,FUNCTION,"Begin"); 28 // test(); 29 // log_printf(FUNC,@COMPONENT,FUNCTION,"End"); 30 // }; 31 31 32 32 #undef FUNCTION -
trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component_vbe/src/Parameters_msg_error.cpp
r76 r78 16 16 #undef FUNCTION 17 17 #define FUNCTION "@COMPONENT::msg_error" 18 std::stringParameters::msg_error(void)18 Parameters_test Parameters::msg_error(void) 19 19 { 20 20 log_printf(FUNC,@COMPONENT,FUNCTION,"Begin"); 21 21 22 std::string msg = ""; 23 24 return msg; 22 Parameters_test test ("@COMPONENT"); 25 23 26 24 log_printf(FUNC,@COMPONENT,FUNCTION,"End"); 25 26 return test; 27 27 }; 28 28
Note: See TracChangeset
for help on using the changeset viewer.