Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.defs =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.defs (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.defs (revision 48) @@ -8,4 +8,4 @@ #-----[ Directory ]---------------------------------------- -DIR_COMPONENT_MORPHEO = ../../../.. +DIR_COMPONENT_MORPHEO = ../../../../../../.. DIR_MORPHEO = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps (revision 48) @@ -12,8 +12,8 @@ endif ifndef Two_Level_Branch_Predictor -include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps +include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps endif ifndef Meta_Predictor_Glue -include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps +include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps endif @@ -26,5 +26,5 @@ $(Behavioural_LIBRARY) -Meta_Predictor_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/lib \ +Meta_Predictor_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/lib \ $(Meta_Predictor_Glue_DIR_LIBRARY) \ $(Two_Level_Branch_Predictor_DIR_LIBRARY) \ @@ -34,12 +34,14 @@ Meta_Predictor_library : - @$(MAKE) Behavioural_library - @$(MAKE) Meta_Predictor_Glue_library - @$(MAKE) Two_Level_Branch_Predictor_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor --makefile=Makefile + @\ + $(MAKE) Behavioural_library;\ + $(MAKE) Meta_Predictor_Glue_library;\ + $(MAKE) Two_Level_Branch_Predictor_library;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor --makefile=Makefile; Meta_Predictor_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) Meta_Predictor_Glue_library_clean - @$(MAKE) Two_Level_Branch_Predictor_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean;\ + $(MAKE) Meta_Predictor_Glue_library_clean;\ + $(MAKE) Two_Level_Branch_Predictor_library_clean;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.defs =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.defs (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.defs (revision 48) @@ -8,4 +8,4 @@ #-----[ Directory ]---------------------------------------- -DIR_COMPONENT_MORPHEO = ../../../../.. +DIR_COMPONENT_MORPHEO = ../../../../../../../.. DIR_MORPHEO = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps (revision 48) @@ -18,5 +18,5 @@ $(Behavioural_LIBRARY) -Meta_Predictor_Glue_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/lib \ +Meta_Predictor_Glue_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/lib \ $(Behavioural_DIR_LIBRARY) @@ -24,8 +24,10 @@ Meta_Predictor_Glue_library : - @$(MAKE) Behavioural_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue --makefile=Makefile + @\ + $(MAKE) Behavioural_library;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue --makefile=Makefile ; Meta_Predictor_Glue_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/Makefile (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/Makefile (revision 48) @@ -8,5 +8,5 @@ #-----[ Directory ]---------------------------------------- -DIR_MORPHEO = ../../../../../.. +DIR_MORPHEO = ../../../../../../../../.. LIBRARY = $(Meta_Predictor_Glue_LIBRARY) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h (revision 48) @@ -14,15 +14,15 @@ #include -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" using namespace std; using namespace morpheo; using namespace morpheo::behavioural; -using namespace morpheo::behavioural::stage_1_ifetch; -using namespace morpheo::behavioural::stage_1_ifetch::predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor; + +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue; void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters param); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters param); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/main.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/main.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/main.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h" #define NB_PARAMS 15 @@ -66,5 +66,5 @@ try { - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters param (have_meta_predictor , + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters param (have_meta_predictor , predictor_0_have_bht , predictor_0_bht_size_shifter , Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp (revision 48) @@ -9,9 +9,9 @@ #define NB_ITERATION 1024 -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h" #include "Common/include/Test.h" void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters _param) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters _param) { cout << "<" << name << "> : Simulation SystemC" << endl; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h /* @@ -17,8 +17,8 @@ #include "Common/include/Debug.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h" #ifdef STATISTICS -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" #endif #ifdef VHDL @@ -31,6 +31,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -154,6 +158,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Parameters_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Parameters_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Parameters_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Parameters_h /* @@ -15,6 +15,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -77,11 +81,16 @@ public : string print (uint32_t depth); public : friend ostream& operator<< (ostream& output_stream, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters & x); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters & x); }; }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h (revision 48) @@ -1,5 +1,5 @@ #ifdef STATISTICS -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Statistics_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Statistics_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Statistics_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Statistics_h /* @@ -14,5 +14,5 @@ #include "Behavioural/include/Parameters_Statistics.h" //#include "Behavioural/Generic/Group/include/Statistics.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" //using namespace morpheo::behavioural::generic::group; @@ -20,6 +20,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -50,6 +54,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h (revision 48) @@ -1,5 +1,5 @@ #ifdef SYSTEMC -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Type_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Type_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Type_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Type_h /* @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -25,6 +29,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -24,5 +28,5 @@ morpheo::behavioural::Parameters_Statistics param_statistics, #endif - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters param ): + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters param ): _name (name) ,_param (param) @@ -266,6 +270,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_allocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -199,6 +203,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_deallocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -88,6 +92,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_ack.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_ack.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_ack.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -34,6 +38,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_history.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_history.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_history.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" #include "Common/include/BitManipulation.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -49,6 +53,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_val.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_val.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_branch_complete_val.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -76,6 +80,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_ack.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_ack.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_ack.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -35,6 +39,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_history.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_history.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_genMealy_predict_history.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -96,6 +100,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -30,6 +34,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_transition.cpp (revision 48) @@ -8,10 +8,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -35,6 +39,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" #include "Behavioural/include/Vhdl.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -39,6 +43,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_body.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -137,6 +141,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_declaration.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -68,6 +72,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Meta_Predictor_Glue_vhdl_testbench_transition.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -29,6 +33,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -113,6 +117,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_msg_error.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_msg_error.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_msg_error.cpp (revision 48) @@ -6,6 +6,6 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h" #include using namespace std; @@ -13,6 +13,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -45,6 +49,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_print.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" #include "Behavioural/include/XML.h" using namespace std; @@ -12,6 +12,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -84,5 +88,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters & x) { output_stream << x.print(0); @@ -93,6 +97,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -37,6 +41,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_add.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_add.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_add.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -28,6 +32,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_print.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -37,5 +41,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Statistics & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Statistics & x) { output_stream << x.print(0); @@ -46,6 +50,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_print_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_print_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_print_body.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace meta_predictor_glue { @@ -36,6 +40,11 @@ }; // end namespace meta_predictor_glue }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/Makefile (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/Makefile (revision 48) @@ -8,5 +8,5 @@ #-----[ Directory ]---------------------------------------- -DIR_MORPHEO = ../../../../.. +DIR_MORPHEO = ../../../../../../../.. LIBRARY = $(Meta_Predictor_LIBRARY) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h (revision 48) @@ -14,13 +14,13 @@ #include -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" using namespace std; using namespace morpheo; using namespace morpheo::behavioural; -using namespace morpheo::behavioural::stage_1_ifetch; -using namespace morpheo::behavioural::stage_1_ifetch::predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor; + +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor; void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters param); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters param); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/main.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/main.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/main.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h" #define NB_PARAMS 25 @@ -86,5 +86,5 @@ try { - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters param (have_meta_predictor , + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters param (have_meta_predictor , predictor_0_have_bht , predictor_0_bht_size_shifter , Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/test.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/test.cpp (revision 48) @@ -9,9 +9,9 @@ #define NB_ITERATION 1 -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h" #include "Common/include/Test.h" void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters _param) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters _param) { cout << "<" << name << "> : Simulation SystemC" << endl; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.defs =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.defs (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.defs (revision 48) @@ -8,4 +8,4 @@ #-----[ Directory ]---------------------------------------- -DIR_COMPONENT_MORPHEO = ../../../../../.. +DIR_COMPONENT_MORPHEO = ../../../../../../../../.. DIR_MORPHEO = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps (revision 48) @@ -26,5 +26,5 @@ $(Behavioural_LIBRARY) -Branch_History_Table_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/lib \ +Branch_History_Table_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/lib \ $(RegisterFile_Monolithic_DIR_LIBRARY) \ $(Shifter_DIR_LIBRARY) \ @@ -34,12 +34,14 @@ Branch_History_Table_library : - @$(MAKE) Behavioural_library - @$(MAKE) Shifter_library - @$(MAKE) RegisterFile_Monolithic_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile + @\ + $(MAKE) Behavioural_library;\ + $(MAKE) Shifter_library;\ + $(MAKE) RegisterFile_Monolithic_library;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile; Branch_History_Table_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) Shifter_library_clean - @$(MAKE) RegisterFile_Monolithic_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean;\ + $(MAKE) Shifter_library_clean;\ + $(MAKE) RegisterFile_Monolithic_library_clean;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/Makefile (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/Makefile (revision 48) @@ -8,5 +8,5 @@ #-----[ Directory ]---------------------------------------- -DIR_MORPHEO = ../../../../../../.. +DIR_MORPHEO = ../../../../../../../../../.. LIBRARY = $(Branch_History_Table_LIBRARY) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h (revision 48) @@ -14,16 +14,16 @@ #include -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" using namespace std; using namespace morpheo; using namespace morpheo::behavioural; -using namespace morpheo::behavioural::stage_1_ifetch; -using namespace morpheo::behavioural::stage_1_ifetch::predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor; + +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table; void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/src/main.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/src/main.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/src/main.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h" #define NB_PARAMS 4 @@ -37,5 +37,5 @@ const uint32_t nb_branch_complete = atoi(argv[5]); - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param (size_shifter , + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param (size_shifter , nb_shifter , nb_prediction , Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/src/test.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/src/test.cpp (revision 48) @@ -9,10 +9,10 @@ #define NB_ITERATION 1024 -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h" #include "Common/include/BitManipulation.h" #include "Common/include/Test.h" void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param) { cout << "<" << name << "> : Simulation SystemC" << endl; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/doc/Branch_History_Table.tex =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/doc/Branch_History_Table.tex (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/doc/Branch_History_Table.tex (revision 48) @@ -5,5 +5,5 @@ % Package de variables d'environnement : Titre, command etc ... -\usepackage{../../../../../../../Behavioural/doc/sty/doc-style} +\usepackage{../../../../../../../../../../Behavioural/doc/sty/doc-style} \usepackage{sty/header} Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h /* @@ -19,8 +19,8 @@ #include "Behavioural/Generic/Shifter/include/Shifter.h" #include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h" #ifdef STATISTICS -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" #endif #ifdef VHDL @@ -33,6 +33,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -130,6 +134,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h /* @@ -18,6 +18,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -48,5 +52,5 @@ public : string print (uint32_t depth); public : friend ostream& operator<< (ostream& output_stream, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x); }; @@ -54,6 +58,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h (revision 48) @@ -1,5 +1,5 @@ #ifdef STATISTICS -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h /* @@ -16,5 +16,5 @@ #include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Statistics.h" //#include "Behavioural/Generic/Group/include/Statistics.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" //using namespace morpheo::behavioural::generic::group; @@ -22,6 +22,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -56,6 +60,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h (revision 48) @@ -1,5 +1,5 @@ #ifdef SYSTEMC -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h /* @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -26,6 +30,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -25,5 +29,5 @@ morpheo::behavioural::Parameters_Statistics param_statistics, #endif - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param ): + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param ): _name (name) ,_param (param) @@ -87,6 +91,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_allocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_allocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -206,6 +210,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_deallocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_deallocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_deallocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -43,6 +47,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -29,6 +33,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_transition.cpp (revision 48) @@ -8,10 +8,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -33,6 +37,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" #include "Behavioural/include/Vhdl.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -37,6 +41,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_body.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -25,6 +29,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_declaration.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_declaration.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_declaration.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -24,6 +28,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_testbench_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_testbench_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Branch_History_Table_vhdl_testbench_transition.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -28,6 +32,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -73,6 +77,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters_msg_error.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters_msg_error.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters_msg_error.cpp (revision 48) @@ -6,6 +6,6 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h" #include using namespace std; @@ -13,6 +13,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -48,6 +52,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Parameters_print.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" #include using namespace std; @@ -12,6 +12,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -36,5 +40,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x) { output_stream << x.print(0); @@ -46,6 +50,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -35,6 +39,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_add.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_add.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_add.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -28,6 +32,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_print.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" #include using namespace std; @@ -13,6 +13,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -39,5 +43,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Statistics & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Statistics & x) { output_stream << x.print(0); @@ -49,6 +53,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_print_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_print_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/src/Statistics_print_body.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -33,6 +37,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.defs =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.defs (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.defs (revision 48) @@ -8,4 +8,4 @@ #-----[ Directory ]---------------------------------------- -DIR_COMPONENT_MORPHEO = ../../../../.. +DIR_COMPONENT_MORPHEO = ../../../../../../../.. DIR_MORPHEO = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps (revision 48) @@ -12,11 +12,11 @@ endif ifndef Branch_History_Table -include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps +include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps endif ifndef Pattern_History_Table -include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps +include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps endif ifndef Two_Level_Branch_Predictor_Glue -include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.deps +include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.deps endif @@ -30,5 +30,5 @@ $(Behavioural_LIBRARY) -Two_Level_Branch_Predictor_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/lib \ +Two_Level_Branch_Predictor_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/lib \ $(Two_Level_Branch_Predictor_Glue_DIR_LIBRARY) \ $(Branch_History_Table_DIR_LIBRARY) \ @@ -39,14 +39,16 @@ Two_Level_Branch_Predictor_library : - @$(MAKE) Behavioural_library - @$(MAKE) Branch_History_Table_library - @$(MAKE) Pattern_History_Table_library - @$(MAKE) Two_Level_Branch_Predictor_Glue_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile + @\ + $(MAKE) Behavioural_library;\ + $(MAKE) Branch_History_Table_library;\ + $(MAKE) Pattern_History_Table_library;\ + $(MAKE) Two_Level_Branch_Predictor_Glue_library;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile ; Two_Level_Branch_Predictor_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) Branch_History_Table_library_clean - @$(MAKE) Pattern_History_Table_library_clean - @$(MAKE) Two_Level_Branch_Predictor_Glue_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean;\ + $(MAKE) Branch_History_Table_library_clean;\ + $(MAKE) Pattern_History_Table_library_clean;\ + $(MAKE) Two_Level_Branch_Predictor_Glue_library_clean;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.defs =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.defs (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.defs (revision 48) @@ -8,4 +8,4 @@ #-----[ Directory ]---------------------------------------- -DIR_COMPONENT_MORPHEO = ../../../../../.. +DIR_COMPONENT_MORPHEO = ../../../../../../../../.. DIR_MORPHEO = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps (revision 48) @@ -26,5 +26,5 @@ $(Behavioural_LIBRARY) -Pattern_History_Table_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/lib \ +Pattern_History_Table_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/lib \ $(RegisterFile_Monolithic_DIR_LIBRARY) \ $(Counter_DIR_LIBRARY) \ @@ -34,12 +34,14 @@ Pattern_History_Table_library : - @$(MAKE) Behavioural_library - @$(MAKE) Counter_library - @$(MAKE) RegisterFile_Monolithic_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile + @\ + $(MAKE) Behavioural_library;\ + $(MAKE) Counter_library;\ + $(MAKE) RegisterFile_Monolithic_library;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile; Pattern_History_Table_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) Counter_library_clean - @$(MAKE) RegisterFile_Monolithic_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean;\ + $(MAKE) Counter_library_clean;\ + $(MAKE) RegisterFile_Monolithic_library_clean;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/Makefile (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/Makefile (revision 48) @@ -8,5 +8,5 @@ #-----[ Directory ]---------------------------------------- -DIR_MORPHEO = ../../../../../../.. +DIR_MORPHEO = ../../../../../../../../../.. LIBRARY = $(Pattern_History_Table_LIBRARY) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h (revision 48) @@ -14,16 +14,16 @@ #include -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" using namespace std; using namespace morpheo; using namespace morpheo::behavioural; -using namespace morpheo::behavioural::stage_1_ifetch; -using namespace morpheo::behavioural::stage_1_ifetch::predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor; + +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table; void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/src/main.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/src/main.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/src/main.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h" #define NB_PARAMS 4 @@ -37,5 +37,5 @@ const uint32_t nb_branch_complete = atoi(argv[5]); - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param (size_counter , + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param (size_counter , nb_counter , nb_prediction , Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/src/test.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/src/test.cpp (revision 48) @@ -9,9 +9,9 @@ #define NB_ITERATION 512 -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h" #include "Common/include/Test.h" void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param) { cout << "<" << name << "> : Simulation SystemC" << endl; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/doc/Pattern_History_Table.tex =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/doc/Pattern_History_Table.tex (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/doc/Pattern_History_Table.tex (revision 48) @@ -5,5 +5,5 @@ % Package de variables d'environnement : Titre, command etc ... -\usepackage{../../../../../../../Behavioural/doc/sty/doc-style} +\usepackage{../../../../../../../../../../Behavioural/doc/sty/doc-style} \usepackage{sty/header} Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h /* @@ -18,6 +18,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -48,5 +52,5 @@ public : string print (uint32_t depth); public : friend ostream& operator<< (ostream& output_stream, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x); }; @@ -54,6 +58,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h /* @@ -21,8 +21,8 @@ #include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h" #ifdef STATISTICS -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" #endif #ifdef VHDL @@ -35,6 +35,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -135,6 +139,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h (revision 48) @@ -1,5 +1,5 @@ #ifdef STATISTICS -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h /* @@ -16,5 +16,5 @@ #include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Statistics.h" //#include "Behavioural/Generic/Group/include/Statistics.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" //using namespace morpheo::behavioural::generic::group; @@ -22,6 +22,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -56,6 +60,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h (revision 48) @@ -1,5 +1,5 @@ #ifdef SYSTEMC -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h /* @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -26,6 +30,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -71,6 +75,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters_msg_error.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters_msg_error.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters_msg_error.cpp (revision 48) @@ -6,6 +6,6 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h" #include using namespace std; @@ -13,6 +13,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -52,6 +56,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Parameters_print.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" #include using namespace std; @@ -12,6 +12,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -40,5 +44,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x) { output_stream << x.print(0); @@ -50,6 +54,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -25,5 +29,5 @@ morpheo::behavioural::Parameters_Statistics param_statistics, #endif - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param ): + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param ): _name (name) ,_param (param) @@ -91,6 +95,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_allocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_allocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -210,6 +214,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_deallocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_deallocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_deallocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -48,6 +52,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -35,6 +39,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_transition.cpp (revision 48) @@ -8,10 +8,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -37,6 +41,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" #include "Behavioural/include/Vhdl.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -42,6 +46,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_body.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -35,6 +39,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_declaration.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_declaration.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_declaration.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -28,6 +32,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_testbench_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_testbench_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Pattern_History_Table_vhdl_testbench_transition.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -32,6 +36,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -39,6 +43,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_add.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_add.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_add.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -30,6 +34,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_print.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -52,5 +56,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Statistics & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Statistics & x) { output_stream << x.print(0); @@ -62,6 +66,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_print_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_print_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/src/Statistics_print_body.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -38,6 +42,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/Makefile (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/Makefile (revision 48) @@ -8,6 +8,5 @@ #-----[ Directory ]---------------------------------------- -DIR_MORPHEO = ../../../../../.. - +DIR_MORPHEO = ../../../../../../../../.. LIBRARY = $(Two_Level_Branch_Predictor_LIBRARY) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h (revision 48) @@ -14,15 +14,15 @@ #include -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" using namespace std; using namespace morpheo; using namespace morpheo::behavioural; -using namespace morpheo::behavioural::stage_1_ifetch; -using namespace morpheo::behavioural::stage_1_ifetch::predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor; + +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor; void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/main.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/main.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/main.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h" #define NB_PARAMS 10 @@ -53,5 +53,5 @@ try { - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param (have_bht , + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param (have_bht , bht_size_shifter , bht_nb_shifter , Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/src/test.cpp (revision 48) @@ -9,9 +9,9 @@ #define NB_ITERATION 512 -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h" #include "Common/include/Test.h" #include "Common/include/BitManipulation.h" void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param) { cout << "<" << name << "> : Simulation SystemC" << endl; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.defs =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.defs (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.defs (revision 48) @@ -8,4 +8,4 @@ #-----[ Directory ]---------------------------------------- -DIR_COMPONENT_MORPHEO = ../../../../../.. +DIR_COMPONENT_MORPHEO = ../../../../../../../../.. DIR_MORPHEO = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.deps (revision 48) @@ -18,5 +18,5 @@ $(Behavioural_LIBRARY) -Two_Level_Branch_Predictor_Glue_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/lib \ +Two_Level_Branch_Predictor_Glue_DIR_LIBRARY = -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/lib \ $(Behavioural_DIR_LIBRARY) @@ -24,8 +24,10 @@ Two_Level_Branch_Predictor_Glue_library : - @$(MAKE) Behavioural_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile + @\ + $(MAKE) Behavioural_library;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile; Two_Level_Branch_Predictor_Glue_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/Makefile (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/Makefile (revision 48) @@ -8,5 +8,5 @@ #-----[ Directory ]---------------------------------------- -DIR_MORPHEO = ../../../../../../.. +DIR_MORPHEO = ../../../../../../../../../.. LIBRARY = $(Two_Level_Branch_Predictor_Glue_LIBRARY) Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h (revision 48) @@ -14,16 +14,16 @@ #include -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" using namespace std; using namespace morpheo; using namespace morpheo::behavioural; -using namespace morpheo::behavioural::stage_1_ifetch; -using namespace morpheo::behavioural::stage_1_ifetch::predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor; -using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor; +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor; + +using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue; void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param); Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/src/main.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/src/main.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/src/main.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h" #define NB_PARAMS 9 @@ -46,5 +46,5 @@ const uint32_t nb_branch_complete = atoi(argv[10]); - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param (have_bht , + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param (have_bht , bht_size_history , bht_size_address , Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/src/test.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/src/test.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/src/test.cpp (revision 48) @@ -9,10 +9,10 @@ #define NB_ITERATION 64 -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h" #include "Common/include/BitManipulation.h" #include "Common/include/Test.h" void test (string name, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param) { cout << "<" << name << "> : Simulation SystemC" << endl; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/doc/Two_Level_Branch_Predictor_Glue.tex =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/doc/Two_Level_Branch_Predictor_Glue.tex (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/doc/Two_Level_Branch_Predictor_Glue.tex (revision 48) @@ -5,5 +5,5 @@ % Package de variables d'environnement : Titre, command etc ... -\usepackage{../../../../../../../Behavioural/doc/sty/doc-style} +\usepackage{../../../../../../../../../../Behavioural/doc/sty/doc-style} \usepackage{sty/header} Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h /* @@ -15,6 +15,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -54,5 +58,5 @@ public : string print (uint32_t depth); public : friend ostream& operator<< (ostream& output_stream, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x); }; @@ -60,6 +64,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h (revision 48) @@ -1,5 +1,5 @@ #ifdef STATISTICS -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h /* @@ -14,5 +14,5 @@ #include "Behavioural/include/Parameters_Statistics.h" //#include "Behavioural/Generic/Group/include/Statistics.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" //using namespace morpheo::behavioural::generic::group; @@ -20,6 +20,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -52,6 +56,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Two_Level_Branch_Predictor_Glue_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Two_Level_Branch_Predictor_Glue_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Two_Level_Branch_Predictor_Glue_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Two_Level_Branch_Predictor_Glue_h /* @@ -17,8 +17,8 @@ #include "Common/include/Debug.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h" #ifdef STATISTICS -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" #endif #ifdef VHDL @@ -31,6 +31,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -140,6 +144,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h (revision 48) @@ -1,5 +1,5 @@ #ifdef SYSTEMC -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Type_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Type_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Type_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Type_h /* @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -26,6 +30,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -68,6 +72,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters_msg_error.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters_msg_error.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters_msg_error.cpp (revision 48) @@ -6,6 +6,6 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h" #include using namespace std; @@ -13,6 +13,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -47,6 +51,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Parameters_print.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" #include using namespace std; @@ -12,6 +12,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -43,5 +47,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x) { output_stream << x.print(0); @@ -53,6 +57,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -39,6 +43,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_add.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_add.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_add.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -30,6 +34,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_print.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -38,5 +42,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Statistics & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Statistics & x) { output_stream << x.print(0); @@ -48,6 +52,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_print_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_print_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Statistics_print_body.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -38,6 +42,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -25,5 +29,5 @@ morpheo::behavioural::Parameters_Statistics param_statistics, #endif - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param ): + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param ): _name (name) ,_param (param) @@ -199,6 +203,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_allocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_allocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -147,6 +151,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_deallocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_deallocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_deallocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -65,6 +69,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_ack.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_ack.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_ack.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" #include "Common/include/BitManipulation.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -37,6 +41,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_bht_address.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_bht_address.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_bht_address.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" #include "Common/include/BitManipulation.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -37,6 +41,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_pht_address.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_pht_address.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_branch_complete_pht_address.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" #include "Common/include/BitManipulation.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -48,6 +52,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_ack.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_ack.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_ack.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" #include "Common/include/BitManipulation.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -37,6 +41,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_bht_address.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_bht_address.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_bht_address.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" #include "Common/include/BitManipulation.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -38,6 +42,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_pht_address.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_pht_address.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_genMealy_predict_pht_address.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" #include "Common/include/BitManipulation.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -44,6 +48,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -32,6 +36,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_transition.cpp (revision 48) @@ -8,10 +8,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -37,6 +41,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" #include "Behavioural/include/Vhdl.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -42,6 +46,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_body.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -153,6 +157,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_declaration.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_declaration.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_declaration.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -27,6 +31,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_testbench_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_testbench_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/src/Two_Level_Branch_Predictor_Glue_vhdl_testbench_transition.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -32,6 +36,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/Two_Level_Branch_Predictor.tex =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/Two_Level_Branch_Predictor.tex (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/doc/Two_Level_Branch_Predictor.tex (revision 48) @@ -5,5 +5,5 @@ % Package de variables d'environnement : Titre, command etc ... -\usepackage{../../../../../../Behavioural/doc/sty/doc-style} +\usepackage{../../../../../../../../../Behavioural/doc/sty/doc-style} \usepackage{sty/header} Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Parameters_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Parameters_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Parameters_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Parameters_h /* @@ -12,13 +12,17 @@ #include "Behavioural/include/Parameters.h" // Internal structure -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h" #include namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -42,7 +46,7 @@ public : const uint32_t _pht_size_address ; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters * _param_branch_history_table; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters * _param_pattern_history_table; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters * _param_two_level_branch_predictor_glue; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters * _param_branch_history_table; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters * _param_pattern_history_table; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters * _param_two_level_branch_predictor_glue; //-----[ methods ]----------------------------------------------------------- @@ -65,11 +69,16 @@ public : string print (uint32_t depth); public : friend ostream& operator<< (ostream& output_stream, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters & x); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters & x); }; }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h (revision 48) @@ -1,5 +1,5 @@ #ifdef STATISTICS -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Statistics_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Statistics_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Statistics_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Statistics_h /* @@ -12,11 +12,11 @@ #include "Common/include/Debug.h" // Internal structure -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h" #include "Behavioural/include/Statistics.h" #include "Behavioural/include/Parameters_Statistics.h" //#include "Behavioural/Generic/Group/include/Statistics.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" //using namespace morpheo::behavioural::generic::group; @@ -24,6 +24,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -57,6 +61,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h /* @@ -18,12 +18,12 @@ // Internal structure -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h" #ifdef STATISTICS -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" #endif #ifdef VHDL @@ -36,6 +36,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -98,7 +102,7 @@ // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - protected : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Branch_History_Table * component_Branch_History_Table; - protected : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Pattern_History_Table * component_Pattern_History_Table; - protected : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Two_Level_Branch_Predictor_Glue * component_Two_Level_Branch_Predictor_Glue; + protected : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Branch_History_Table * component_Branch_History_Table; + protected : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Pattern_History_Table * component_Pattern_History_Table; + protected : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Two_Level_Branch_Predictor_Glue * component_Two_Level_Branch_Predictor_Glue; // -----[ methods ]--------------------------------------------------- @@ -145,6 +149,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h (revision 48) @@ -1,5 +1,5 @@ #ifdef SYSTEMC -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Type_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Type_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Type_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Type_h /* @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -25,6 +29,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -42,10 +46,10 @@ if (_have_bht) - _param_branch_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter , + _param_branch_history_table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter , _bht_nb_shifter , _nb_prediction , _nb_branch_complete); if (_have_pht) - _param_pattern_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter , + _param_pattern_history_table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter , _pht_nb_counter , _nb_prediction , @@ -53,5 +57,5 @@ - _param_two_level_branch_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters (_have_bht , + _param_two_level_branch_predictor_glue = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters (_have_bht , _bht_size_shifter , _bht_size_address , @@ -85,15 +89,15 @@ if (_have_bht) - _param_branch_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter , + _param_branch_history_table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter , _bht_nb_shifter , _nb_prediction , _nb_branch_complete); if (_have_pht) - _param_pattern_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter , + _param_pattern_history_table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter , _pht_nb_counter , _nb_prediction , _nb_branch_complete); - _param_two_level_branch_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters (_have_bht , + _param_two_level_branch_predictor_glue = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters (_have_bht , _bht_size_shifter , _bht_size_address , @@ -123,6 +127,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_msg_error.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_msg_error.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_msg_error.cpp (revision 48) @@ -6,6 +6,6 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h" #include using namespace std; @@ -13,6 +13,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -79,6 +83,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters_print.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" #include using namespace std; @@ -12,6 +12,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -48,5 +52,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters & x) { output_stream << x.print(0); @@ -57,6 +61,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -37,6 +41,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_add.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_add.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_add.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -28,6 +32,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_print.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -44,5 +48,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Statistics & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Statistics & x) { output_stream << x.print(0); @@ -53,6 +57,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_print_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_print_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics_print_body.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -36,6 +40,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -24,5 +28,5 @@ morpheo::behavioural::Parameters_Statistics param_statistics, #endif - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param ): + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param ): _name (name) ,_param (param) @@ -87,6 +91,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_allocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_allocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -113,5 +117,5 @@ name_component = _name+"_Branch_History_Table"; - component_Branch_History_Table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Branch_History_Table (name_component.c_str() + component_Branch_History_Table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table ::Branch_History_Table (name_component.c_str() #ifdef STATISTICS ,_param_statistics @@ -134,5 +138,5 @@ name_component = _name+"_Pattern_History_Table"; - component_Pattern_History_Table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table ::Pattern_History_Table (name_component.c_str() + component_Pattern_History_Table = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table ::Pattern_History_Table (name_component.c_str() #ifdef STATISTICS ,_param_statistics @@ -154,5 +158,5 @@ name_component = _name+"_Two_Level_Branch_Predictor_Glue"; - component_Two_Level_Branch_Predictor_Glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Two_Level_Branch_Predictor_Glue (name_component.c_str() + component_Two_Level_Branch_Predictor_Glue = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Two_Level_Branch_Predictor_Glue (name_component.c_str() #ifdef STATISTICS ,_param_statistics @@ -297,6 +301,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_deallocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_deallocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_deallocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -54,6 +58,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_statistics.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -38,6 +42,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_transition.cpp (revision 48) @@ -8,10 +8,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -35,6 +39,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" #include "Behavioural/include/Vhdl.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -40,6 +44,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_body.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -27,6 +31,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_declaration.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_declaration.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_declaration.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -26,6 +30,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_testbench_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_testbench_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Two_Level_Branch_Predictor_vhdl_testbench_transition.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { namespace two_level_branch_predictor { @@ -30,6 +34,11 @@ }; // end namespace two_level_branch_predictor }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Meta_Predictor.tex =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Meta_Predictor.tex (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Meta_Predictor.tex (revision 48) @@ -5,5 +5,5 @@ % Package de variables d'environnement : Titre, command etc ... -\usepackage{../../../../../Behavioural/doc/sty/doc-style} +\usepackage{../../../../../../../../Behavioural/doc/sty/doc-style} \usepackage{sty/header} Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Meta_Predictor_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Meta_Predictor_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Meta_Predictor_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Meta_Predictor_h /* @@ -18,11 +18,11 @@ // Internal structure -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Types.h" #ifdef STATISTICS -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h" #endif #ifdef VHDL @@ -35,6 +35,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -82,8 +86,8 @@ // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_0; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_1; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_2; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Meta_Predictor_Glue * component_Meta_Predictor_Glue ; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_0; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_1; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_2; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Meta_Predictor_Glue * component_Meta_Predictor_Glue ; // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -96,10 +100,10 @@ private : SC_SIGNAL(Tcontrol_t) ** signal_PREDICT_PREDICTOR_2_ACK ; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_0_BHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_0_PHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_1_BHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_1_PHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_2_BHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_2_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_0_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_0_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_1_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_1_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_2_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_2_PHT_HISTORY; @@ -110,10 +114,10 @@ private : SC_SIGNAL(Tcontrol_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY; - private : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_0_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_0_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_1_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_1_PHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_BHT_HISTORY; + private : SC_SIGNAL(morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_BRANCH_COMPLETE_PREDICTOR_2_PHT_HISTORY; #endif @@ -161,6 +165,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Parameters_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Parameters_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Parameters_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Parameters_h /* @@ -11,12 +11,16 @@ #include "Common/include/Debug.h" #include "Behavioural/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h" #include namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -56,8 +60,8 @@ public : const uint32_t _size_history ; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_0; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_1; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_2; - public : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters * _param_meta_predictor_glue; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_0; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_1; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_2; + public : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters * _param_meta_predictor_glue; //-----[ methods ]----------------------------------------------------------- @@ -98,10 +102,15 @@ public : string print (uint32_t depth); public : friend ostream& operator<< (ostream& output_stream, - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters & x); + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters & x); }; }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h (revision 48) @@ -1,5 +1,5 @@ #ifdef STATISTICS -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Statistics_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Statistics_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Statistics_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Statistics_h /* @@ -14,5 +14,5 @@ #include "Behavioural/include/Parameters_Statistics.h" //#include "Behavioural/Generic/Group/include/Statistics.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h" //using namespace morpheo::behavioural::generic::group; @@ -20,6 +20,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -49,6 +53,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Types.h =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Types.h (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Types.h (revision 48) @@ -1,4 +1,4 @@ -#ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Type_h -#define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Type_h +#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Type_h +#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Type_h /* @@ -13,6 +13,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -21,6 +25,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -23,5 +27,5 @@ morpheo::behavioural::Parameters_Statistics param_statistics, #endif - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters param ): + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters param ): _name (name) ,_param (param) @@ -81,6 +85,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_allocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_allocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_allocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -104,5 +108,5 @@ log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str()); - component_Meta_Predictor_Glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Meta_Predictor_Glue (name_component.c_str() , + component_Meta_Predictor_Glue = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Meta_Predictor_Glue (name_component.c_str() , #ifdef STATISTICS _param_statistics , @@ -127,5 +131,5 @@ log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str()); - component_Two_Level_Branch_Predictor_2 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor ::Two_Level_Branch_Predictor (name_component.c_str() , + component_Two_Level_Branch_Predictor_2 = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor ::Two_Level_Branch_Predictor (name_component.c_str() , #ifdef STATISTICS _param_statistics , @@ -153,5 +157,5 @@ log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str()); - component_Two_Level_Branch_Predictor_1 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor ::Two_Level_Branch_Predictor (name_component.c_str() , + component_Two_Level_Branch_Predictor_1 = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor ::Two_Level_Branch_Predictor (name_component.c_str() , #ifdef STATISTICS _param_statistics , @@ -174,5 +178,5 @@ log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str()); - component_Two_Level_Branch_Predictor_0 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor ::Two_Level_Branch_Predictor (name_component.c_str() , + component_Two_Level_Branch_Predictor_0 = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor ::Two_Level_Branch_Predictor (name_component.c_str() , #ifdef STATISTICS _param_statistics , @@ -431,6 +435,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_deallocation.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_deallocation.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_deallocation.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -49,6 +53,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -37,6 +41,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_transition.cpp (revision 48) @@ -8,10 +8,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -33,6 +37,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl.cpp (revision 48) @@ -7,11 +7,15 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" #include "Behavioural/include/Vhdl.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -38,6 +42,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_body.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -24,6 +28,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_declaration.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_declaration.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_declaration.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -24,6 +28,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_transition.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_transition.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_transition.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -28,6 +32,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters.cpp (revision 48) @@ -6,10 +6,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -81,5 +85,5 @@ if (_have_meta_predictor) { - _param_two_level_branch_predictor_0 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_0_have_bht , + _param_two_level_branch_predictor_0 = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters (_predictor_0_have_bht , _predictor_0_bht_size_shifter , _predictor_0_bht_nb_shifter , @@ -92,5 +96,5 @@ _nb_branch_complete ); - _param_two_level_branch_predictor_1 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_1_have_bht , + _param_two_level_branch_predictor_1 = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters (_predictor_1_have_bht , _predictor_1_bht_size_shifter , _predictor_1_bht_nb_shifter , @@ -104,5 +108,5 @@ } - _param_two_level_branch_predictor_2 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_2_have_bht , + _param_two_level_branch_predictor_2 = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters (_predictor_2_have_bht , _predictor_2_bht_size_shifter , _predictor_2_bht_nb_shifter , @@ -116,5 +120,5 @@ - _param_meta_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters (_have_meta_predictor , + _param_meta_predictor_glue = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters (_have_meta_predictor , _predictor_0_have_bht , _predictor_0_bht_size_shifter , @@ -175,5 +179,5 @@ if (_have_meta_predictor) { - _param_two_level_branch_predictor_0 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_0_have_bht , + _param_two_level_branch_predictor_0 = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters (_predictor_0_have_bht , _predictor_0_bht_size_shifter , _predictor_0_bht_nb_shifter , @@ -186,5 +190,5 @@ _nb_branch_complete ); - _param_two_level_branch_predictor_1 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_1_have_bht , + _param_two_level_branch_predictor_1 = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters (_predictor_1_have_bht , _predictor_1_bht_size_shifter , _predictor_1_bht_nb_shifter , @@ -198,5 +202,5 @@ } - _param_two_level_branch_predictor_2 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_2_have_bht , + _param_two_level_branch_predictor_2 = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters (_predictor_2_have_bht , _predictor_2_bht_size_shifter , _predictor_2_bht_nb_shifter , @@ -209,5 +213,5 @@ _nb_branch_complete ); - _param_meta_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters (_have_meta_predictor , + _param_meta_predictor_glue = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters (_have_meta_predictor , _predictor_0_have_bht , _predictor_0_bht_size_shifter , @@ -245,6 +249,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_msg_error.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_msg_error.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_msg_error.cpp (revision 48) @@ -6,6 +6,6 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Types.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Types.h" #include using namespace std; @@ -13,6 +13,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -43,6 +47,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_print.cpp (revision 48) @@ -6,5 +6,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h" #include "Behavioural/include/XML.h" using namespace std; @@ -12,6 +12,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -132,5 +136,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters & x) { output_stream << x.print(0); @@ -140,6 +144,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural }; // end namespace morpheo Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics.cpp (revision 48) @@ -7,10 +7,14 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h" namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -35,6 +39,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_add.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_add.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_add.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -26,6 +30,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_print.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_print.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_print.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -43,5 +47,5 @@ ostream& operator<< (ostream& output_stream , - morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Statistics & x) + morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Statistics & x) { output_stream << x.print(0); @@ -51,6 +55,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_print_body.cpp =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_print_body.cpp (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_print_body.cpp (revision 48) @@ -7,5 +7,5 @@ */ -#include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h" +#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h" #include @@ -14,6 +14,10 @@ namespace morpheo { namespace behavioural { -namespace stage_1_ifetch { -namespace predictor { +namespace core { +namespace multi_front_end { +namespace front_end { +namespace prediction_unit { +namespace direction { + namespace meta_predictor { @@ -34,6 +38,11 @@ }; // end namespace meta_predictor -}; // end namespace predictor -}; // end namespace stage_1_ifetch + +}; // end namespace core +}; // end namespace multi_front_end +}; // end namespace front_end +}; // end namespace prediction_unit +}; // end namespace direction + }; // end namespace behavioural Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/Makefile.deps (revision 48) @@ -24,8 +24,10 @@ Counter_library : - @$(MAKE) Behavioural_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Counter --makefile=Makefile + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Counter --makefile=Makefile; Counter_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Counter --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Counter --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Group/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Group/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Group/Makefile.deps (revision 48) @@ -24,8 +24,10 @@ Group_library : - @$(MAKE) Behavioural_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Group --makefile=Makefile + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Group --makefile=Makefile ; Group_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Group --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Group --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/Makefile.deps (revision 48) @@ -28,10 +28,12 @@ RegisterFile_Monolithic_library : - @$(MAKE) Behavioural_library - @$(MAKE) Group_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic --makefile=Makefile + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) Group_library; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic --makefile=Makefile; RegisterFile_Monolithic_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) Group_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) Group_library_clean; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/Makefile.deps (revision 48) @@ -24,8 +24,10 @@ RegisterFile_Multi_Banked_library : - @$(MAKE) Behavioural_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked --makefile=Makefile + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked --makefile=Makefile ; RegisterFile_Multi_Banked_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/Makefile.deps (revision 48) @@ -24,8 +24,10 @@ RegisterFile_Multi_Banked_Glue_library : - @$(MAKE) Behavioural_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue --makefile=Makefile + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue --makefile=Makefile ; RegisterFile_Multi_Banked_Glue_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/Makefile.deps (revision 48) @@ -24,8 +24,10 @@ Select_Priority_Fixed_library : - @$(MAKE) Behavioural_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Select/Select_Priority_Fixed --makefile=Makefile + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Select/Select_Priority_Fixed --makefile=Makefile; Select_Priority_Fixed_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Select/Select_Priority_Fixed --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Select/Select_Priority_Fixed --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/Makefile.deps (revision 48) @@ -24,8 +24,10 @@ Shifter_library : - @$(MAKE) Behavioural_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Shifter --makefile=Makefile + @\ + $(MAKE) Behavioural_library;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Shifter --makefile=Makefile; Shifter_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Shifter --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean;\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Shifter --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/Makefile.deps (revision 48) @@ -28,10 +28,12 @@ Victim_Pseudo_LRU_library : - @$(MAKE) Behavioural_library - @$(MAKE) Group_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) Group_library; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile; Victim_Pseudo_LRU_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) Group_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) Group_library_clean; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common (revision 48) @@ -66,22 +66,26 @@ $(DIR_OBJ)/%.o : $(DIR_SRC)/%.cpp $(HEADERS) - @$(ECHO) "Compilation : $*" - $(CXX) $(CFLAGS) -c -o $@ $< + @\ + $(ECHO) "Compilation : $*";\ + $(CXX) $(CFLAGS) -c -o $@ $<; $(DIR_OBJ) : - @$(ECHO) "Create directory : $@" - @$(MKDIR) $@ + @\ + $(ECHO) "Create directory : $@";\ + $(MKDIR) $@ common_clean : - @$(ECHO) "Delete temporary files in directory "$(PWD) - @$(RM) $(DIR_OBJ) \ + @\ + $(ECHO) "Delete temporary files in directory "$(PWD);\ + $(RM) $(DIR_OBJ) \ $(DIR_BIN) \ *~ \ $(DIR_SRC)/*~ \ - $(DIR_INC)/*~ + $(DIR_INC)/*~; common_help : - @$(ECHO) " -----[ Common ]-------------------------------------" - @$(ECHO) "" - @$(ECHO) " * test_env : test if environnment's variable is set" - @$(ECHO) "" + @\ + $(ECHO) " -----[ Common ]-------------------------------------";\ + $(ECHO) "";\ + $(ECHO) " * test_env : test if environnment's variable is set";\ + $(ECHO) ""; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Component =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Component (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Component (revision 48) @@ -15,11 +15,13 @@ $(DIR_LIB)/%.a : $(OBJECTS) $(HEADERS) - @$(ECHO) "Archive : $*" - @$(AR) -r $@ $(OBJECTS) - @$(RANLIB) $@ + @\ + $(ECHO) "Archive : $*";\ + $(AR) -r $@ $(OBJECTS);\ + $(RANLIB) $@; $(DIR_LIB) : - @$(ECHO) "Create directory : $@" - @$(MKDIR) $@ + @\ + $(ECHO) "Create directory : $@";\ + $(MKDIR) $@; document : @@ -30,18 +32,22 @@ component_help : - @$(ECHO) " -----[ Component ]----------------------------------" - @$(ECHO) "" - @$(ECHO) " * all_component : compile all c++ file and generate library" - @$(ECHO) " * document : Generate documantation" - @$(ECHO) " * clean : Erase all generate files" - @$(ECHO) " * help : print this text" - @$(ECHO) "" + @\ + $(ECHO) " -----[ Component ]----------------------------------";\ + $(ECHO) "";\ + $(ECHO) " * all_component : compile all c++ file and generate library";\ + $(ECHO) " * document : Generate documantation";\ + $(ECHO) " * clean : Erase all generate files";\ + $(ECHO) " * help : print this text";\ + $(ECHO) ""; help : - @$(MAKE) common_help - @$(MAKE) component_help + @\ + $(MAKE) common_help;\ + $(MAKE) component_help; + clean : - @$(MAKE) common_clean - @$(MAKE) component_clean - @if $(TEST) -d $(DIR_DOC); then $(MAKE) --directory=$(DIR_DOC) --makefile=Makefile clean; fi + @\ + $(MAKE) common_clean ;\ + $(MAKE) component_clean;\ + if $(TEST) -d $(DIR_DOC); then $(MAKE) --directory=$(DIR_DOC) --makefile=Makefile clean; fi; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Documentation =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Documentation (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Documentation (revision 48) @@ -31,24 +31,24 @@ #-------------------------------------------------------------------------------- %.pdf : %.ps - @$(ECHO) "Génération du fichier $*.pdf" - @$(PS2PDF) $< $@ - @#Copy at directory + @\ + $(ECHO) "Génération du fichier $*.pdf"; \ + $(PS2PDF) $< $@; %.ps : %.dvi - @$(ECHO) "Génération du fichier $*.ps" - @$(DVIPS) -o $@ $< + @\ + $(ECHO) "Génération du fichier $*.ps"; \ + $(DVIPS) -o $@ $<; %.dvi : $(DIR_TEX)/%.tex - @$(ECHO) "Génération du fichier $*.dvi" - @#touch $(patsubst %.tex,%.ind,$<) - @$(LATEX) $< - @$(LATEX) $< > /dev/null - @#$(MAKEINDEX) $(patsubst %.tex,%.idx,$<) - @citation=`$(GREP) "citation" $*.aux`; \ - if $(TEST) -n "$$citation" ; then \ - $(BIBTEX) $* ; \ - fi - @$(LATEX) $< > /dev/null - @$(LATEX) $< > /dev/null + @\ + $(ECHO) "Génération du fichier $*.dvi"; \ + $(LATEX) $<; \ + $(LATEX) $< > /dev/null; \ + citation=`$(GREP) "citation" $*.aux`; \ + if $(TEST) -n "$$citation" ; then \ + $(BIBTEX) $* ; \ + fi; \ + $(LATEX) $< > /dev/null; \ + $(LATEX) $< > /dev/null; #-------------------------------------------------------------------------------- @@ -56,14 +56,17 @@ #-------------------------------------------------------------------------------- $(DIR_SCHEMA_EPS) : - @$(ECHO) "Make directory : $@" - @$(MKDIR) $@ + @\ + $(ECHO) "Make directory : $@"; \ + $(MKDIR) $@; $(DIR_SCHEMA_EPS)/%.eps : $(DIR_SCHEMA)/%.eps $(DIR_SCHEMA_EPS) - @$(ECHO) "Generate files : $*.eps" - @$(CP) $(DIR_SCHEMA)/$*.eps $(DIR_SCHEMA_EPS) + @\ + $(ECHO) "Generate files : $*.eps"; \ + $(CP) $(DIR_SCHEMA)/$*.eps $(DIR_SCHEMA_EPS); $(DIR_SCHEMA_EPS)/%.eps : $(DIR_SCHEMA)/%.fig $(DIR_SCHEMA_EPS) - @$(ECHO) "Generate files : $*.eps" - @$(FIG2EPS) $< $@ + @\ + $(ECHO) "Generate files : $*.eps"; \ + $(FIG2EPS) $< $@; #-------------------------------------------------------------------------------- @@ -72,13 +75,15 @@ clean : - @$(ECHO) "Delete temporary files "$(PWD) - @$(RM) $(DIR_SCHEMA_EPS) - @$(RM) $(DVI_FILES) $(PS_FILES) $(PDF_FILES) - @$(MAKE) clean_rec DIR_CLEAN=. + @\ + $(ECHO) "Delete temporary files "$(PWD); \ + $(RM) $(DIR_SCHEMA_EPS); \ + $(RM) $(DVI_FILES) $(PS_FILES) $(PDF_FILES); \ + $(MAKE) clean_rec DIR_CLEAN=.; #Clean recursive clean_rec : - @$(ECHO) "Delete temporary files in directory $(DIR_CLEAN)" - @$(RM) $(DIR_CLEAN)/*~ \ + @\ + $(ECHO) "Delete temporary files in directory $(DIR_CLEAN)"; \ + $(RM) $(DIR_CLEAN)/*~ \ $(DIR_CLEAN)/*.bak \ $(DIR_CLEAN)/*.aux \ @@ -95,7 +100,6 @@ $(DIR_CLEAN)/*.nav \ $(DIR_CLEAN)/*.snm \ - $(DIR_CLEAN)/missfont.log - @# The .bbl file is to be removed if "bibtex" is used. - @for files in `$(LS) $(DIR_CLEAN)`; do \ + $(DIR_CLEAN)/missfont.log; \ + for files in `$(LS) $(DIR_CLEAN)`; do \ if $(TEST) -d $(DIR_CLEAN)/$$files; \ then \ @@ -109,8 +113,9 @@ help : - @$(ECHO) " -----[ Documentation ]------------------------------" - @$(ECHO) "" - @$(ECHO) " * all_documentation : Generate all documents" - @$(ECHO) " * clean : Erase all generate files" - @$(ECHO) " * help : Print this message" - @$(ECHO) "" + @\ + $(ECHO) " -----[ Documentation ]------------------------------";\ + $(ECHO) ""; \ + $(ECHO) " * all_documentation : Generate all documents"; \ + $(ECHO) " * clean : Erase all generate files"; \ + $(ECHO) " * help : Print this message"; \ + $(ECHO) ""; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Selftest =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Selftest (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Selftest (revision 48) @@ -30,13 +30,15 @@ all_selftest : test_env $(DIR_OBJ) $(DIR_BIN) $(DIR_LOG) - @$(MAKE) library - @$(MAKE) $(DIR_BIN)/$(EXEC).x + @\ + $(MAKE) library;\ + $(MAKE) $(DIR_BIN)/$(EXEC).x; execute : all_selftest - @$(MAKE) $(EXEC_LOG) + @$(MAKE) $(EXEC_LOG); reconfig : - @$(MAKE) config_clean - @$(MAKE) config + @\ + $(MAKE) config_clean;\ + $(MAKE) config; config_clean : @@ -44,6 +46,6 @@ config : $(DIR_CFG_GEN) - @$(ECHO) "Generate configuration" - @ \ + @\ + $(ECHO) "Generate configuration";\ declare -i CPT=0; \ declare files; \ @@ -111,6 +113,7 @@ $(DIR_LOG)/%.exec.log : $(DIR_CFG_GEN)/%.cfg $(DIR_BIN)/$(EXEC).x - @$(ECHO) "Execute : $*" - @$(EXPORT) SYSTEMC=$(SYSTEMC_$(SIMULATOR)) ; ./$(DIR_BIN)/$(EXEC).x $(EXEC_PARAMS) $* `$(CAT) $<` &> $@ + @\ + $(ECHO) "Execute : $*";\ + $(EXPORT) SYSTEMC=$(SYSTEMC_$(SIMULATOR)) ; ./$(DIR_BIN)/$(EXEC).x $(EXEC_PARAMS) $* `$(CAT) $<` &> $@ declare -i count=`$(GREP) -ch "Test OK" $@`; \ if $(TEST) $$count -ne 0; \ @@ -120,18 +123,22 @@ $(DIR_BIN)/%.x : $(OBJECTS) $(HEADERS) $(DIR_LIB) - @$(ECHO) "Linkage : $*" - $(CXX) $(LFLAGS) -o $@ $(OBJECTS) $(LIBS) + @\ + $(ECHO) "Linkage : $*";\ + $(CXX) $(LFLAGS) -o $@ $(OBJECTS) $(LIBS); $(DIR_BIN) : - @$(ECHO) "Create directory : $@" - @$(MKDIR) $@ + @\ + $(ECHO) "Create directory : $@";\ + $(MKDIR) $@; $(DIR_LOG) : - @$(ECHO) "Create directory : $@" - @$(MKDIR) $@ + @\ + $(ECHO) "Create directory : $@";\ + $(MKDIR) $@; $(DIR_CFG_GEN) : - @$(ECHO) "Create directory : $@" - @$(MKDIR) $@ + @\ + $(ECHO) "Create directory : $@";\ + $(MKDIR) $@; selftest_clean_all : library_clean @@ -144,29 +151,33 @@ *.stat \ generated_by_systemcass \ - core* + core*; selftest_help : - @$(ECHO) " -----[ Selftest ]-----------------------------------" - @$(ECHO) "" - @$(ECHO) " * all_selftest : compile all c++ file and execute" - @$(ECHO) " * execute : execute all instance" - @$(ECHO) " * config : generate configuration with configuration's file" - @$(ECHO) " * reconfig : regenerate configuration with configuration's file" - @$(ECHO) " * clean : Erase all generate files" - @$(ECHO) " * clean_all : Clean + Erase all dependant library" - @$(ECHO) " * help : print this text" - @$(ECHO) "" + @\ + $(ECHO) " -----[ Selftest ]-----------------------------------";\ + $(ECHO) "";\ + $(ECHO) " * all_selftest : compile all c++ file and execute";\ + $(ECHO) " * execute : execute all instance";\ + $(ECHO) " * config : generate configuration with configuration's file" ;\ + $(ECHO) " * reconfig : regenerate configuration with configuration's file" ;\ + $(ECHO) " * clean : Erase all generate files";\ + $(ECHO) " * clean_all : Clean + Erase all dependant library";\ + $(ECHO) " * help : print this text";\ + $(ECHO) ""; help : - @$(MAKE) common_help - @$(MAKE) synthesis_help - @$(MAKE) selftest_help + @\ + $(MAKE) common_help ;\ + $(MAKE) synthesis_help;\ + $(MAKE) selftest_help; clean : - @$(MAKE) common_clean - @$(MAKE) synthesis_clean - @$(MAKE) selftest_clean + @\ + $(MAKE) common_clean ;\ + $(MAKE) synthesis_clean ;\ + $(MAKE) selftest_clean; clean_all : - @$(MAKE) clean - @$(MAKE) selftest_clean_all + @\ + $(MAKE) clean ;\ + $(MAKE) selftest_clean_all; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Synthesis =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Synthesis (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Synthesis (revision 48) @@ -25,27 +25,26 @@ vhdl : execute $(DIR_WORK) - @ \ + @\ declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*_Pack.vhdl)); \ declare -a log_files=($${vhdl_files[*]/%.vhdl/.vhdl.log}); \ - if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi - @ \ - declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*_Testbench.vhdl)); \ + if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi; \ + declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*_Testbench.vhdl)); \ declare -a log_files=($${vhdl_files[*]/%.vhdl/.vhdl.log}); \ - if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi - @ \ + if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi; \ declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*.vhdl|$(GREP_NOT) "(_Pack\.|_Testbench\.)")); \ declare -a log_files=($${vhdl_files[*]/%.vhdl/.vhdl.log}); \ - if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi + if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi; vhdl_sim : vhdl - @ \ + @\ declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*_Testbench.vhdl)); \ declare -a log_files=($${vhdl_files[*]/%.vhdl/.vhdl_sim.log}); \ - if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi + if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi; fpga : vhdl_sim - @$(ECHO) -e "" > $(FPGA_CFG_FILE_LOCAL) - @$(ECHO) "files :::::::: $(FPGA_FILES)" - @for file in $(FPGA_FILES); do \ + @\ + $(ECHO) -e "" > $(FPGA_CFG_FILE_LOCAL); \ + $(ECHO) "files :::::::: $(FPGA_FILES)"; \ + for file in $(FPGA_FILES); do \ declare -a files=($$($(LS) $$file*.vhdl|$(GREP_NOT) "(_Testbench\.)")); \ $(ECHO) -e "# $$file" >> $(FPGA_CFG_FILE_LOCAL); \ @@ -54,19 +53,22 @@ $(ECHO) -e "target_dep\t$$file.prj\t$${files[*]}" >> $(FPGA_CFG_FILE_LOCAL); \ $(ECHO) -e "" >> $(FPGA_CFG_FILE_LOCAL); \ - done - @($(XILINX_ENV); $(CD) $(FPGA_CFG_FILE_GLOBAL_DIR); ./$(FPGA_CFG_FILE_GLOBAL)) - @$(MAKE) $(FPGA_LOG_FILES) + done; \ + ($(XILINX_ENV); $(CD) $(FPGA_CFG_FILE_GLOBAL_DIR); ./$(FPGA_CFG_FILE_GLOBAL)); \ + $(MAKE) $(FPGA_LOG_FILES); $(DIR_LOG)/%.fpga.log : - @$(ECHO) "Synthetis on FPGA : $*" - @$(XILINX_ENV); $(MAKE) -f Makefile.mkf $*.ngc &> $@ + @\ + $(ECHO) "Synthetis on FPGA : $*"; \ + $(XILINX_ENV); $(MAKE) -f Makefile.mkf $*.ngc &> $@; $(DIR_WORK) : - @$(ECHO) "Create work-space : $@" - @$(MODELTECH_VLIB) $@ + @\ + $(ECHO) "Create work-space : $@"; \ + $(MODELTECH_VLIB) $@; $(DIR_LOG)/%.vhdl_sim.log : $(DIR_VHDL)/%.vhdl $(DIR_LOG)/%.vhdl.log - @$(ECHO) "VHDL's Simulation : $*" - @$(MODELTECH_VSIM) "$(DIR_WORK).`$(BASENAME) $* |$(UPPERtoLOWER)`" &> $@ + @\ + $(ECHO) "VHDL's Simulation : $*"; \ + $(MODELTECH_VSIM) "$(DIR_WORK).`$(BASENAME) $* |$(UPPERtoLOWER)`" &> $@; \ declare -i count=`$(GREP) -ch "Test OK" $@`; \ if $(TEST) $$count -ne 0; \ @@ -76,16 +78,19 @@ $(DIR_LOG)/%.vhdl.log : $(DIR_VHDL)/%.vhdl - @$(ECHO) "VHDL's Compilation : $*" - @$(MODELTECH_VCOM) $< &> $@ + @\ + $(ECHO) "VHDL's Compilation : $*"; \ + $(MODELTECH_VCOM) $< &> $@; synthesis_clean : - @if $(TEST) -f Makefile.mkf; then $(MAKE) -f Makefile.mkf clean; fi - @$(RM) $(DIR_WORK) transcript Makefile.mkf + @\ + if $(TEST) -f Makefile.mkf; then $(MAKE) -f Makefile.mkf clean; fi; \ + $(RM) $(DIR_WORK) transcript Makefile.mkf; synthesis_help : - @$(ECHO) " -----[ Synthesis ]----------------------------------" - @$(ECHO) "" - @$(ECHO) " * vhdl : compile all vhdl's file" - @$(ECHO) " * vhdl_sim : simulate all testbench's file" - @$(ECHO) " * fpga : synthetis with fpga's tools" - @$(ECHO) "" + @\ + $(ECHO) " -----[ Synthesis ]----------------------------------";\ + $(ECHO) "";\ + $(ECHO) " * vhdl : compile all vhdl's file";\ + $(ECHO) " * vhdl_sim : simulate all testbench's file";\ + $(ECHO) " * fpga : synthetis with fpga's tools";\ + $(ECHO) ""; Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.deps (revision 48) @@ -26,10 +26,12 @@ Behavioural_library : - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural --makefile=Makefile + @\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural --makefile=Makefile ; # @$(MAKE) Common_library Behavioural_library_clean : - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural --makefile=Makefile clean + @\ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural --makefile=Makefile clean; # @$(MAKE) Common_library_clean Index: /trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/Makefile.deps =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/Makefile.deps (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/Makefile.deps (revision 48) @@ -24,8 +24,10 @@ @COMPONENT_library : - @$(MAKE) Behavioural_library - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/@DIRECTORY --makefile=Makefile + @\ + $(MAKE) Behavioural_library; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/@DIRECTORY --makefile=Makefile; @COMPONENT_library_clean : - @$(MAKE) Behavioural_library_clean - @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/@DIRECTORY --makefile=Makefile clean + @\ + $(MAKE) Behavioural_library_clean; \ + $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/@DIRECTORY --makefile=Makefile clean; Index: /trunk/IPs/systemC/processor/Morpheo/Documentation/Source/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Documentation/Source/Makefile (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Documentation/Source/Makefile (revision 48) @@ -64,5 +64,5 @@ doc : $(PNG_FILES) $(DIR_TEX) - @ \ + @\ for file in $(ALL_FILES); do \ file=`$(BASENAME) $$file`; \ Index: /trunk/IPs/systemC/processor/Morpheo/Makefile =================================================================== --- /trunk/IPs/systemC/processor/Morpheo/Makefile (revision 47) +++ /trunk/IPs/systemC/processor/Morpheo/Makefile (revision 48) @@ -17,23 +17,24 @@ #~~~~~[ doc ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ doc : - @$(ECHO) "" - @$(ECHO) "=====[ doc ]=====================================" - @$(ECHO) "" - @$(MAKE) -C $(DIR_DOC) view + @\ + $(ECHO) "";\ + $(ECHO) "=====[ doc ]=====================================";\ + $(ECHO) "";\ + $(MAKE) -C $(DIR_DOC) view; #~~~~~[ path ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ path : - @$(ECHO) "" - @$(ECHO) "=====[ path ]====================================" - @$(ECHO) ""; - @$(ECHO) -n "+ "; - @$(BASENAME) $(PWD); - @$(ECHO) "| "; - @$(ECHO) "|"; - @$(MAKE) path_rec TAB="| " DIR_PATH=. + @\ + $(ECHO) "";\ + $(ECHO) "=====[ path ]====================================";\ + $(ECHO) "";\ + $(ECHO) -n "+ ";\ + $(BASENAME) $(PWD);\ + $(ECHO) "| ";\ + $(ECHO) "|";\ + $(MAKE) path_rec TAB="| " DIR_PATH=.; path_rec : - @ \ - \ + @\ for files in `$(LS) $(DIR_PATH)`; do \ if $(TEST) -d $(DIR_PATH)/$$files; \ @@ -58,9 +59,11 @@ lib : - @$(ECHO) "" - @$(ECHO) "=====[ lib ]=====================================" - @$(ECHO) "" - @$(ECHO) " Function unimplemented" - @$(ECHO) "" + @\ + $(ECHO) "";\ + $(ECHO) "=====[ lib ]=====================================";\ + $(ECHO) "";\ + $(ECHO) " Function unimplemented";\ + $(ECHO) ""; + # @$(ECHO) " The library is generate into the directory : $(PWD)/$(DIR_LIB)" @@ -68,9 +71,10 @@ clean : - @$(ECHO) "" - @$(ECHO) "=====[ clean ]===================================" - @$(ECHO) "" - @$(ECHO) "Delete temporary files "$(PWD) - @$(RM) *~ + @\ + $(ECHO) "";\ + $(ECHO) "=====[ clean ]===================================";\ + $(ECHO) "";\ + $(ECHO) "Delete temporary files "$(PWD);\ + $(RM) *~; # @$(MAKE) clean_rec DIR_CLEAN=. @@ -95,15 +99,16 @@ help : - @$(ECHO) "" - @$(ECHO) "=====[ help ]====================================" - @$(ECHO) "" - @$(ECHO) " Rules Description" - @$(ECHO) "" - @$(ECHO) " * all cf rule \"help\"" - @$(ECHO) " * clean Delete temporary files" - @$(ECHO) " * doc View documentation files" - @$(ECHO) " * lib Generate the library to include" - @$(ECHO) " * help Print this message" - @$(ECHO) " * path Print a little description of each directory" - @$(ECHO) "" + @\ + $(ECHO) "";\ + $(ECHO) "=====[ help ]====================================";\ + $(ECHO) "";\ + $(ECHO) " Rules Description";\ + $(ECHO) "";\ + $(ECHO) " * all cf rule \"help\"";\ + $(ECHO) " * clean Delete temporary files";\ + $(ECHO) " * doc View documentation files";\ + $(ECHO) " * lib Generate the library to include";\ + $(ECHO) " * help Print this message";\ + $(ECHO) " * path Print a little description of each directory";\ + $(ECHO) ""; Index: /trunk/Makefile.tools =================================================================== --- /trunk/Makefile.tools (revision 47) +++ /trunk/Makefile.tools (revision 48) @@ -24,10 +24,11 @@ TR = tr UPPERtoLOWER = $(TR) [:lower:] [:upper:] -CXX = export LANG=C; g++ +CXX = export LANG=C; g++4 SED = sed TOUCH = touch +VALGRIND = valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --leak-resolution=high # Commands to generate all documents FIG2EPS = fig2dev -L eps -EPS2JPG = convert -quality 100 +EPS2PNG = convert -quality 0 LATEX = latex BIBTEX = bibtex @@ -94,2 +95,8 @@ #-----[ newlib ]------------------------------------------- + +#-----[ qt ]----------------------------------------------- +QT_BIN = $(QT)/bin +QT_INCDIR = $(QT)/include +QT_LIBDIR = $(QT)/lib +QT_LIBNAME = Index: /trunk/Makefile.tools_path =================================================================== --- /trunk/Makefile.tools_path (revision 47) +++ /trunk/Makefile.tools_path (revision 48) @@ -1,11 +1,11 @@ #-----[ path ]--------------------------------------------- -SOCLIB = /users/outil/soc/soclib/ -SYSTEMC_systemc = /users/outil/systemc/systemc-2.1.v1/ -SYSTEMC_systemcass = /users/outil/systemc/systemcass/systemcass/latest/i686-Linux.SLA4x/ +SOCLIB = /users/outil/soc/soclib +SYSTEMC_systemc = /users/outil/systemc/systemc-2.1.v1 +SYSTEMC_systemcass = /users/outil/systemc/systemcass/systemcass/latest/i686-Linux.SLA4x SYSTEMC_systemcass_deps = $(SYSTEMC_systemcass) -XILINX = /dsk/l1/misc/Xilinx91i/ -MODELTECH = /users/outil/m1archi/modeltech/ -MODELTECH_LICENCE = /users/soft/mentor/licence/etc/ -OR1K = ../../Tools/or32-elf/ +XILINX = /dsk/l1/misc/Xilinx91i +MODELTECH = /users/outil/m1archi/modeltech +MODELTECH_LICENCE = /users/soft/mentor/licence/etc +OR1K = ../../Tools/or32-elf NEWLIB = ../../Tools/newlib-1.14.0 - +QT = /dsk/l1/misc/kane/qt-x11-opensource-4.2.3 Index: /trunk/Platforms/Generic/Makefile =================================================================== --- /trunk/Platforms/Generic/Makefile (revision 47) +++ /trunk/Platforms/Generic/Makefile (revision 48) @@ -135,21 +135,25 @@ $(error "variable TOOLS is undefined"); endif - @$(ECHO) "$(ID) : Create directory" - @$(MKDIR) $(REP_OBJ) $(REP_BIN) + @\ + $(ECHO) "$(ID) : Create directory"; \ + $(MKDIR) $(REP_OBJ) $(REP_BIN); # Création du fichier exe $(EXE) : $(OBJS) - @$(ECHO) "$(ID) : Compilation of execute" - $(CXX) $(LXX_OPT) -o $@ $< $(LIBS) 2>&1 | $(CXXFILT) + @\ + $(ECHO) "$(ID) : Compilation of execute"; \ + $(CXX) $(LXX_OPT) -o $@ $< $(LIBS) 2>&1 | $(CXXFILT); # Fichier objet $(REP_OBJ)/%_$(ID).o : $(REP_SRC)/%.cpp - @$(ECHO) "$(ID) : Compilation of files $@" - $(CXX) $(CXX_OPT) -o $@ -c $< 2>&1 | $(CXXFILT) + @\ + $(ECHO) "$(ID) : Compilation of files $@"; \ + $(CXX) $(CXX_OPT) -o $@ -c $< 2>&1 | $(CXXFILT); # Maintenance clean : - @$(ECHO) "Delete temporary files" - @$(RM) $(REP_OBJ) *~ $(REP_SRC)/*~ $(REP_INC)/*~ *.trace tty* - @$(RM) $(REP_BIN) + @\ + $(ECHO) "Delete temporary files"; \ + $(RM) $(REP_OBJ) *~ $(REP_SRC)/*~ $(REP_INC)/*~ *.trace tty*; \ + $(RM) $(REP_BIN); Index: /trunk/Softwares/Basic_test.or32/Makefile =================================================================== --- /trunk/Softwares/Basic_test.or32/Makefile (revision 47) +++ /trunk/Softwares/Basic_test.or32/Makefile (revision 48) @@ -38,46 +38,54 @@ $(DIR_BIN)/%.x.txt : $(DIR_BIN)/%.x - @$(ECHO) "List symbols of $*" - @$(NM) $(NM_OPT) $^ > $@.nm - @$(ECHO) "Display information of $*" - @$(OBJDUMP) $(OBJDUMP_OPT) $^ > $@ + @\ + $(ECHO) "List symbols of $*";\ + $(NM) $(NM_OPT) $^ > $@.nm;\ + $(ECHO) "Display information of $*";\ + $(OBJDUMP) $(OBJDUMP_OPT) $^ > $@; $(DIR_BIN)/%.x : $(OBJ_SYS) $(OBJ) - @$(ECHO) "Linkage of $*" - @$(LD) -o $@ $^ $(LD_OPT) + @\ + $(ECHO) "Linkage of $*";\ + $(LD) -o $@ $^ $(LD_OPT); $(DIR_OBJ)/%.o : $(DIR_LOCAL_ASM)/%.s - @$(ECHO) "Compile of $*" - @$(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ - @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ + @\ + $(ECHO) "Compile of $*";\ + $(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ ;\ + $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ; # @$(AS) $(AS_OPT) $^ -o $@ $(DIR_OBJ)/%.o : $(DIR_LOCAL_SYS)/%.s - @$(ECHO) "Compile of $*" - @$(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ - @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ + @\ + $(ECHO) "Compile of $*";\ + $(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ ;\ + $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ; # @$(AS) $(AS_OPT) $^ -o $@ $(DIR_OBJ)/%.o : $(DIR_LOCAL_C)/%.c - @$(ECHO) "Compile of $*" - @$(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ - @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ + @\ + $(ECHO) "Compile of $*";\ + $(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ ;\ + $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ; $(DIR_OBJ)/%.o : $(DIR_GLOBAL_ASM)/%.s - @$(ECHO) "Compile of $*" - @$(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ - @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ + @\ + $(ECHO) "Compile of $*";\ + $(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ ;\ + $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ; # @$(AS) $(AS_OPT) $^ -o $@ $(DIR_OBJ)/%.o : $(DIR_GLOBAL_SYS)/%.s - @$(ECHO) "Compile of $*" - @$(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ - @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ + @\ + $(ECHO) "Compile of $*";\ + $(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ ;\ + $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ; # @$(AS) $(AS_OPT) $^ -o $@ $(DIR_OBJ)/%.o : $(DIR_GLOBAL_C)/%.c - @$(ECHO) "Compile of $*" - @$(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ - @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ + @\ + $(ECHO) "Compile of $*";\ + $(CC) $(CC_OPT) $(DIR_INC) -o $@ -c $^ ;\ + $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ; #-----[ Environement ]------------------------------------------------------------ @@ -93,13 +101,15 @@ #-----[ Maintenance ]------------------------------------------------------------- clean : - @$(ECHO) "Delete temporary files "`$(PWD)` - @$(RM) $(DIR_OBJ) $(DIR_BIN) - @$(MAKE) clean_rec DIR_CLEAN=. + @\ + $(ECHO) "Delete temporary files "`$(PWD)`;\ + $(RM) $(DIR_OBJ) $(DIR_BIN);\ + $(MAKE) clean_rec DIR_CLEAN=.; #Clean recursive clean_rec : - @$(ECHO) "Delete temporary files in directory $(DIR_CLEAN)" - @$(RM) -f $(DIR_CLEAN)/*~ - @for files in `$(LS) $(DIR_CLEAN)`; do \ + @\ + $(ECHO) "Delete temporary files in directory $(DIR_CLEAN)";\ + $(RM) -f $(DIR_CLEAN)/*~;\ + for files in `$(LS) $(DIR_CLEAN)`; do \ if $(TEST) -d $(DIR_CLEAN)/$$files; \ then \ @@ -110,10 +120,11 @@ #-----[ Help ]-------------------------------------------------------------------- help : - @$(ECHO) "" - @$(ECHO) "List of directive : " - @$(ECHO) " * make : Compile the software" - @$(ECHO) " * make clean : Erase all files generates" - @$(ECHO) " * make bench_list : View all benchmark" - @$(ECHO) " * make bench_exec : Print the file \"$(FILE_BENCH)\" - it's the Workload" - @$(ECHO) " * make bench : Compile the Benchmark Suite" - @$(ECHO) "" + @\ + $(ECHO) "";\ + $(ECHO) "List of directive : ";\ + $(ECHO) " * make : Compile the software";\ + $(ECHO) " * make clean : Erase all files generates";\ + $(ECHO) " * make bench_list : View all benchmark";\ + $(ECHO) " * make bench_exec : Print the file \"$(FILE_BENCH)\" - it's the Workload";\ + $(ECHO) " * make bench : Compile the Benchmark Suite";\ + $(ECHO) ""; Index: /trunk/Softwares/Min.or32/Makefile =================================================================== --- /trunk/Softwares/Min.or32/Makefile (revision 47) +++ /trunk/Softwares/Min.or32/Makefile (revision 48) @@ -27,29 +27,34 @@ $(DIR_BIN)/%.x.txt : $(DIR_BIN)/%.x - @$(ECHO) "List symbols of $*" - @$(NM) $(NM_OPT) $^ > $@.nm - @$(ECHO) "Display information of $*" - @$(OBJDUMP) $(OBJDUMP_OPT) $^ > $@ + @\ + $(ECHO) "List symbols of $*";\ + $(NM) $(NM_OPT) $^ > $@.nm;\ + $(ECHO) "Display information of $*";\ + $(OBJDUMP) $(OBJDUMP_OPT) $^ > $@; $(DIR_BIN)/%.x : $(OBJ_SYS) $(OBJ) - @$(ECHO) "Linkage of $*" - @$(LD) -o $@ $^ $(LD_OPT) + @\ + $(ECHO) "Linkage of $*";\ + $(LD) -o $@ $^ $(LD_OPT); $(DIR_OBJ)/%.o : $(DIR_ASM)/%.s - @$(ECHO) "Compile of $*" - @$(CC) $(CC_OPT) -I$(DIR_INC) -o $@ -c $^ - @$(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^ + @\ + $(ECHO) "Compile of $*";\ + $(CC) $(CC_OPT) -I$(DIR_INC) -o $@ -c $^ ;\ + $(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^ ; # @$(AS) $(AS_OPT) $^ -o $@ $(DIR_OBJ)/%.o : $(DIR_SYS)/%.s - @$(ECHO) "Compile of $*" - @$(CC) $(CC_OPT) -I$(DIR_INC) -o $@ -c $^ - @$(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^ + @\ + $(ECHO) "Compile of $*";\ + $(CC) $(CC_OPT) -I$(DIR_INC) -o $@ -c $^ ;\ + $(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^ ; # @$(AS) $(AS_OPT) $^ -o $@ $(DIR_OBJ)/%.o : $(DIR_C)/%.c - @$(ECHO) "Compile of $*" - @$(CC) $(CC_OPT) -I$(DIR_INC) -o $@ -c $^ - @$(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^ + @\ + $(ECHO) "Compile of $*";\ + $(CC) $(CC_OPT) -I$(DIR_INC) -o $@ -c $^ ;\ + $(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^ ; #-----[ Environement ]------------------------------------------------------------ @@ -65,13 +70,15 @@ #-----[ Maintenance ]------------------------------------------------------------- clean : - @$(ECHO) "Delete temporary files "`$(PWD)` - @$(RM) $(DIR_OBJ) $(DIR_BIN) - @$(MAKE) clean_rec DIR_CLEAN=. + @\ + $(ECHO) "Delete temporary files "`$(PWD)`;\ + $(RM) $(DIR_OBJ) $(DIR_BIN);\ + $(MAKE) clean_rec DIR_CLEAN=.; #Clean recursive clean_rec : - @$(ECHO) "Delete temporary files in directory $(DIR_CLEAN)" - @$(RM) -f $(DIR_CLEAN)/*~ - @for files in `$(LS) $(DIR_CLEAN)`; do \ + @\ + $(ECHO) "Delete temporary files in directory $(DIR_CLEAN)";\ + $(RM) -f $(DIR_CLEAN)/*~;\ + for files in `$(LS) $(DIR_CLEAN)`; do \ if $(TEST) -d $(DIR_CLEAN)/$$files; \ then \ @@ -82,7 +89,8 @@ #-----[ Help ]-------------------------------------------------------------------- help : - @$(ECHO) "" - @$(ECHO) "List of directive : " - @$(ECHO) " * make : Compile the software" - @$(ECHO) " * make clean : Erase all files generates" - @$(ECHO) "" + @\ + $(ECHO) "";\ + $(ECHO) "List of directive : ";\ + $(ECHO) " * make : Compile the software";\ + $(ECHO) " * make clean : Erase all files generates";\ + $(ECHO) "";