Changeset 82 for trunk/IPs/systemC/processor/Morpheo/Behavioural/include
- Timestamp:
- May 1, 2008, 6:48:45 PM (16 years ago)
- Location:
- trunk/IPs/systemC/processor/Morpheo/Behavioural/include
- Files:
-
- 1 added
- 10 edited
-
Allocation.h (modified) (9 diffs)
-
Component.h (modified) (3 diffs)
-
Debug_component.h (modified) (2 diffs)
-
Entity.h (modified) (4 diffs)
-
Interface.h (modified) (2 diffs)
-
Interface_fifo.h (modified) (1 diff)
-
Interfaces.h (modified) (2 diffs)
-
Parameters.h (modified) (1 diff)
-
Signal.h (modified) (2 diffs)
-
Version.h (modified) (1 diff)
-
Version.h.sed (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Allocation.h
r81 r82 1 1 #ifndef morpheo_behavioural_Allocation_h 2 2 #define morpheo_behavioural_Allocation_h 3 4 /* 5 * $Id$ 6 * 7 * [ Description ] 8 * 9 */ 3 10 4 11 #include "Common/include/Debug.h" … … 46 53 { \ 47 54 sig = interface->set_signal_in <type> (name, size); \ 48 } 55 } \ 56 else \ 57 { \ 58 log_printf(INFO,true,FUNCTION,_("%s %s.%s.%s : size is nul."),MSG_INFORMATION,_component->get_name().c_str(),interface->get_name().c_str(),name); \ 59 } 60 49 61 #define ALLOC_SIGNAL_OUT( sig, name, type, size) \ 50 62 if (size > 0) \ 51 63 { \ 52 64 sig = interface->set_signal_out<type> (name, size); \ 65 } \ 66 else \ 67 { \ 68 log_printf(INFO,true,FUNCTION,_("%s %s.%s.%s : size is nul."),MSG_INFORMATION,_component->get_name().c_str(),interface->get_name().c_str(),name); \ 53 69 } 54 70 … … 63 79 64 80 #define INSTANCE_SC_SIGNAL(component, sig) \ 65 (*(component->sig)) (*(sig)); 66 67 #define DELETE_SC_SIGNAL( sig) \ 68 delete sig; 81 { \ 82 TEST_PTR(component->sig); \ 83 TEST_PTR(sig); \ 84 (*(component->sig)) (*(sig)); \ 85 } 86 87 #define DELETE_SC_SIGNAL( sig) \ 88 { \ 89 delete sig; \ 90 } 69 91 70 92 // ---------------------------------------------------------------------- … … 166 188 sig [alloc_signal_it1] = interface[alloc_signal_it1]->set_signal_in <type> (name, size); \ 167 189 } \ 190 else \ 191 { \ 192 log_printf(INFO,true,FUNCTION,_("%s %s.%s.%s : size is nul."),MSG_INFORMATION,_component->get_name().c_str(),interface[alloc_signal_it1]->get_name().c_str(),name); \ 193 } \ 168 194 } \ 169 195 } … … 177 203 { \ 178 204 sig [alloc_signal_it1] = interface[alloc_signal_it1]->set_signal_out<type> (name, size); \ 205 } \ 206 else \ 207 { \ 208 log_printf(INFO,true,FUNCTION,_("%s %s.%s.%s : size is nul."),MSG_INFORMATION,_component->get_name().c_str(),interface[alloc_signal_it1]->get_name().c_str(),name); \ 179 209 } \ 180 210 } \ … … 208 238 for (uint32_t alloc_signal_it1=0; alloc_signal_it1<it1; alloc_signal_it1++) \ 209 239 { \ 240 TEST_PTR(component->sig [alloc_signal_it1]); \ 241 TEST_PTR(sig [alloc_signal_it1]); \ 210 242 (*(component->sig[alloc_signal_it1])) (*(sig[alloc_signal_it1])); \ 211 243 } … … 330 362 sig [alloc_signal_it1][alloc_signal_it2] = interface[alloc_signal_it1][alloc_signal_it2]->set_signal_in <type> (name, size); \ 331 363 } \ 364 else \ 365 { \ 366 log_printf(INFO,true,FUNCTION,_("%s %s.%s.%s : size is nul."),MSG_INFORMATION,_component->get_name().c_str(),interface[alloc_signal_it1][alloc_signal_it2]->get_name().c_str(),name); \ 367 } \ 332 368 } \ 333 369 } \ … … 345 381 { \ 346 382 sig [alloc_signal_it1][alloc_signal_it2] = interface[alloc_signal_it1][alloc_signal_it2]->set_signal_out <type> (name, size); \ 383 } \ 384 else \ 385 { \ 386 log_printf(INFO,true,FUNCTION,_("%s %s.%s.%s : size is nul."),MSG_INFORMATION,_component->get_name().c_str(),interface[alloc_signal_it1][alloc_signal_it2]->get_name().c_str(),name); \ 347 387 } \ 348 388 } \ … … 393 433 for (uint32_t alloc_signal_it2=0; alloc_signal_it2<it2; alloc_signal_it2++) \ 394 434 { \ 435 TEST_PTR(component->sig [alloc_signal_it1][alloc_signal_it2]); \ 436 TEST_PTR(sig [alloc_signal_it1][alloc_signal_it2]); \ 395 437 (*(component->sig[alloc_signal_it1][alloc_signal_it2])) (*(sig[alloc_signal_it1][alloc_signal_it2])); \ 396 438 } -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Component.h
r81 r82 5 5 * $Id$ 6 6 * 7 * [ 7 * [ Description ] 8 8 * 9 9 */ … … 65 65 #define INSTANCE_ALL 0x7 66 66 67 typedef struct68 {69 //public : Component * _component;70 public : Entity * _entity ;71 public : Tinstance_t _instance ;72 } Tcomponent_t;73 74 67 class Component 75 68 { 76 // -----[ fields ]---------------------------------------------------- 69 typedef struct 70 { 71 public : Component * _component; 72 public : Entity * _entity ; 73 public : Tinstance_t _instance ; 74 } Tcomponent_t; 75 76 // -----[ fields ]---------------------------------------------------- 77 77 private : const Tusage_t _usage; 78 78 private : Entity * _entity ; 79 79 private : std::list<Tcomponent_t*> * _list_component; 80 80 81 // -----[ 82 public : Component (Tusage_t usage =USE_ALL);81 // -----[ methods ]--------------------------------------------------- 82 public : Component (Tusage_t usage); 83 83 public : Component (const Component & component); 84 84 public : ~Component (); 85 86 public : std::string get_name (void); 85 87 86 88 public : Entity * set_entity (std::string name … … 124 126 private : bool test_map (uint32_t depth, bool recursive); 125 127 128 // public : bool test_equi (bool recursive=true); 129 // private : bool test_equi (uint32_t depth, bool recursive); 130 126 131 #ifdef POSITION 127 132 public : void interface_map (std::string component_src , -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Debug_component.h
r81 r82 43 43 # define DEBUG_Decod_unit false 44 44 # define DEBUG_Decod false 45 # define DEBUG_Decod_queue true 45 46 # define DEBUG_Ifetch_unit false 46 47 # define DEBUG_Address_management false 47 48 # define DEBUG_Ifetch_queue false 48 49 # define DEBUG_Ifetch_unit_Glue false 49 # define DEBUG_Prediction_unit false50 # define DEBUG_Prediction_unit true 50 51 # define DEBUG_Branch_Target_Buffer false 51 52 # define DEBUG_Branch_Target_Buffer_Glue false … … 55 56 # define DEBUG_Meta_Predictor false 56 57 # define DEBUG_Meta_Predictor_Glue false 57 # define DEBUG_Two_Level_Branch_Predictorfalse58 # define DEBUG_Two_Level_Branch_Predictor_Gluefalse59 # define DEBUG_Branch_History_Tablefalse60 # define DEBUG_Pattern_History_Tablefalse61 # define DEBUG_Prediction_unit_Glue true62 # define DEBUG_Return_Address_Stack true58 # define DEBUG_Two_Level_Branch_Predictor false 59 # define DEBUG_Two_Level_Branch_Predictor_Glue false 60 # define DEBUG_Branch_History_Table false 61 # define DEBUG_Pattern_History_Table false 62 # define DEBUG_Prediction_unit_Glue false 63 # define DEBUG_Return_Address_Stack false 63 64 # define DEBUG_Update_Prediction_Table true 64 65 # define DEBUG_Multi_OOO_Engine false -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Entity.h
r81 r82 26 26 { 27 27 // -----[ fields ]---------------------------------------------------- 28 private : const std::string 29 private : const std::string 28 private : const std::string _name ; 29 private : const std::string _type ; 30 30 #ifdef POSITION 31 31 private : const schema_t _schema ; … … 36 36 37 37 #ifdef POSITION 38 private : std::string 38 private : std::string _comment ; 39 39 40 40 private : bool _is_map ; … … 51 51 ,schema_t schema 52 52 #endif 53 ,Tusage_t usage =USE_ALL53 ,Tusage_t usage 54 54 ); 55 55 public : Entity (const Entity & entity); 56 56 public : ~Entity (); 57 57 58 public : std::string 59 public : std::string 58 public : std::string get_name (void); 59 public : std::string get_type (void); 60 60 61 61 #ifdef POSITION 62 62 public : void set_comment (std::string comment); 63 private : std::string 63 private : std::string get_comment (void ); 64 64 #endif 65 65 public : Interfaces * set_interfaces (void); 66 private : std::string 66 private : std::string get_interfaces (void); 67 67 public : Interfaces * get_interfaces_list(void); 68 68 … … 78 78 #endif 79 79 80 public : bool test_map (uint32_t depth,bool top_level); 80 public : bool test_map (uint32_t depth,bool top_level, bool is_behavioural); 81 // public : bool test_equi (uint32_t depth); 81 82 82 83 #ifdef POSITION -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Interface.h
r81 r82 63 63 ,localisation_t localisation 64 64 #endif 65 ,Tusage_t usage =USE_ALL65 ,Tusage_t usage 66 66 ); 67 67 … … 220 220 std::string counter_name , 221 221 std::string reset_name ); 222 public : std::string 222 public : std::string testbench_test (Vhdl * & vhdl , 223 223 std::string counter_name, 224 224 std::string reset_name); 225 public : std::string testbench_test_ok (Vhdl * & vhdl ); 226 protected : std::string testbench_test_name (Vhdl * & vhdl); 227 protected : std::string testbench_test_ok_name(Vhdl * & vhdl); 228 protected : std::string testbench_test_transaction_name(Vhdl * & vhdl); 229 #endif 230 231 public : bool test_map (uint32_t depth, bool top_level); 225 public : std::string testbench_test_ok (Vhdl * & vhdl ); 226 protected : std::string testbench_test_name (Vhdl * & vhdl); 227 protected : std::string testbench_test_ok_name(Vhdl * & vhdl); 228 protected : std::string testbench_test_transaction_name(Vhdl * & vhdl); 229 #endif 230 231 public : bool test_map (uint32_t depth, bool top_level, bool is_behavioural); 232 // public : bool test_equi (uint32_t depth); 232 233 233 234 #ifdef POSITION -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Interface_fifo.h
r81 r82 45 45 ,localisation_t localisation 46 46 #endif 47 ,Tusage_t usage =USE_ALL47 ,Tusage_t usage 48 48 ); 49 49 -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Interfaces.h
r81 r82 33 33 // -----[ methods ]--------------------------------------------------- 34 34 public : Interfaces (std::string name, 35 Tusage_t usage =USE_ALL);35 Tusage_t usage); 36 36 public : Interfaces (const Interfaces & interfaces); 37 37 public : ~Interfaces (); … … 80 80 #endif 81 81 82 public : bool test_map (uint32_t depth, bool top_level); 82 public : bool test_map (uint32_t depth, bool top_level, bool is_behavioural); 83 // public : bool test_equi (uint32_t depth); 83 84 84 85 public : friend std::ostream& operator<< (std::ostream& output_stream, -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Parameters.h
r81 r82 44 44 45 45 public : bool have_error (void) { return (_error.length() != 0);}; 46 public : void error (std::string str) { _error += "[ ERROR ]<" + _component + "> " + str + "\n";}47 public : void warning (std::string str) { _warning += "[ WARNING ]<" + _component + "> " + str + "\n";}48 public : void information (std::string str) { _information += "[INFORMATION]<" + _component + "> " + str + "\n";}46 public : void error (std::string str) { _error += MSG_ERROR ; _error += " <" + _component + "> " + str + "\n";} 47 public : void warning (std::string str) { _warning += MSG_WARNING ; _warning += " <" + _component + "> " + str + "\n";} 48 public : void information (std::string str) { _information += MSG_INFORMATION; _information += " <" + _component + "> " + str + "\n";} 49 49 public : std::string print (void) { return _error + _warning + _information;}; 50 50 }; -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Signal.h
r81 r82 79 79 public : ~Signal (); 80 80 81 public : std::string 81 public : std::string get_name (void); 82 82 public : uint32_t get_size (void); 83 83 public : void set_size (uint32_t size); … … 92 92 public : bool presence_testbench (void); 93 93 94 public : bool test_map (uint32_t depth, bool top_level); 94 public : bool test_map (uint32_t depth, bool top_level, bool is_behavioural); 95 // public : bool test_equi (uint32_t depth); 95 96 96 97 public : void link (Signal * signal_dest, -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h
r81 r82 4 4 #include "Common/include/ToString.h" 5 5 6 // Identification : MORPHEO_MAJOR_VERSION.MORPHEO_MINOR_VERSION.MORPHEO_REVISION7 // Revision : svn variable8 9 6 #define MORPHEO_MAJOR_VERSION 0 10 7 #define MORPHEO_MINOR_VERSION 2 11 #define MORPHEO_REVISION 0 12 //$Revision$ 8 #define MORPHEO_REVISION 82 9 10 // Identification : MORPHEO_MAJOR_VERSION.MORPHEO_MINOR_VERSION.MORPHEO_REVISION 13 11 14 12 #define MORPHEO_VERSION morpheo::toString(MORPHEO_MAJOR_VERSION)+"."+morpheo::toString(MORPHEO_MINOR_VERSION)+"."+morpheo::toString(MORPHEO_REVISION)
Note: See TracChangeset
for help on using the changeset viewer.
