Changeset 48


Ignore:
Timestamp:
Aug 8, 2007, 9:16:10 PM (17 years ago)
Author:
rosiere
Message:

Modification des Makefile : pas de creation inutile de shell

Location:
trunk
Files:
194 edited

Legend:

Unmodified
Added
Removed

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.defs

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Makefile.deps

    r5 r48  
    1212endif
    1313ifndef Two_Level_Branch_Predictor
    14 include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps
     14include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps
    1515endif
    1616ifndef Meta_Predictor_Glue
    17 include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps
     17include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps
    1818endif
    1919
    … …  
    2626                                        $(Behavioural_LIBRARY) 
    2727
    28 Meta_Predictor_DIR_LIBRARY      =       -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/lib        \
     28Meta_Predictor_DIR_LIBRARY      =       -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/lib        \
    2929                                        $(Meta_Predictor_Glue_DIR_LIBRARY)                                              \
    3030                                        $(Two_Level_Branch_Predictor_DIR_LIBRARY)                                       \
    … …  
    3434
    3535Meta_Predictor_library          :
    36                                 @$(MAKE) Behavioural_library
    37                                 @$(MAKE) Meta_Predictor_Glue_library
    38                                 @$(MAKE) Two_Level_Branch_Predictor_library
    39                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor --makefile=Makefile
     36                                @\
     37                                $(MAKE) Behavioural_library;\
     38                                $(MAKE) Meta_Predictor_Glue_library;\
     39                                $(MAKE) Two_Level_Branch_Predictor_library;\
     40                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor --makefile=Makefile;
    4041       
    4142Meta_Predictor_library_clean    :
    42                                 @$(MAKE) Behavioural_library_clean
    43                                 @$(MAKE) Meta_Predictor_Glue_library_clean
    44                                 @$(MAKE) Two_Level_Branch_Predictor_library_clean
    45                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor --makefile=Makefile clean
     43                                @\
     44                                $(MAKE) Behavioural_library_clean;\
     45                                $(MAKE) Meta_Predictor_Glue_library_clean;\
     46                                $(MAKE) Two_Level_Branch_Predictor_library_clean;\
     47                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.defs

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/Makefile.deps

    r4 r48  
    1818                                        $(Behavioural_LIBRARY) 
    1919
    20 Meta_Predictor_Glue_DIR_LIBRARY         =       -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/lib    \
     20Meta_Predictor_Glue_DIR_LIBRARY         =       -L$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/lib    \
    2121                                        $(Behavioural_DIR_LIBRARY)
    2222
    … …  
    2424
    2525Meta_Predictor_Glue_library             :
    26                                 @$(MAKE) Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue --makefile=Makefile
     26                                @\
     27                                $(MAKE) Behavioural_library;\
     28                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue --makefile=Makefile ;
    2829       
    2930Meta_Predictor_Glue_library_clean       :
    30                                 @$(MAKE) Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue --makefile=Makefile clean
     31                                @\
     32                                $(MAKE) Behavioural_library_clean;\
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/Makefile

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../../..
     10DIR_MORPHEO                     = ../../../../../../../../..
    1111
    1212LIBRARY                         = $(Meta_Predictor_Glue_LIBRARY)

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h

    r4 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     16#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
    2421
    25 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue;
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
     24
     25using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue;
    2626
    2727void test    (string name,
    28               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters param);
     28              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters param);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/main.cpp

    r4 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h"
    99
    1010#define NB_PARAMS 15
    … …  
    6666  try
    6767    {
    68       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters param (have_meta_predictor               ,
     68      morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters param (have_meta_predictor               ,
    6969                                                                                                              predictor_0_have_bht              ,
    7070                                                                                                              predictor_0_bht_size_shifter      ,

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/src/test.cpp

    r45 r48  
    99#define NB_ITERATION 1024
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h"
     11#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/SelfTest/include/test.h"
    1212#include "Common/include/Test.h"
    1313
    1414void test (string name,
    15            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters _param)
     15           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters _param)
    1616{
    1717  cout << "<" << name << "> : Simulation SystemC" << endl;

  • 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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Meta_Predictor_Glue_h
    33
    44/*
    … …  
    1717#include "Common/include/Debug.h"
    1818
    19 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
    20 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Types.h"
     19#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
     20#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h"
    2121#ifdef STATISTICS
    22 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
     22#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
    2323#endif
    2424#ifdef VHDL
    … …  
    3131namespace morpheo {
    3232namespace behavioural {
    33 namespace stage_1_ifetch {
    34 namespace predictor {
     33namespace core {
     34namespace multi_front_end {
     35namespace front_end {
     36namespace prediction_unit {
     37namespace direction {
     38
    3539namespace meta_predictor {
    3640namespace meta_predictor_glue {
    … …  
    154158}; // end namespace meta_predictor_glue
    155159}; // end namespace meta_predictor
    156 }; // end namespace predictor
    157 }; // end namespace stage_1_ifetch
     160
     161}; // end namespace core
     162}; // end namespace multi_front_end
     163}; // end namespace front_end
     164}; // end namespace prediction_unit
     165}; // end namespace direction
     166
    158167
    159168}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Parameters_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Parameters_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Parameters_h
    33
    44/*
    … …  
    1515namespace morpheo {
    1616namespace behavioural {
    17 namespace stage_1_ifetch {
    18 namespace predictor {
     17namespace core {
     18namespace multi_front_end {
     19namespace front_end {
     20namespace prediction_unit {
     21namespace direction {
     22
    1923namespace meta_predictor {
    2024namespace meta_predictor_glue {
    … …  
    7781  public :        string   print      (uint32_t depth);
    7882  public : friend ostream& operator<< (ostream& output_stream,
    79                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters & x);
     83                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters & x);
    8084  };
    8185
    8286}; // end namespace meta_predictor_glue
    8387}; // end namespace meta_predictor
    84 }; // end namespace predictor
    85 }; // end namespace stage_1_ifetch
     88
     89}; // end namespace core
     90}; // end namespace multi_front_end
     91}; // end namespace front_end
     92}; // end namespace prediction_unit
     93}; // end namespace direction
     94
    8695
    8796}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Statistics_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Statistics_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Statistics_h
    44
    55/*
    … …  
    1414#include "Behavioural/include/Parameters_Statistics.h"
    1515//#include "Behavioural/Generic/Group/include/Statistics.h"
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
     16#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
    1717
    1818//using namespace morpheo::behavioural::generic::group;
    … …  
    2020namespace morpheo                    {
    2121namespace behavioural {
    22 namespace stage_1_ifetch {
    23 namespace predictor {
     22namespace core {
     23namespace multi_front_end {
     24namespace front_end {
     25namespace prediction_unit {
     26namespace direction {
     27
    2428namespace meta_predictor {
    2529namespace meta_predictor_glue {
    … …  
    5054}; // end namespace meta_predictor_glue
    5155}; // end namespace meta_predictor
    52 }; // end namespace predictor
    53 }; // end namespace stage_1_ifetch
     56
     57}; // end namespace core
     58}; // end namespace multi_front_end
     59}; // end namespace front_end
     60}; // end namespace prediction_unit
     61}; // end namespace direction
     62
    5463
    5564}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h

    r45 r48  
    11#ifdef SYSTEMC
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Type_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_meta_predictor_glue_Type_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Type_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_meta_predictor_glue_Type_h
    44
    55/*
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace meta_predictor_glue {
    … …  
    2529}; // end namespace meta_predictor_glue
    2630}; // end namespace meta_predictor
    27 }; // end namespace predictor
    28 }; // end namespace stage_1_ifetch
     31
     32}; // end namespace core
     33}; // end namespace multi_front_end
     34}; // end namespace front_end
     35}; // end namespace prediction_unit
     36}; // end namespace direction
     37
    2938
    3039}; // end namespace behavioural

  • 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

    r45 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace meta_predictor_glue {
    … …  
    2428                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2529#endif
    26                               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters param ):
     30                              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters param ):
    2731                              _name              (name)
    2832                              ,_param            (param)
    … …  
    266270}; // end namespace meta_predictor_glue
    267271}; // end namespace meta_predictor
    268 }; // end namespace predictor
    269 }; // end namespace stage_1_ifetch
     272
     273}; // end namespace core
     274}; // end namespace multi_front_end
     275}; // end namespace front_end
     276}; // end namespace prediction_unit
     277}; // end namespace direction
     278
    270279}; // end namespace behavioural
    271280}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    199203}; // end namespace meta_predictor_glue
    200204}; // end namespace meta_predictor
    201 }; // end namespace predictor
    202 }; // end namespace stage_1_ifetch
     205
     206}; // end namespace core
     207}; // end namespace multi_front_end
     208}; // end namespace front_end
     209}; // end namespace prediction_unit
     210}; // end namespace direction
     211
    203212
    204213}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    8892}; // end namespace meta_predictor_glue
    8993}; // end namespace meta_predictor
    90 }; // end namespace predictor
    91 }; // end namespace stage_1_ifetch
     94
     95}; // end namespace core
     96}; // end namespace multi_front_end
     97}; // end namespace front_end
     98}; // end namespace prediction_unit
     99}; // end namespace direction
     100
    92101
    93102}; // end namespace behavioural

  • 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

    r4 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    3438}; // end namespace meta_predictor_glue
    3539}; // end namespace meta_predictor
    36 }; // end namespace predictor
    37 }; // end namespace stage_1_ifetch
     40
     41}; // end namespace core
     42}; // end namespace multi_front_end
     43}; // end namespace front_end
     44}; // end namespace prediction_unit
     45}; // end namespace direction
     46
    3847}; // end namespace behavioural
    3948}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace meta_predictor_glue {
    … …  
    4953}; // end namespace meta_predictor_glue
    5054}; // end namespace meta_predictor
    51 }; // end namespace predictor
    52 }; // end namespace stage_1_ifetch
     55
     56}; // end namespace core
     57}; // end namespace multi_front_end
     58}; // end namespace front_end
     59}; // end namespace prediction_unit
     60}; // end namespace direction
     61
    5362}; // end namespace behavioural
    5463}; // end namespace morpheo             

  • 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

    r5 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    7680}; // end namespace meta_predictor_glue
    7781}; // end namespace meta_predictor
    78 }; // end namespace predictor
    79 }; // end namespace stage_1_ifetch
     82
     83}; // end namespace core
     84}; // end namespace multi_front_end
     85}; // end namespace front_end
     86}; // end namespace prediction_unit
     87}; // end namespace direction
     88
    8089}; // end namespace behavioural
    8190}; // end namespace morpheo             

  • 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

    r4 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    3539}; // end namespace meta_predictor_glue
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948}; // end namespace behavioural
    4049}; // end namespace morpheo             

  • 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

    r5 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    96100}; // end namespace meta_predictor_glue
    97101}; // end namespace meta_predictor
    98 }; // end namespace predictor
    99 }; // end namespace stage_1_ifetch
     102
     103}; // end namespace core
     104}; // end namespace multi_front_end
     105}; // end namespace front_end
     106}; // end namespace prediction_unit
     107}; // end namespace direction
     108
    100109}; // end namespace behavioural
    101110}; // end namespace morpheo             

  • 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

    r4 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    3034}; // end namespace meta_predictor_glue
    3135}; // end namespace meta_predictor
    32 }; // end namespace predictor
    33 }; // end namespace stage_1_ifetch
     36
     37}; // end namespace core
     38}; // end namespace multi_front_end
     39}; // end namespace front_end
     40}; // end namespace prediction_unit
     41}; // end namespace direction
     42
    3443
    3544}; // end namespace behavioural

  • 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

    r4 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     10#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace meta_predictor_glue {
    … …  
    3539}; // end namespace meta_predictor_glue
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948
    4049}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace meta_predictor_glue {
    … …  
    3943}; // end namespace meta_predictor_glue
    4044}; // end namespace meta_predictor
    41 }; // end namespace predictor
    42 }; // end namespace stage_1_ifetch
     45
     46}; // end namespace core
     47}; // end namespace multi_front_end
     48}; // end namespace front_end
     49}; // end namespace prediction_unit
     50}; // end namespace direction
     51
    4352}; // end namespace behavioural
    4453}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    137141}; // end namespace meta_predictor_glue
    138142}; // end namespace meta_predictor
    139 }; // end namespace predictor
    140 }; // end namespace stage_1_ifetch
     143
     144}; // end namespace core
     145}; // end namespace multi_front_end
     146}; // end namespace front_end
     147}; // end namespace prediction_unit
     148}; // end namespace direction
     149
    141150
    142151}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    6872}; // end namespace meta_predictor_glue
    6973}; // end namespace meta_predictor
    70 }; // end namespace predictor
    71 }; // end namespace stage_1_ifetch
     74
     75}; // end namespace core
     76}; // end namespace multi_front_end
     77}; // end namespace front_end
     78}; // end namespace prediction_unit
     79}; // end namespace direction
     80
    7281
    7382}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    2933}; // end namespace meta_predictor_glue
    3034}; // end namespace meta_predictor
    31 }; // end namespace predictor
    32 }; // end namespace stage_1_ifetch
     35
     36}; // end namespace core
     37}; // end namespace multi_front_end
     38}; // end namespace front_end
     39}; // end namespace prediction_unit
     40}; // end namespace direction
     41
    3342
    3443}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters.cpp

    r5 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace meta_predictor_glue {
    … …  
    113117}; // end namespace meta_predictor_glue
    114118}; // end namespace meta_predictor
    115 }; // end namespace predictor
    116 }; // end namespace stage_1_ifetch
     119
     120}; // end namespace core
     121}; // end namespace multi_front_end
     122}; // end namespace front_end
     123}; // end namespace prediction_unit
     124}; // end namespace direction
     125
    117126
    118127}; // end namespace behavioural

  • 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

    r4 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Types.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo                    {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace meta_predictor_glue {
    … …  
    4549}; // end namespace meta_predictor_glue
    4650}; // end namespace meta_predictor
    47 }; // end namespace predictor
    48 }; // end namespace stage_1_ifetch
     51
     52}; // end namespace core
     53}; // end namespace multi_front_end
     54}; // end namespace front_end
     55}; // end namespace prediction_unit
     56}; // end namespace direction
     57
    4958
    5059}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Parameters_print.cpp

    r4 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
    99#include "Behavioural/include/XML.h"
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace meta_predictor_glue {
    … …  
    8488
    8589  ostream& operator<< (ostream& output_stream ,
    86                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters & x)
     90                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters & x)
    8791  {
    8892    output_stream << x.print(0);
    … …  
    9397}; // end namespace meta_predictor_glue
    9498}; // end namespace meta_predictor
    95 }; // end namespace predictor
    96 }; // end namespace stage_1_ifetch
     99
     100}; // end namespace core
     101}; // end namespace multi_front_end
     102}; // end namespace front_end
     103}; // end namespace prediction_unit
     104}; // end namespace direction
     105
    97106
    98107}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics.cpp

    r4 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace meta_predictor_glue {
    … …  
    3741}; // end namespace meta_predictor_glue
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_add.cpp

    r4 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace meta_predictor_glue {
    … …  
    2832}; // end namespace meta_predictor_glue
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/src/Statistics_print.cpp

    r4 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace meta_predictor_glue {
    … …  
    3741
    3842  ostream& operator<< (ostream& output_stream ,
    39                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Statistics & x)
     43                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Statistics & x)
    4044  {
    4145    output_stream << x.print(0);
    … …  
    4650}; // end namespace meta_predictor_glue
    4751}; // end namespace meta_predictor
    48 }; // end namespace predictor
    49 }; // end namespace stage_1_ifetch
     52
     53}; // end namespace core
     54}; // end namespace multi_front_end
     55}; // end namespace front_end
     56}; // end namespace prediction_unit
     57}; // end namespace direction
     58
    5059
    5160}; // end namespace behavioural

  • 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

    r4 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace meta_predictor_glue {
    … …  
    3640}; // end namespace meta_predictor_glue
    3741}; // end namespace meta_predictor
    38 }; // end namespace predictor
    39 }; // end namespace stage_1_ifetch
     42
     43}; // end namespace core
     44}; // end namespace multi_front_end
     45}; // end namespace front_end
     46}; // end namespace prediction_unit
     47}; // end namespace direction
     48
    4049
    4150}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/Makefile

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../..
     10DIR_MORPHEO                     = ../../../../../../../..
    1111
    1212LIBRARY                         = $(Meta_Predictor_LIBRARY)

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h

    r5 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     16#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
     21
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
    2424
    2525void test    (string name,
    26               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters param);
     26              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters param);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/main.cpp

    r5 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/include/test.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h"
    99
    1010#define NB_PARAMS 25
    … …  
    8686  try
    8787    {
    88       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters param (have_meta_predictor               ,
     88      morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters param (have_meta_predictor               ,
    8989                                                                                         predictor_0_have_bht              ,
    9090                                                                                         predictor_0_bht_size_shifter      ,

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/src/test.cpp

    r45 r48  
    99#define NB_ITERATION 1
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/SelfTest/include/test.h"
     11#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/SelfTest/include/test.h"
    1212#include "Common/include/Test.h"
    1313
    1414void test (string name,
    15            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters _param)
     15           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters _param)
    1616{
    1717  cout << "<" << name << "> : Simulation SystemC" << endl;

  • 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

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

  • 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

    r15 r48  
    2626                                                $(Behavioural_LIBRARY) 
    2727
    28 Branch_History_Table_DIR_LIBRARY        =       -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/lib        \
     28Branch_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        \
    2929                                                $(RegisterFile_Monolithic_DIR_LIBRARY)  \
    3030                                                $(Shifter_DIR_LIBRARY)          \
    … …  
    3434
    3535Branch_History_Table_library            :
    36                                         @$(MAKE) Behavioural_library
    37                                         @$(MAKE) Shifter_library
    38                                         @$(MAKE) RegisterFile_Monolithic_library
    39                                         @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile
     36                                        @\
     37                                        $(MAKE) Behavioural_library;\
     38                                        $(MAKE) Shifter_library;\
     39                                        $(MAKE) RegisterFile_Monolithic_library;\
     40                                        $(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;
    4041
    4142Branch_History_Table_library_clean      :
    42                                         @$(MAKE) Behavioural_library_clean
    43                                         @$(MAKE) Shifter_library_clean
    44                                         @$(MAKE) RegisterFile_Monolithic_library_clean
    45                                         @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table --makefile=Makefile clean
     43                                        @\
     44                                        $(MAKE) Behavioural_library_clean;\
     45                                        $(MAKE) Shifter_library_clean;\
     46                                        $(MAKE) RegisterFile_Monolithic_library_clean;\
     47                                        $(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;

  • 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

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../../../..
     10DIR_MORPHEO                     = ../../../../../../../../../..
    1111
    1212LIBRARY                         = $(Branch_History_Table_LIBRARY)

  • 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

    r2 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     16#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"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
    24 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor;
    2521
    26 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table;
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
     24using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor;
     25
     26using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table;
    2727
    2828void test   (string name,
    29              morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param);
     29             morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param);

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h"
    1010
    1111#define NB_PARAMS 4
    … …  
    3737  const uint32_t nb_branch_complete = atoi(argv[5]);
    3838
    39   morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param (size_shifter       ,
     39  morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param (size_shifter       ,
    4040                                                                                                                                       nb_shifter         ,
    4141                                                                                                                                       nb_prediction      ,

  • 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

    r45 r48  
    99#define NB_ITERATION 1024
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h"
     11#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/SelfTest/include/test.h"
    1212#include "Common/include/BitManipulation.h"
    1313#include "Common/include/Test.h"
    1414
    1515void test (string name,
    16            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param)
     16           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param)
    1717{
    1818  cout << "<" << name << "> : Simulation SystemC" << endl;

  • 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

    r23 r48  
    55
    66% Package de variables d'environnement : Titre, command etc ...
    7 \usepackage{../../../../../../../Behavioural/doc/sty/doc-style}
     7\usepackage{../../../../../../../../../../Behavioural/doc/sty/doc-style}
    88\usepackage{sty/header}
    99

  • 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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Branch_History_Table_h
     1#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
     2#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
    33
    44/*
    … …  
    1919#include "Behavioural/Generic/Shifter/include/Shifter.h"
    2020#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h"
    21 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    22 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h"
     21#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     22#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h"
    2323#ifdef STATISTICS
    24 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     24#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    2525#endif
    2626#ifdef VHDL
    … …  
    3333namespace morpheo {
    3434namespace behavioural {
    35 namespace stage_1_ifetch {
    36 namespace predictor {
     35namespace core {
     36namespace multi_front_end {
     37namespace front_end {
     38namespace prediction_unit {
     39namespace direction {
     40
    3741namespace meta_predictor {
    3842namespace two_level_branch_predictor {
    … …  
    130134}; // end namespace two_level_branch_predictor
    131135}; // end namespace meta_predictor
    132 }; // end namespace predictor
    133 }; // end namespace stage_1_ifetch
     136
     137}; // end namespace core
     138}; // end namespace multi_front_end
     139}; // end namespace front_end
     140}; // end namespace prediction_unit
     141}; // end namespace direction
     142
    134143
    135144}; // end namespace behavioural

  • 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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Parameters_h
    33
    44/*
    … …  
    1818namespace morpheo {
    1919namespace behavioural {
    20 namespace stage_1_ifetch {
    21 namespace predictor {
     20namespace core {
     21namespace multi_front_end {
     22namespace front_end {
     23namespace prediction_unit {
     24namespace direction {
     25
    2226namespace meta_predictor {
    2327namespace two_level_branch_predictor {
    … …  
    4852  public :        string   print      (uint32_t depth);
    4953  public : friend ostream& operator<< (ostream& output_stream,
    50                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x);
     54                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x);
    5155  };
    5256
    … …  
    5458}; // end namespace two_level_branch_predictor
    5559}; // end namespace meta_predictor
    56 }; // end namespace predictor
    57 }; // end namespace stage_1_ifetch
     60
     61}; // end namespace core
     62}; // end namespace multi_front_end
     63}; // end namespace front_end
     64}; // end namespace prediction_unit
     65}; // end namespace direction
     66
    5867}; // end namespace behavioural
    5968}; // end namespace morpheo             

  • 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

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Statistics_h
    44
    55/*
    … …  
    1616#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Statistics.h"
    1717//#include "Behavioural/Generic/Group/include/Statistics.h"
    18 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     18#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    1919
    2020//using namespace morpheo::behavioural::generic::group;
    … …  
    2222namespace morpheo                    {
    2323namespace behavioural {
    24 namespace stage_1_ifetch {
    25 namespace predictor {
     24namespace core {
     25namespace multi_front_end {
     26namespace front_end {
     27namespace prediction_unit {
     28namespace direction {
     29
    2630namespace meta_predictor {
    2731namespace two_level_branch_predictor {
    … …  
    5660}; // end namespace two_level_branch_predictor
    5761}; // end namespace meta_predictor
    58 }; // end namespace predictor
    59 }; // end namespace stage_1_ifetch
     62
     63}; // end namespace core
     64}; // end namespace multi_front_end
     65}; // end namespace front_end
     66}; // end namespace prediction_unit
     67}; // end namespace direction
     68
    6069
    6170}; // end namespace behavioural

  • 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

    r45 r48  
    11#ifdef SYSTEMC
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_branch_history_table_Type_h
    44
    55/*
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    2630}; // end namespace two_level_branch_predictor
    2731}; // end namespace meta_predictor
    28 }; // end namespace predictor
    29 }; // end namespace stage_1_ifetch
     32
     33}; // end namespace core
     34}; // end namespace multi_front_end
     35}; // end namespace front_end
     36}; // end namespace prediction_unit
     37}; // end namespace direction
     38
    3039}; // end namespace behavioural
    3140}; // end namespace morpheo             

  • 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

    r42 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     8#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"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    2529                                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2630#endif
    27                                               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param ):
     31                                              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters param ):
    2832                                               _name             (name)
    2933                                              ,_param            (param)
    … …  
    8791}; // end namespace two_level_branch_predictor
    8892}; // end namespace meta_predictor
    89 }; // end namespace predictor
    90 }; // end namespace stage_1_ifetch
     93
     94}; // end namespace core
     95}; // end namespace multi_front_end
     96}; // end namespace front_end
     97}; // end namespace prediction_unit
     98}; // end namespace direction
     99
    91100
    92101}; // end namespace behavioural

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    206210}; // end namespace two_level_branch_predictor
    207211}; // end namespace meta_predictor
    208 }; // end namespace predictor
    209 }; // end namespace stage_1_ifetch
     212
     213}; // end namespace core
     214}; // end namespace multi_front_end
     215}; // end namespace front_end
     216}; // end namespace prediction_unit
     217}; // end namespace direction
     218
    210219}; // end namespace behavioural
    211220}; // end namespace morpheo             

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    4347}; // end namespace two_level_branch_predictor
    4448}; // end namespace meta_predictor
    45 }; // end namespace predictor
    46 }; // end namespace stage_1_ifetch
     49
     50}; // end namespace core
     51}; // end namespace multi_front_end
     52}; // end namespace front_end
     53}; // end namespace prediction_unit
     54}; // end namespace direction
     55
    4756}; // end namespace behavioural
    4857}; // end namespace morpheo             

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2933}; // end namespace two_level_branch_predictor
    3034}; // end namespace meta_predictor
    31 }; // end namespace predictor
    32 }; // end namespace stage_1_ifetch
     35
     36}; // end namespace core
     37}; // end namespace multi_front_end
     38}; // end namespace front_end
     39}; // end namespace prediction_unit
     40}; // end namespace direction
     41
    3342
    3443}; // end namespace behavioural

  • 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

    r2 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     10#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"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3337}; // end namespace two_level_branch_predictor
    3438}; // end namespace meta_predictor
    35 }; // end namespace predictor
    36 }; // end namespace stage_1_ifetch
     39
     40}; // end namespace core
     41}; // end namespace multi_front_end
     42}; // end namespace front_end
     43}; // end namespace prediction_unit
     44}; // end namespace direction
     45
    3746
    3847}; // end namespace behavioural

  • 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

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2529}; // end namespace two_level_branch_predictor
    2630}; // end namespace meta_predictor
    27 }; // end namespace predictor
    28 }; // end namespace stage_1_ifetch
     31
     32}; // end namespace core
     33}; // end namespace multi_front_end
     34}; // end namespace front_end
     35}; // end namespace prediction_unit
     36}; // end namespace direction
     37
    2938
    3039}; // end namespace behavioural

  • 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

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2428}; // end namespace two_level_branch_predictor
    2529}; // end namespace meta_predictor
    26 }; // end namespace predictor
    27 }; // end namespace stage_1_ifetch
     30
     31}; // end namespace core
     32}; // end namespace multi_front_end
     33}; // end namespace front_end
     34}; // end namespace prediction_unit
     35}; // end namespace direction
     36
    2837}; // end namespace behavioural
    2938}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2832}; // end namespace two_level_branch_predictor
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • 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

    r15 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    7377}; // end namespace two_level_branch_predictor
    7478}; // end namespace meta_predictor
    75 }; // end namespace predictor
    76 }; // end namespace stage_1_ifetch
     79
     80}; // end namespace core
     81}; // end namespace multi_front_end
     82}; // end namespace front_end
     83}; // end namespace prediction_unit
     84}; // end namespace direction
     85
    7786}; // end namespace behavioural
    7887}; // end namespace morpheo             

  • 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

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo                    {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    4852}; // end namespace two_level_branch_predictor
    4953}; // end namespace meta_predictor
    50 }; // end namespace predictor
    51 }; // end namespace stage_1_ifetch
     54
     55}; // end namespace core
     56}; // end namespace multi_front_end
     57}; // end namespace front_end
     58}; // end namespace prediction_unit
     59}; // end namespace direction
     60
    5261
    5362}; // end namespace behavioural

  • 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

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    99#include <sstream>
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3640
    3741  ostream& operator<< (ostream& output_stream ,
    38                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x)
     42                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Parameters & x)
    3943  {
    4044    output_stream << x.print(0);
    … …  
    4650}; // end namespace two_level_branch_predictor
    4751}; // end namespace meta_predictor
    48 }; // end namespace predictor
    49 }; // end namespace stage_1_ifetch
     52
     53}; // end namespace core
     54}; // end namespace multi_front_end
     55}; // end namespace front_end
     56}; // end namespace prediction_unit
     57}; // end namespace direction
     58
    5059
    5160}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3539}; // end namespace two_level_branch_predictor
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948
    4049}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    2832}; // end namespace two_level_branch_predictor
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    3943
    4044  ostream& operator<< (ostream& output_stream ,
    41                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table::Statistics & x)
     45                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::branch_history_table::Statistics & x)
    4246  {
    4347    output_stream << x.print(0);
    … …  
    4953}; // end namespace two_level_branch_predictor
    5054}; // end namespace meta_predictor
    51 }; // end namespace predictor
    52 }; // end namespace stage_1_ifetch
     55
     56}; // end namespace core
     57}; // end namespace multi_front_end
     58}; // end namespace front_end
     59}; // end namespace prediction_unit
     60}; // end namespace direction
     61
    5362}; // end namespace behavioural
    5463}; // end namespace morpheo             

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    3337}; // end namespace two_level_branch_predictor
    3438}; // end namespace meta_predictor
    35 }; // end namespace predictor
    36 }; // end namespace stage_1_ifetch
     39
     40}; // end namespace core
     41}; // end namespace multi_front_end
     42}; // end namespace front_end
     43}; // end namespace prediction_unit
     44}; // end namespace direction
     45
    3746
    3847}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.defs

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Makefile.deps

    r2 r48  
    1212endif
    1313ifndef Branch_History_Table
    14 include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps
     14include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/Makefile.deps
    1515endif
    1616ifndef Pattern_History_Table
    17 include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps
     17include $(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/Makefile.deps
    1818endif
    1919ifndef Two_Level_Branch_Predictor_Glue
    20 include $(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/Makefile.deps
     20include $(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
    2121endif
    2222
    … …  
    3030                                                        $(Behavioural_LIBRARY) 
    3131
    32 Two_Level_Branch_Predictor_DIR_LIBRARY          =       -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/lib     \
     32Two_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     \
    3333                                                        $(Two_Level_Branch_Predictor_Glue_DIR_LIBRARY)  \
    3434                                                        $(Branch_History_Table_DIR_LIBRARY)             \
    … …  
    3939
    4040Two_Level_Branch_Predictor_library              :
    41                                                 @$(MAKE) Behavioural_library
    42                                                 @$(MAKE) Branch_History_Table_library
    43                                                 @$(MAKE) Pattern_History_Table_library
    44                                                 @$(MAKE) Two_Level_Branch_Predictor_Glue_library
    45                                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile
     41                                                @\
     42                                                $(MAKE) Behavioural_library;\
     43                                                $(MAKE) Branch_History_Table_library;\
     44                                                $(MAKE) Pattern_History_Table_library;\
     45                                                $(MAKE) Two_Level_Branch_Predictor_Glue_library;\
     46                                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile ;
    4647       
    4748Two_Level_Branch_Predictor_library_clean        :
    48                                                 @$(MAKE) Behavioural_library_clean
    49                                                 @$(MAKE) Branch_History_Table_library_clean
    50                                                 @$(MAKE) Pattern_History_Table_library_clean
    51                                                 @$(MAKE) Two_Level_Branch_Predictor_Glue_library_clean
    52                                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile clean
     49                                                @\
     50                                                $(MAKE) Behavioural_library_clean;\
     51                                                $(MAKE) Branch_History_Table_library_clean;\
     52                                                $(MAKE) Pattern_History_Table_library_clean;\
     53                                                $(MAKE) Two_Level_Branch_Predictor_Glue_library_clean;\
     54                                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor --makefile=Makefile clean;

  • 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

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

  • 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

    r15 r48  
    2626                                                $(Behavioural_LIBRARY)
    2727
    28 Pattern_History_Table_DIR_LIBRARY       =       -L$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/lib       \
     28Pattern_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       \
    2929                                                $(RegisterFile_Monolithic_DIR_LIBRARY)  \
    3030                                                $(Counter_DIR_LIBRARY)          \
    … …  
    3434
    3535Pattern_History_Table_library           :
    36                                         @$(MAKE) Behavioural_library
    37                                         @$(MAKE) Counter_library
    38                                         @$(MAKE) RegisterFile_Monolithic_library
    39                                         @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile
     36                                        @\
     37                                        $(MAKE) Behavioural_library;\
     38                                        $(MAKE) Counter_library;\
     39                                        $(MAKE) RegisterFile_Monolithic_library;\
     40                                        $(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;
    4041       
    4142Pattern_History_Table_library_clean     :
    42                                         @$(MAKE) Behavioural_library_clean
    43                                         @$(MAKE) Counter_library_clean
    44                                         @$(MAKE) RegisterFile_Monolithic_library_clean
    45                                         @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table --makefile=Makefile clean
     43                                        @\
     44                                        $(MAKE) Behavioural_library_clean;\
     45                                        $(MAKE) Counter_library_clean;\
     46                                        $(MAKE) RegisterFile_Monolithic_library_clean;\
     47                                        $(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;

  • 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

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../../../..
     10DIR_MORPHEO                     = ../../../../../../../../../..
    1111
    1212LIBRARY                         = $(Pattern_History_Table_LIBRARY)

  • 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

    r2 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     16#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"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
    24 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor;
    2521
    26 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table;
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
     24using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor;
     25
     26using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table;
    2727
    2828void test   (string name,
    29              morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param);
     29             morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param);

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h"
    1010
    1111#define NB_PARAMS 4
    … …  
    3737  const uint32_t nb_branch_complete = atoi(argv[5]);
    3838
    39   morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param (size_counter       ,
     39  morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param (size_counter       ,
    4040                                                                                                                                       nb_counter         ,
    4141                                                                                                                                       nb_prediction      ,

  • 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

    r45 r48  
    99#define NB_ITERATION 512
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h"
     11#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/SelfTest/include/test.h"
    1212#include "Common/include/Test.h"
    1313
    1414void test (string name,
    15            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param)
     15           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param)
    1616{
    1717  cout << "<" << name << "> : Simulation SystemC" << endl;

  • 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

    r23 r48  
    55
    66% Package de variables d'environnement : Titre, command etc ...
    7 \usepackage{../../../../../../../Behavioural/doc/sty/doc-style}
     7\usepackage{../../../../../../../../../../Behavioural/doc/sty/doc-style}
    88\usepackage{sty/header}
    99

  • 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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Parameters_h
    33
    44/*
    … …  
    1818namespace morpheo {
    1919namespace behavioural {
    20 namespace stage_1_ifetch {
    21 namespace predictor {
     20namespace core {
     21namespace multi_front_end {
     22namespace front_end {
     23namespace prediction_unit {
     24namespace direction {
     25
    2226namespace meta_predictor {
    2327namespace two_level_branch_predictor {
    … …  
    4852  public :        string   print      (uint32_t depth);
    4953  public : friend ostream& operator<< (ostream& output_stream,
    50                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x);
     54                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x);
    5155  };
    5256
    … …  
    5458}; // end namespace two_level_branch_predictor
    5559}; // end namespace meta_predictor
    56 }; // end namespace predictor
    57 }; // end namespace stage_1_ifetch
     60
     61}; // end namespace core
     62}; // end namespace multi_front_end
     63}; // end namespace front_end
     64}; // end namespace prediction_unit
     65}; // end namespace direction
     66
    5867
    5968}; // end namespace behavioural

  • 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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Pattern_History_Table_h
     1#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
     2#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
    33
    44/*
    … …  
    2121#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h"
    2222
    23 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    24 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h"
     23#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     24#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h"
    2525#ifdef STATISTICS
    26 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     26#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    2727#endif
    2828#ifdef VHDL
    … …  
    3535namespace morpheo                    {
    3636namespace behavioural {
    37 namespace stage_1_ifetch {
    38 namespace predictor {
     37namespace core {
     38namespace multi_front_end {
     39namespace front_end {
     40namespace prediction_unit {
     41namespace direction {
     42
    3943namespace meta_predictor {
    4044namespace two_level_branch_predictor {
    … …  
    135139}; // end namespace two_level_branch_predictor
    136140}; // end namespace meta_predictor
    137 }; // end namespace predictor
    138 }; // end namespace stage_1_ifetch
     141
     142}; // end namespace core
     143}; // end namespace multi_front_end
     144}; // end namespace front_end
     145}; // end namespace prediction_unit
     146}; // end namespace direction
     147
    139148
    140149}; // end namespace behavioural

  • 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

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Statistics_h
    44
    55/*
    … …  
    1616#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Statistics.h"
    1717//#include "Behavioural/Generic/Group/include/Statistics.h"
    18 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     18#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    1919
    2020//using namespace morpheo::behavioural::generic::group;
    … …  
    2222namespace morpheo                    {
    2323namespace behavioural {
    24 namespace stage_1_ifetch {
    25 namespace predictor {
     24namespace core {
     25namespace multi_front_end {
     26namespace front_end {
     27namespace prediction_unit {
     28namespace direction {
     29
    2630namespace meta_predictor {
    2731namespace two_level_branch_predictor {
    … …  
    5660}; // end namespace two_level_branch_predictor
    5761}; // end namespace meta_predictor
    58 }; // end namespace predictor
    59 }; // end namespace stage_1_ifetch
     62
     63}; // end namespace core
     64}; // end namespace multi_front_end
     65}; // end namespace front_end
     66}; // end namespace prediction_unit
     67}; // end namespace direction
     68
    6069
    6170}; // end namespace behavioural

  • 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

    r45 r48  
    11#ifdef SYSTEMC
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_pattern_history_table_Type_h
    44
    55/*
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    2630}; // end namespace two_level_branch_predictor
    2731}; // end namespace meta_predictor
    28 }; // end namespace predictor
    29 }; // end namespace stage_1_ifetch
     32
     33}; // end namespace core
     34}; // end namespace multi_front_end
     35}; // end namespace front_end
     36}; // end namespace prediction_unit
     37}; // end namespace direction
     38
    3039}; // end namespace behavioural
    3140}; // end namespace morpheo             

  • 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

    r15 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    7175}; // end namespace two_level_branch_predictor
    7276}; // end namespace meta_predictor
    73 }; // end namespace predictor
    74 }; // end namespace stage_1_ifetch
     77
     78}; // end namespace core
     79}; // end namespace multi_front_end
     80}; // end namespace front_end
     81}; // end namespace prediction_unit
     82}; // end namespace direction
     83
    7584}; // end namespace behavioural
    7685}; // end namespace morpheo             

  • 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

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo                    {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    5256}; // end namespace two_level_branch_predictor
    5357}; // end namespace meta_predictor
    54 }; // end namespace predictor
    55 }; // end namespace stage_1_ifetch
     58
     59}; // end namespace core
     60}; // end namespace multi_front_end
     61}; // end namespace front_end
     62}; // end namespace prediction_unit
     63}; // end namespace direction
     64
    5665
    5766}; // end namespace behavioural

  • 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

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    99#include <sstream>
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4044
    4145  ostream& operator<< (ostream& output_stream ,
    42                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x)
     46                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters & x)
    4347  {
    4448    output_stream << x.print(0);
    … …  
    5054}; // end namespace two_level_branch_predictor
    5155}; // end namespace meta_predictor
    52 }; // end namespace predictor
    53 }; // end namespace stage_1_ifetch
     56
     57}; // end namespace core
     58}; // end namespace multi_front_end
     59}; // end namespace front_end
     60}; // end namespace prediction_unit
     61}; // end namespace direction
     62
    5463
    5564}; // end namespace behavioural

  • 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

    r42 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     8#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"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    2529                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2630#endif
    27                               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param ):
     31                              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters param ):
    2832                              _name              (name)
    2933                              ,_param            (param)
    … …  
    9195}; // end namespace two_level_branch_predictor
    9296}; // end namespace meta_predictor
    93 }; // end namespace predictor
    94 }; // end namespace stage_1_ifetch
     97
     98}; // end namespace core
     99}; // end namespace multi_front_end
     100}; // end namespace front_end
     101}; // end namespace prediction_unit
     102}; // end namespace direction
     103
    95104
    96105}; // end namespace behavioural

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    210214}; // end namespace two_level_branch_predictor
    211215}; // end namespace meta_predictor
    212 }; // end namespace predictor
    213 }; // end namespace stage_1_ifetch
     216
     217}; // end namespace core
     218}; // end namespace multi_front_end
     219}; // end namespace front_end
     220}; // end namespace prediction_unit
     221}; // end namespace direction
     222
    214223
    215224}; // end namespace behavioural

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    4852}; // end namespace two_level_branch_predictor
    4953}; // end namespace meta_predictor
    50 }; // end namespace predictor
    51 }; // end namespace stage_1_ifetch
     54
     55}; // end namespace core
     56}; // end namespace multi_front_end
     57}; // end namespace front_end
     58}; // end namespace prediction_unit
     59}; // end namespace direction
     60
    5261
    5362}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3539}; // end namespace two_level_branch_predictor
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948}; // end namespace behavioural
    4049}; // end namespace morpheo             

  • 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

    r2 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     10#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"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • 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

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4246}; // end namespace two_level_branch_predictor
    4347}; // end namespace meta_predictor
    44 }; // end namespace predictor
    45 }; // end namespace stage_1_ifetch
     48
     49}; // end namespace core
     50}; // end namespace multi_front_end
     51}; // end namespace front_end
     52}; // end namespace prediction_unit
     53}; // end namespace direction
     54
    4655
    4756}; // end namespace behavioural

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3539}; // end namespace two_level_branch_predictor
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948
    4049}; // end namespace behavioural

  • 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

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2832}; // end namespace two_level_branch_predictor
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3236}; // end namespace two_level_branch_predictor
    3337}; // end namespace meta_predictor
    34 }; // end namespace predictor
    35 }; // end namespace stage_1_ifetch
     38
     39}; // end namespace core
     40}; // end namespace multi_front_end
     41}; // end namespace front_end
     42}; // end namespace prediction_unit
     43}; // end namespace direction
     44
    3645
    3746}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3943}; // end namespace two_level_branch_predictor
    4044}; // end namespace meta_predictor
    41 }; // end namespace predictor
    42 }; // end namespace stage_1_ifetch
     45
     46}; // end namespace core
     47}; // end namespace multi_front_end
     48}; // end namespace front_end
     49}; // end namespace prediction_unit
     50}; // end namespace direction
     51
    4352
    4453}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    3034}; // end namespace two_level_branch_predictor
    3135}; // end namespace meta_predictor
    32 }; // end namespace predictor
    33 }; // end namespace stage_1_ifetch
     36
     37}; // end namespace core
     38}; // end namespace multi_front_end
     39}; // end namespace front_end
     40}; // end namespace prediction_unit
     41}; // end namespace direction
     42
    3443
    3544}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    5256
    5357  ostream& operator<< (ostream& output_stream ,
    54                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Statistics & x)
     58                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::pattern_history_table::Statistics & x)
    5559  {
    5660    output_stream << x.print(0);
    … …  
    6266}; // end namespace two_level_branch_predictor
    6367}; // end namespace meta_predictor
    64 }; // end namespace predictor
    65 }; // end namespace stage_1_ifetch
     68
     69}; // end namespace core
     70}; // end namespace multi_front_end
     71}; // end namespace front_end
     72}; // end namespace prediction_unit
     73}; // end namespace direction
     74
    6675
    6776}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    3842}; // end namespace two_level_branch_predictor
    3943}; // end namespace meta_predictor
    40 }; // end namespace predictor
    41 }; // end namespace stage_1_ifetch
     44
     45}; // end namespace core
     46}; // end namespace multi_front_end
     47}; // end namespace front_end
     48}; // end namespace prediction_unit
     49}; // end namespace direction
     50
    4251
    4352}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/Makefile

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../../..
    11 
     10DIR_MORPHEO                     = ../../../../../../../../..
    1211LIBRARY                         = $(Two_Level_Branch_Predictor_LIBRARY)
    1312

  • 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

    r2 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     16#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
    2421
    25 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor;
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
     24
     25using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor;
    2626
    2727void test   (string name,
    28              morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param);
     28             morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param);

  • 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

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h"
    99
    1010#define NB_PARAMS 10
    … …  
    5353  try
    5454    {
    55       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param (have_bht               ,
     55      morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param (have_bht               ,
    5656                                                                                                                     bht_size_shifter       ,
    5757                                                                                                                     bht_nb_shifter         ,

  • 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

    r45 r48  
    99#define NB_ITERATION 512
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h"
     11#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/SelfTest/include/test.h"
    1212#include "Common/include/Test.h"
    1313#include "Common/include/BitManipulation.h"
    1414void test (string name,
    15            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param)
     15           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param)
    1616{
    1717  cout << "<" << name << "> : Simulation SystemC" << endl;

  • 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

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_COMPONENT_MORPHEO           = ../../../../../..
     10DIR_COMPONENT_MORPHEO           = ../../../../../../../../..
    1111DIR_MORPHEO                     = $(DIR_COMPONENT)/$(DIR_COMPONENT_MORPHEO)

  • 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

    r2 r48  
    1818                                        $(Behavioural_LIBRARY) 
    1919
    20 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     \
     20Two_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     \
    2121                                        $(Behavioural_DIR_LIBRARY)
    2222
    … …  
    2424
    2525Two_Level_Branch_Predictor_Glue_library         :
    26                                 @$(MAKE) Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile
     26                                @\
     27                                $(MAKE) Behavioural_library;\
     28                                $(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;
    2829       
    2930Two_Level_Branch_Predictor_Glue_library_clean   :
    30                                 @$(MAKE) Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue --makefile=Makefile clean
     31                                @\
     32                                $(MAKE) Behavioural_library_clean;\
     33                                $(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;

  • 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

    r23 r48  
    88
    99#-----[ Directory ]----------------------------------------
    10 DIR_MORPHEO                     = ../../../../../../..
     10DIR_MORPHEO                     = ../../../../../../../../../..
    1111
    1212LIBRARY                         = $(Two_Level_Branch_Predictor_Glue_LIBRARY)

  • 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

    r2 r48  
    1414#include <iostream>
    1515
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     16#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"
    1717
    1818using namespace std;
    1919using namespace morpheo;
    2020using namespace morpheo::behavioural;
    21 using namespace morpheo::behavioural::stage_1_ifetch;
    22 using namespace morpheo::behavioural::stage_1_ifetch::predictor;
    23 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor;
    24 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor;
    2521
    26 using namespace morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue;
     22using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction;
     23using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor;
     24using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor;
     25
     26using namespace morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue;
    2727
    2828void test   (string name,
    29              morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param);
     29             morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param);

  • 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

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h"
     8#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"
    99
    1010#define NB_PARAMS 9
    … …  
    4646  const uint32_t nb_branch_complete       = atoi(argv[10]);
    4747
    48   morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param (have_bht              ,
     48  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              ,
    4949                                                                                                                                                  bht_size_history      ,
    5050                                                                                                                                                  bht_size_address      ,

  • 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

    r45 r48  
    99#define NB_ITERATION 64
    1010
    11 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/SelfTest/include/test.h"
     11#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"
    1212#include "Common/include/BitManipulation.h"
    1313#include "Common/include/Test.h"
    1414
    1515void test (string name,
    16            morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param)
     16           morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param)
    1717{
    1818  cout << "<" << name << "> : Simulation SystemC" << endl;

  • 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

    r23 r48  
    55
    66% Package de variables d'environnement : Titre, command etc ...
    7 \usepackage{../../../../../../../Behavioural/doc/sty/doc-style}
     7\usepackage{../../../../../../../../../../Behavioural/doc/sty/doc-style}
    88\usepackage{sty/header}
    99

  • 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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Parameters_h
     1#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
     2#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
    33
    44/*
    … …  
    1515namespace morpheo {
    1616namespace behavioural {
    17 namespace stage_1_ifetch {
    18 namespace predictor {
     17namespace core {
     18namespace multi_front_end {
     19namespace front_end {
     20namespace prediction_unit {
     21namespace direction {
     22
    1923namespace meta_predictor {
    2024namespace two_level_branch_predictor {
    … …  
    5458  public :        string   print      (uint32_t depth);
    5559  public : friend ostream& operator<< (ostream& output_stream,
    56                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x);
     60                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x);
    5761  };
    5862
    … …  
    6064}; // end namespace two_level_branch_predictor
    6165}; // end namespace meta_predictor
    62 }; // end namespace predictor
    63 }; // end namespace stage_1_ifetch
     66
     67}; // end namespace core
     68}; // end namespace multi_front_end
     69}; // end namespace front_end
     70}; // end namespace prediction_unit
     71}; // end namespace direction
     72
    6473
    6574}; // end namespace behavioural

  • 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

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Statistics_h
     2#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
     3#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
    44
    55/*
    … …  
    1414#include "Behavioural/include/Parameters_Statistics.h"
    1515//#include "Behavioural/Generic/Group/include/Statistics.h"
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
     16#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"
    1717
    1818//using namespace morpheo::behavioural::generic::group;
    … …  
    2020namespace morpheo                    {
    2121namespace behavioural {
    22 namespace stage_1_ifetch {
    23 namespace predictor {
     22namespace core {
     23namespace multi_front_end {
     24namespace front_end {
     25namespace prediction_unit {
     26namespace direction {
     27
    2428namespace meta_predictor {
    2529namespace two_level_branch_predictor {
    … …  
    5256}; // end namespace two_level_branch_predictor
    5357}; // end namespace meta_predictor
    54 }; // end namespace predictor
    55 }; // end namespace stage_1_ifetch
     58
     59}; // end namespace core
     60}; // end namespace multi_front_end
     61}; // end namespace front_end
     62}; // end namespace prediction_unit
     63}; // end namespace direction
     64
    5665
    5766}; // end namespace behavioural

  • 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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Two_Level_Branch_Predictor_Glue_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Two_Level_Branch_Predictor_Glue_h
     1#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
     2#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
    33
    44/*
    … …  
    1717#include "Common/include/Debug.h"
    1818
    19 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
    20 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h"
     19#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"
     20#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"
    2121#ifdef STATISTICS
    22 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     22#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"
    2323#endif
    2424#ifdef VHDL
    … …  
    3131namespace morpheo {
    3232namespace behavioural {
    33 namespace stage_1_ifetch {
    34 namespace predictor {
     33namespace core {
     34namespace multi_front_end {
     35namespace front_end {
     36namespace prediction_unit {
     37namespace direction {
     38
    3539namespace meta_predictor {
    3640namespace two_level_branch_predictor {
    … …  
    140144}; // end namespace two_level_branch_predictor
    141145}; // end namespace meta_predictor
    142 }; // end namespace predictor
    143 }; // end namespace stage_1_ifetch
     146
     147}; // end namespace core
     148}; // end namespace multi_front_end
     149}; // end namespace front_end
     150}; // end namespace prediction_unit
     151}; // end namespace direction
     152
    144153
    145154}; // end namespace behavioural

  • 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

    r45 r48  
    11#ifdef SYSTEMC
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Type_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_two_level_branch_predictor_glue_Type_h
     2#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
     3#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
    44
    55/*
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    2630}; // end namespace two_level_branch_predictor
    2731}; // end namespace meta_predictor
    28 }; // end namespace predictor
    29 }; // end namespace stage_1_ifetch
     32
     33}; // end namespace core
     34}; // end namespace multi_front_end
     35}; // end namespace front_end
     36}; // end namespace prediction_unit
     37}; // end namespace direction
     38
    3039
    3140}; // end namespace behavioural

  • 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

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
     8#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"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    6872}; // end namespace two_level_branch_predictor
    6973}; // end namespace meta_predictor
    70 }; // end namespace predictor
    71 }; // end namespace stage_1_ifetch
     74
     75}; // end namespace core
     76}; // end namespace multi_front_end
     77}; // end namespace front_end
     78}; // end namespace prediction_unit
     79}; // end namespace direction
     80
    7281}; // end namespace behavioural
    7382}; // end namespace morpheo             

  • 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

    r45 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Types.h"
     8#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"
     9#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"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo                    {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    4751}; // end namespace two_level_branch_predictor
    4852}; // end namespace meta_predictor
    49 }; // end namespace predictor
    50 }; // end namespace stage_1_ifetch
     53
     54}; // end namespace core
     55}; // end namespace multi_front_end
     56}; // end namespace front_end
     57}; // end namespace prediction_unit
     58}; // end namespace direction
     59
    5160}; // end namespace behavioural
    5261}; // end namespace morpheo             

  • 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

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
     8#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"
    99#include <sstream>
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4347
    4448  ostream& operator<< (ostream& output_stream ,
    45                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x)
     49                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters & x)
    4650  {
    4751    output_stream << x.print(0);
    … …  
    5357}; // end namespace two_level_branch_predictor
    5458}; // end namespace meta_predictor
    55 }; // end namespace predictor
    56 }; // end namespace stage_1_ifetch
     59
     60}; // end namespace core
     61}; // end namespace multi_front_end
     62}; // end namespace front_end
     63}; // end namespace prediction_unit
     64}; // end namespace direction
     65
    5766
    5867}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3943}; // end namespace two_level_branch_predictor
    4044}; // end namespace meta_predictor
    41 }; // end namespace predictor
    42 }; // end namespace stage_1_ifetch
     45
     46}; // end namespace core
     47}; // end namespace multi_front_end
     48}; // end namespace front_end
     49}; // end namespace prediction_unit
     50}; // end namespace direction
     51
    4352
    4453}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     9#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"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    3034}; // end namespace two_level_branch_predictor
    3135}; // end namespace meta_predictor
    32 }; // end namespace predictor
    33 }; // end namespace stage_1_ifetch
     36
     37}; // end namespace core
     38}; // end namespace multi_front_end
     39}; // end namespace front_end
     40}; // end namespace prediction_unit
     41}; // end namespace direction
     42
    3443
    3544}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     9#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"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    3842
    3943  ostream& operator<< (ostream& output_stream ,
    40                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Statistics & x)
     44                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Statistics & x)
    4145  {
    4246    output_stream << x.print(0);
    … …  
    4852}; // end namespace two_level_branch_predictor
    4953}; // end namespace meta_predictor
    50 }; // end namespace predictor
    51 }; // end namespace stage_1_ifetch
     54
     55}; // end namespace core
     56}; // end namespace multi_front_end
     57}; // end namespace front_end
     58}; // end namespace prediction_unit
     59}; // end namespace direction
     60
    5261
    5362}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     9#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"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    3842}; // end namespace two_level_branch_predictor
    3943}; // end namespace meta_predictor
    40 }; // end namespace predictor
    41 }; // end namespace stage_1_ifetch
     44
     45}; // end namespace core
     46}; // end namespace multi_front_end
     47}; // end namespace front_end
     48}; // end namespace prediction_unit
     49}; // end namespace direction
     50
    4251
    4352}; // end namespace behavioural

  • 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

    r45 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     8#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"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    2529                                                                    morpheo::behavioural::Parameters_Statistics             param_statistics,
    2630#endif
    27                                                                     morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param ):
     31                                                                    morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::two_level_branch_predictor_glue::Parameters param ):
    2832                                                                    _name              (name)
    2933                                                                    ,_param            (param)
    … …  
    199203}; // end namespace two_level_branch_predictor
    200204}; // end namespace meta_predictor
    201 }; // end namespace predictor
    202 }; // end namespace stage_1_ifetch
     205
     206}; // end namespace core
     207}; // end namespace multi_front_end
     208}; // end namespace front_end
     209}; // end namespace prediction_unit
     210}; // end namespace direction
     211
    203212
    204213}; // end namespace behavioural

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    147151}; // end namespace two_level_branch_predictor
    148152}; // end namespace meta_predictor
    149 }; // end namespace predictor
    150 }; // end namespace stage_1_ifetch
     153
     154}; // end namespace core
     155}; // end namespace multi_front_end
     156}; // end namespace front_end
     157}; // end namespace prediction_unit
     158}; // end namespace direction
     159
    151160
    152161}; // end namespace behavioural

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    6569}; // end namespace two_level_branch_predictor
    6670}; // end namespace meta_predictor
    67 }; // end namespace predictor
    68 }; // end namespace stage_1_ifetch
     71
     72}; // end namespace core
     73}; // end namespace multi_front_end
     74}; // end namespace front_end
     75}; // end namespace prediction_unit
     76}; // end namespace direction
     77
    6978
    7079}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150}; // end namespace behavioural
    4251}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150}; // end namespace behavioural
    4251}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4852}; // end namespace two_level_branch_predictor
    4953}; // end namespace meta_predictor
    50 }; // end namespace predictor
    51 }; // end namespace stage_1_ifetch
     54
     55}; // end namespace core
     56}; // end namespace multi_front_end
     57}; // end namespace front_end
     58}; // end namespace prediction_unit
     59}; // end namespace direction
     60
    5261}; // end namespace behavioural
    5362}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150}; // end namespace behavioural
    4251}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3842}; // end namespace two_level_branch_predictor
    3943}; // end namespace meta_predictor
    40 }; // end namespace predictor
    41 }; // end namespace stage_1_ifetch
     44
     45}; // end namespace core
     46}; // end namespace multi_front_end
     47}; // end namespace front_end
     48}; // end namespace prediction_unit
     49}; // end namespace direction
     50
    4251}; // end namespace behavioural
    4352}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Common/include/BitManipulation.h"
    1111
    1212namespace morpheo {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4448}; // end namespace two_level_branch_predictor
    4549}; // end namespace meta_predictor
    46 }; // end namespace predictor
    47 }; // end namespace stage_1_ifetch
     50
     51}; // end namespace core
     52}; // end namespace multi_front_end
     53}; // end namespace front_end
     54}; // end namespace prediction_unit
     55}; // end namespace direction
     56
    4857}; // end namespace behavioural
    4958}; // end namespace morpheo             

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3236}; // end namespace two_level_branch_predictor
    3337}; // end namespace meta_predictor
    34 }; // end namespace predictor
    35 }; // end namespace stage_1_ifetch
     38
     39}; // end namespace core
     40}; // end namespace multi_front_end
     41}; // end namespace front_end
     42}; // end namespace prediction_unit
     43}; // end namespace direction
     44
    3645
    3746}; // end namespace behavioural

  • 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

    r2 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     10#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"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • 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

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4246}; // end namespace two_level_branch_predictor
    4347}; // end namespace meta_predictor
    44 }; // end namespace predictor
    45 }; // end namespace stage_1_ifetch
     48
     49}; // end namespace core
     50}; // end namespace multi_front_end
     51}; // end namespace front_end
     52}; // end namespace prediction_unit
     53}; // end namespace direction
     54
    4655
    4756}; // end namespace behavioural

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    153157}; // end namespace two_level_branch_predictor
    154158}; // end namespace meta_predictor
    155 }; // end namespace predictor
    156 }; // end namespace stage_1_ifetch
     159
     160}; // end namespace core
     161}; // end namespace multi_front_end
     162}; // end namespace front_end
     163}; // end namespace prediction_unit
     164}; // end namespace direction
     165
    157166
    158167}; // end namespace behavioural

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2731}; // end namespace two_level_branch_predictor
    2832}; // end namespace meta_predictor
    29 }; // end namespace predictor
    30 }; // end namespace stage_1_ifetch
     33
     34}; // end namespace core
     35}; // end namespace multi_front_end
     36}; // end namespace front_end
     37}; // end namespace prediction_unit
     38}; // end namespace direction
     39
    3140
    3241}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     9#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"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3236}; // end namespace two_level_branch_predictor
    3337}; // end namespace meta_predictor
    34 }; // end namespace predictor
    35 }; // end namespace stage_1_ifetch
     38
     39}; // end namespace core
     40}; // end namespace multi_front_end
     41}; // end namespace front_end
     42}; // end namespace prediction_unit
     43}; // end namespace direction
     44
    3645
    3746}; // end namespace behavioural

  • 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

    r23 r48  
    55
    66% Package de variables d'environnement : Titre, command etc ...
    7 \usepackage{../../../../../../Behavioural/doc/sty/doc-style}
     7\usepackage{../../../../../../../../../Behavioural/doc/sty/doc-style}
    88\usepackage{sty/header}
    99

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Parameters_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Parameters_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Parameters_h
    33
    44/*
    … …  
    1212#include "Behavioural/include/Parameters.h"
    1313// Internal structure
    14 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
    15 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Parameters.h"
     14#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Parameters.h"
     15#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Parameters.h"
     16#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"
    1717#include <math.h>
    1818
    1919namespace morpheo {
    2020namespace behavioural {
    21 namespace stage_1_ifetch {
    22 namespace predictor {
     21namespace core {
     22namespace multi_front_end {
     23namespace front_end {
     24namespace prediction_unit {
     25namespace direction {
     26
    2327namespace meta_predictor {
    2428namespace two_level_branch_predictor {
    … …  
    4246  public : const uint32_t _pht_size_address  ;
    4347
    44   public :       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters * _param_branch_history_table;
    45   public :       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters * _param_pattern_history_table;
    46   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;
     48  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;
     49  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;
     50  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;
    4751
    4852    //-----[ methods ]-----------------------------------------------------------
    … …  
    6569  public :        string   print      (uint32_t depth);
    6670  public : friend ostream& operator<< (ostream& output_stream,
    67                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters & x);
     71                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters & x);
    6872  };
    6973
    7074}; // end namespace two_level_branch_predictor
    7175}; // end namespace meta_predictor
    72 }; // end namespace predictor
    73 }; // end namespace stage_1_ifetch
     76
     77}; // end namespace core
     78}; // end namespace multi_front_end
     79}; // end namespace front_end
     80}; // end namespace prediction_unit
     81}; // end namespace direction
     82
    7483}; // end namespace behavioural
    7584}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Statistics_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Statistics_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Statistics_h
    44
    55/*
    … …  
    1212#include "Common/include/Debug.h"
    1313// Internal structure
    14 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
    15 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Statistics.h"
     14#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Statistics.h"
     15#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Statistics.h"
     16#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"
    1717#include "Behavioural/include/Statistics.h"
    1818#include "Behavioural/include/Parameters_Statistics.h"
    1919//#include "Behavioural/Generic/Group/include/Statistics.h"
    20 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     20#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    2121
    2222//using namespace morpheo::behavioural::generic::group;
    … …  
    2424namespace morpheo                    {
    2525namespace behavioural {
    26 namespace stage_1_ifetch {
    27 namespace predictor {
     26namespace core {
     27namespace multi_front_end {
     28namespace front_end {
     29namespace prediction_unit {
     30namespace direction {
     31
    2832namespace meta_predictor {
    2933namespace two_level_branch_predictor {
    … …  
    5761}; // end namespace two_level_branch_predictor
    5862}; // end namespace meta_predictor
    59 }; // end namespace predictor
    60 }; // end namespace stage_1_ifetch
     63
     64}; // end namespace core
     65}; // end namespace multi_front_end
     66}; // end namespace front_end
     67}; // end namespace prediction_unit
     68}; // end namespace direction
     69
    6170
    6271}; // end namespace behavioural

  • 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

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Two_Level_Branch_Predictor_h
    33
    44/*
    … …  
    1818
    1919// Internal structure
    20 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table/include/Branch_History_Table.h"
    21 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Pattern_History_Table/include/Pattern_History_Table.h"
    22 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/Two_Level_Branch_Predictor_Glue/include/Two_Level_Branch_Predictor_Glue.h"
     20#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"
     21#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"
     22#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"
    2323
    24 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    25 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h"
     24#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     25#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h"
    2626#ifdef STATISTICS
    27 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     27#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    2828#endif
    2929#ifdef VHDL
    … …  
    3636namespace morpheo {
    3737namespace behavioural {
    38 namespace stage_1_ifetch {
    39 namespace predictor {
     38namespace core {
     39namespace multi_front_end {
     40namespace front_end {
     41namespace prediction_unit {
     42namespace direction {
     43
    4044namespace meta_predictor {
    4145namespace two_level_branch_predictor {
    … …  
    98102
    99103    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    100   protected : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Branch_History_Table  * component_Branch_History_Table;
    101   protected : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Pattern_History_Table * component_Pattern_History_Table;
    102   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;
     104  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;
     105  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;
     106  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;
    103107
    104108    // -----[ methods ]---------------------------------------------------
    … …  
    145149}; // end namespace two_level_branch_predictor
    146150}; // end namespace meta_predictor
    147 }; // end namespace predictor
    148 }; // end namespace stage_1_ifetch
     151
     152}; // end namespace core
     153}; // end namespace multi_front_end
     154}; // end namespace front_end
     155}; // end namespace prediction_unit
     156}; // end namespace direction
     157
    149158
    150159}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h

    r45 r48  
    11#ifdef SYSTEMC
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Type_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_two_level_branch_predictor_Type_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Type_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_two_level_branch_predictor_Type_h
    44
    55/*
    … …  
    1414namespace morpheo {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    2529}; // end namespace two_level_branch_predictor
    2630}; // end namespace meta_predictor
    27 }; // end namespace predictor
    28 }; // end namespace stage_1_ifetch
     31
     32}; // end namespace core
     33}; // end namespace multi_front_end
     34}; // end namespace front_end
     35}; // end namespace prediction_unit
     36}; // end namespace direction
     37
    2938}; // end namespace behavioural
    3039}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Parameters.cpp

    r3 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    4246   
    4347    if (_have_bht)
    44     _param_branch_history_table  = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter  ,
     48    _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  ,
    4549                                                                                                                                                                       _bht_nb_shifter    ,
    4650                                                                                                                                                                       _nb_prediction     ,
    4751                                                                                                                                                                       _nb_branch_complete);
    4852    if (_have_pht)
    49     _param_pattern_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter  ,
     53    _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  ,
    5054                                                                                                                                                                       _pht_nb_counter    ,
    5155                                                                                                                                                                       _nb_prediction     ,
    … …  
    5357   
    5458                                                     
    55     _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              ,
     59    _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              ,
    5660                                                                                                                                                                                           _bht_size_shifter      ,
    5761                                                                                                                                                                                           _bht_size_address      ,
    … …  
    8589
    8690    if (_have_bht)
    87     _param_branch_history_table  = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::branch_history_table ::Parameters (_bht_size_shifter  ,
     91    _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  ,
    8892                                                                                                                                                                       _bht_nb_shifter    ,
    8993                                                                                                                                                                       _nb_prediction     ,
    9094                                                                                                                                                                       _nb_branch_complete);
    9195    if (_have_pht)
    92     _param_pattern_history_table = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::pattern_history_table::Parameters (_pht_size_counter  ,
     96    _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  ,
    9397                                                                                                                                                                       _pht_nb_counter    ,
    9498                                                                                                                                                                       _nb_prediction     ,
    9599                                                                                                                                                                       _nb_branch_complete);
    96100
    97     _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              ,
     101    _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              ,
    98102                                                                                                                                                                                           _bht_size_shifter      ,
    99103                                                                                                                                                                                           _bht_size_address      ,
    … …  
    123127}; // end namespace two_level_branch_predictor
    124128}; // end namespace meta_predictor
    125 }; // end namespace predictor
    126 }; // end namespace stage_1_ifetch
     129
     130}; // end namespace core
     131}; // end namespace multi_front_end
     132}; // end namespace front_end
     133}; // end namespace prediction_unit
     134}; // end namespace direction
     135
    127136
    128137}; // end namespace behavioural

  • 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

    r3 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822namespace two_level_branch_predictor {
    … …  
    7983}; // end namespace two_level_branch_predictor
    8084}; // end namespace meta_predictor
    81 }; // end namespace predictor
    82 }; // end namespace stage_1_ifetch
     85
     86}; // end namespace core
     87}; // end namespace multi_front_end
     88}; // end namespace front_end
     89}; // end namespace prediction_unit
     90}; // end namespace direction
     91
    8392}; // end namespace behavioural
    8493}; // end namespace morpheo             

  • 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

    r2 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    99#include <sstream>
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4852
    4953  ostream& operator<< (ostream& output_stream ,
    50                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters & x)
     54                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters & x)
    5155  {
    5256    output_stream << x.print(0);
    … …  
    5761}; // end namespace two_level_branch_predictor
    5862}; // end namespace meta_predictor
    59 }; // end namespace predictor
    60 }; // end namespace stage_1_ifetch
     63
     64}; // end namespace core
     65}; // end namespace multi_front_end
     66}; // end namespace front_end
     67}; // end namespace prediction_unit
     68}; // end namespace direction
     69
    6170}; // end namespace behavioural
    6271}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/src/Statistics.cpp

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3741}; // end namespace two_level_branch_predictor
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    2832}; // end namespace two_level_branch_predictor
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    4448
    4549  ostream& operator<< (ostream& output_stream ,
    46                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Statistics & x)
     50                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Statistics & x)
    4751  {
    4852    output_stream << x.print(0);
    … …  
    5357}; // end namespace two_level_branch_predictor
    5458}; // end namespace meta_predictor
    55 }; // end namespace predictor
    56 }; // end namespace stage_1_ifetch
     59
     60}; // end namespace core
     61}; // end namespace multi_front_end
     62}; // end namespace front_end
     63}; // end namespace prediction_unit
     64}; // end namespace direction
     65
    5766
    5867}; // end namespace behavioural

  • 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

    r2 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923namespace two_level_branch_predictor {
    … …  
    3640}; // end namespace two_level_branch_predictor
    3741}; // end namespace meta_predictor
    38 }; // end namespace predictor
    39 }; // end namespace stage_1_ifetch
     42
     43}; // end namespace core
     44}; // end namespace multi_front_end
     45}; // end namespace front_end
     46}; // end namespace prediction_unit
     47}; // end namespace direction
     48
    4049
    4150}; // end namespace behavioural

  • 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

    r42 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519namespace two_level_branch_predictor {
    … …  
    2428                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2529#endif
    26                               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters param ):
     30                              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::two_level_branch_predictor::Parameters param ):
    2731                              _name              (name)
    2832                              ,_param            (param)
    … …  
    8791}; // end namespace two_level_branch_predictor
    8892}; // end namespace meta_predictor
    89 }; // end namespace predictor
    90 }; // end namespace stage_1_ifetch
     93
     94}; // end namespace core
     95}; // end namespace multi_front_end
     96}; // end namespace front_end
     97}; // end namespace prediction_unit
     98}; // end namespace direction
     99
    91100}; // end namespace behavioural
    92101}; // end namespace morpheo             

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    113117        name_component = _name+"_Branch_History_Table";
    114118       
    115         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()
     119        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()
    116120#ifdef STATISTICS
    117121                                                                                                                                                                                       ,_param_statistics
    … …  
    134138        name_component = _name+"_Pattern_History_Table";
    135139       
    136         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()
     140        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()
    137141#ifdef STATISTICS
    138142                                                                                                                                                                                          ,_param_statistics
    … …  
    154158    name_component = _name+"_Two_Level_Branch_Predictor_Glue";
    155159
    156     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()
     160    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()
    157161#ifdef STATISTICS
    158162                                                                                                                                                                                                                   ,_param_statistics
    … …  
    297301}; // end namespace two_level_branch_predictor
    298302}; // end namespace meta_predictor
    299 }; // end namespace predictor
    300 }; // end namespace stage_1_ifetch
     303
     304}; // end namespace core
     305}; // end namespace multi_front_end
     306}; // end namespace front_end
     307}; // end namespace prediction_unit
     308}; // end namespace direction
     309
    301310}; // end namespace behavioural
    302311}; // end namespace morpheo             

  • 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

    r42 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    5458}; // end namespace two_level_branch_predictor
    5559}; // end namespace meta_predictor
    56 }; // end namespace predictor
    57 }; // end namespace stage_1_ifetch
     60
     61}; // end namespace core
     62}; // end namespace multi_front_end
     63}; // end namespace front_end
     64}; // end namespace prediction_unit
     65}; // end namespace direction
     66
    5867
    5968}; // end namespace behavioural

  • 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

    r3 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3842}; // end namespace two_level_branch_predictor
    3943}; // end namespace meta_predictor
    40 }; // end namespace predictor
    41 }; // end namespace stage_1_ifetch
     44
     45}; // end namespace core
     46}; // end namespace multi_front_end
     47}; // end namespace front_end
     48}; // end namespace prediction_unit
     49}; // end namespace direction
     50
    4251
    4352}; // end namespace behavioural

  • 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

    r2 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     10#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    3539}; // end namespace two_level_branch_predictor
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948
    4049}; // end namespace behavioural

  • 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

    r43 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721namespace two_level_branch_predictor {
    … …  
    4044}; // end namespace two_level_branch_predictor
    4145}; // end namespace meta_predictor
    42 }; // end namespace predictor
    43 }; // end namespace stage_1_ifetch
     46
     47}; // end namespace core
     48}; // end namespace multi_front_end
     49}; // end namespace front_end
     50}; // end namespace prediction_unit
     51}; // end namespace direction
     52
    4453
    4554}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2731}; // end namespace two_level_branch_predictor
    2832}; // end namespace meta_predictor
    29 }; // end namespace predictor
    30 }; // end namespace stage_1_ifetch
     33
     34}; // end namespace core
     35}; // end namespace multi_front_end
     36}; // end namespace front_end
     37}; // end namespace prediction_unit
     38}; // end namespace direction
     39
    3140
    3241}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    2630}; // end namespace two_level_branch_predictor
    2731}; // end namespace meta_predictor
    28 }; // end namespace predictor
    29 }; // end namespace stage_1_ifetch
     32
     33}; // end namespace core
     34}; // end namespace multi_front_end
     35}; // end namespace front_end
     36}; // end namespace prediction_unit
     37}; // end namespace direction
     38
    3039
    3140}; // end namespace behavioural

  • 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

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620namespace two_level_branch_predictor {
    … …  
    3034}; // end namespace two_level_branch_predictor
    3135}; // end namespace meta_predictor
    32 }; // end namespace predictor
    33 }; // end namespace stage_1_ifetch
     36
     37}; // end namespace core
     38}; // end namespace multi_front_end
     39}; // end namespace front_end
     40}; // end namespace prediction_unit
     41}; // end namespace direction
     42
    3443
    3544}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/doc/Meta_Predictor.tex

    r23 r48  
    55
    66% Package de variables d'environnement : Titre, command etc ...
    7 \usepackage{../../../../../Behavioural/doc/sty/doc-style}
     7\usepackage{../../../../../../../../Behavioural/doc/sty/doc-style}
    88\usepackage{sty/header}
    99

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Meta_Predictor_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Meta_Predictor_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Meta_Predictor_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Meta_Predictor_h
    33
    44/*
    … …  
    1818
    1919// Internal structure
    20 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
    21 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
     20#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Two_Level_Branch_Predictor.h"
     21#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Meta_Predictor_Glue.h"
    2222
    23 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h"
    24 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Types.h"
     23#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h"
     24#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Types.h"
    2525#ifdef STATISTICS
    26 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h"
     26#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h"
    2727#endif
    2828#ifdef VHDL
    … …  
    3535namespace morpheo {
    3636namespace behavioural {
    37 namespace stage_1_ifetch {
    38 namespace predictor {
     37namespace core {
     38namespace multi_front_end {
     39namespace front_end {
     40namespace prediction_unit {
     41namespace direction {
     42
    3943namespace meta_predictor {
    4044
    … …  
    8286
    8387    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    84   public    : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_0;
    85   public    : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_1;
    86   public    : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Two_Level_Branch_Predictor * component_Two_Level_Branch_Predictor_2;
    87   public    : morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Meta_Predictor_Glue               * component_Meta_Predictor_Glue         ;
     88  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;
     89  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;
     90  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;
     91  public    : morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Meta_Predictor_Glue               * component_Meta_Predictor_Glue         ;
    8892
    8993    // ~~~~~[ Register ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    … …  
    96100  private   : SC_SIGNAL(Tcontrol_t)        ** signal_PREDICT_PREDICTOR_2_ACK ;
    97101
    98   private   : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_0_BHT_HISTORY;
    99   private   : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_0_PHT_HISTORY;
    100   private   : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_1_BHT_HISTORY;
    101   private   : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_1_PHT_HISTORY;
    102   private   : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tbht_history_t) ** signal_PREDICT_PREDICTOR_2_BHT_HISTORY;
    103   private   : SC_SIGNAL(morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Tpht_history_t) ** signal_PREDICT_PREDICTOR_2_PHT_HISTORY;
     102  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;
     103  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;
     104  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;
     105  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;
     106  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;
     107  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;
    104108
    105109
    … …  
    110114  private   : SC_SIGNAL(Tcontrol_t)        ** signal_BRANCH_COMPLETE_PREDICTOR_2_DIRECTION;
    111115
    112   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;
    113   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;
    114   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;
    115   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;
    116   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;
    117   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;
     116  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;
     117  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;
     118  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;
     119  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;
     120  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;
     121  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;
    118122
    119123#endif
    … …  
    161165
    162166}; // end namespace meta_predictor
    163 }; // end namespace predictor
    164 }; // end namespace stage_1_ifetch
     167
     168}; // end namespace core
     169}; // end namespace multi_front_end
     170}; // end namespace front_end
     171}; // end namespace prediction_unit
     172}; // end namespace direction
     173
    165174
    166175}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Parameters_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Parameters_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Parameters_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Parameters_h
    33
    44/*
    … …  
    1111#include "Common/include/Debug.h"
    1212#include "Behavioural/include/Parameters.h"
    13 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
    14 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
     13#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/include/Parameters.h"
     14#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Meta_Predictor_Glue/include/Parameters.h"
    1515#include <math.h>
    1616
    1717namespace morpheo {
    1818namespace behavioural {
    19 namespace stage_1_ifetch {
    20 namespace predictor {
     19namespace core {
     20namespace multi_front_end {
     21namespace front_end {
     22namespace prediction_unit {
     23namespace direction {
     24
    2125namespace meta_predictor {
    2226
    … …  
    5660  public : const uint32_t _size_history                      ;
    5761
    58   public :       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_0;
    59   public :       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_1;
    60   public :       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters * _param_two_level_branch_predictor_2;
    61   public :       morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters        * _param_meta_predictor_glue;
     62  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;
     63  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;
     64  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;
     65  public :       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::meta_predictor_glue::Parameters        * _param_meta_predictor_glue;
    6266
    6367    //-----[ methods ]-----------------------------------------------------------
    … …  
    98102  public :        string   print      (uint32_t depth);
    99103  public : friend ostream& operator<< (ostream& output_stream,
    100                                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters & x);
     104                                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters & x);
    101105  };
    102106
    103107}; // end namespace meta_predictor
    104 }; // end namespace predictor
    105 }; // end namespace stage_1_ifetch
     108
     109}; // end namespace core
     110}; // end namespace multi_front_end
     111}; // end namespace front_end
     112}; // end namespace prediction_unit
     113}; // end namespace direction
     114
    106115}; // end namespace behavioural
    107116}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h

    r45 r48  
    11#ifdef STATISTICS
    2 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Statistics_h
    3 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Statistics_h
     2#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Statistics_h
     3#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Statistics_h
    44
    55/*
    … …  
    1414#include "Behavioural/include/Parameters_Statistics.h"
    1515//#include "Behavioural/Generic/Group/include/Statistics.h"
    16 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h"
     16#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h"
    1717
    1818//using namespace morpheo::behavioural::generic::group;
    … …  
    2020namespace morpheo                    {
    2121namespace behavioural {
    22 namespace stage_1_ifetch {
    23 namespace predictor {
     22namespace core {
     23namespace multi_front_end {
     24namespace front_end {
     25namespace prediction_unit {
     26namespace direction {
     27
    2428namespace meta_predictor {
    2529
    … …  
    4953
    5054}; // end namespace meta_predictor
    51 }; // end namespace predictor
    52 }; // end namespace stage_1_ifetch
     55
     56}; // end namespace core
     57}; // end namespace multi_front_end
     58}; // end namespace front_end
     59}; // end namespace prediction_unit
     60}; // end namespace direction
     61
    5362
    5463}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Types.h

    r45 r48  
    1 #ifndef morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Type_h
    2 #define morpheo_behavioural_stage_1_ifetch_predictor_meta_predictor_Type_h
     1#ifndef morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Type_h
     2#define morpheo_behavioural_core_multi_front_end_front_end_prediction_unit_direction_meta_predictor_Type_h
    33
    44/*
    … …  
    1313namespace morpheo {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822
    … …  
    2125
    2226}; // end namespace meta_predictor
    23 }; // end namespace predictor
    24 }; // end namespace stage_1_ifetch
     27
     28}; // end namespace core
     29}; // end namespace multi_front_end
     30}; // end namespace front_end
     31}; // end namespace prediction_unit
     32}; // end namespace direction
     33
    2534}; // end namespace behavioural
    2635}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor.cpp

    r45 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519
    … …  
    2327                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2428#endif
    25                               morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters param ):
     29                              morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters param ):
    2630                              _name              (name)
    2731                              ,_param            (param)
    … …  
    8185
    8286}; // end namespace meta_predictor
    83 }; // end namespace predictor
    84 }; // end namespace stage_1_ifetch
     87
     88}; // end namespace core
     89}; // end namespace multi_front_end
     90}; // end namespace front_end
     91}; // end namespace prediction_unit
     92}; // end namespace direction
     93
    8594
    8695}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_allocation.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620
    … …  
    104108    log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str());
    105109   
    106     component_Meta_Predictor_Glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Meta_Predictor_Glue (name_component.c_str()               ,
     110    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()               ,
    107111#ifdef STATISTICS       
    108112                                                                                                                                                   _param_statistics                    ,
    … …  
    127131    log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str());
    128132   
    129     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()               ,
     133    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()               ,
    130134#ifdef STATISTICS       
    131135                                                                                                                                                                           _param_statistics                    ,
    … …  
    153157    log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str());
    154158   
    155     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()               ,
     159    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()               ,
    156160#ifdef STATISTICS       
    157161                                                                                                                                                                           _param_statistics                    ,
    … …  
    174178    log_printf(INFO,Meta_Predictor,"allocation","Allocation : %s",name_component.c_str());
    175179   
    176     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()               ,
     180    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()               ,
    177181#ifdef STATISTICS       
    178182                                                                                                                                                                           _param_statistics                    ,
    … …  
    431435
    432436}; // end namespace meta_predictor
    433 }; // end namespace predictor
    434 }; // end namespace stage_1_ifetch
     437
     438}; // end namespace core
     439}; // end namespace multi_front_end
     440}; // end namespace front_end
     441}; // end namespace prediction_unit
     442}; // end namespace direction
     443
    435444}; // end namespace behavioural
    436445}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_deallocation.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620
    … …  
    4953
    5054}; // end namespace meta_predictor
    51 }; // end namespace predictor
    52 }; // end namespace stage_1_ifetch
     55
     56}; // end namespace core
     57}; // end namespace multi_front_end
     58}; // end namespace front_end
     59}; // end namespace prediction_unit
     60}; // end namespace direction
     61
    5362
    5463}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_statistics.cpp

    r5 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620
    … …  
    3741
    3842}; // end namespace meta_predictor
    39 }; // end namespace predictor
    40 }; // end namespace stage_1_ifetch
     43
     44}; // end namespace core
     45}; // end namespace multi_front_end
     46}; // end namespace front_end
     47}; // end namespace prediction_unit
     48}; // end namespace direction
     49
    4150
    4251}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_transition.cpp

    r5 r48  
    88 */
    99
    10 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     10#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721
    … …  
    3337
    3438}; // end namespace meta_predictor
    35 }; // end namespace predictor
    36 }; // end namespace stage_1_ifetch
     39
     40}; // end namespace core
     41}; // end namespace multi_front_end
     42}; // end namespace front_end
     43}; // end namespace prediction_unit
     44}; // end namespace direction
     45
    3746
    3847}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721
    … …  
    3842
    3943}; // end namespace meta_predictor
    40 }; // end namespace predictor
    41 }; // end namespace stage_1_ifetch
     44
     45}; // end namespace core
     46}; // end namespace multi_front_end
     47}; // end namespace front_end
     48}; // end namespace prediction_unit
     49}; // end namespace direction
     50
    4251
    4352}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_body.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620
    … …  
    2428
    2529}; // end namespace meta_predictor
    26 }; // end namespace predictor
    27 }; // end namespace stage_1_ifetch
     30
     31}; // end namespace core
     32}; // end namespace multi_front_end
     33}; // end namespace front_end
     34}; // end namespace prediction_unit
     35}; // end namespace direction
     36
    2837
    2938}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_declaration.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620
    … …  
    2428
    2529}; // end namespace meta_predictor
    26 }; // end namespace predictor
    27 }; // end namespace stage_1_ifetch
     30
     31}; // end namespace core
     32}; // end namespace multi_front_end
     33}; // end namespace front_end
     34}; // end namespace prediction_unit
     35}; // end namespace direction
     36
    2837
    2938}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Meta_Predictor_vhdl_testbench_transition.cpp

    r45 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Meta_Predictor.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Meta_Predictor.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620
    … …  
    2832
    2933}; // end namespace meta_predictor
    30 }; // end namespace predictor
    31 }; // end namespace stage_1_ifetch
     34
     35}; // end namespace core
     36}; // end namespace multi_front_end
     37}; // end namespace front_end
     38}; // end namespace prediction_unit
     39}; // end namespace direction
     40
    3241
    3342}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters.cpp

    r5 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    12 namespace stage_1_ifetch {
    13 namespace predictor {
     12namespace core {
     13namespace multi_front_end {
     14namespace front_end {
     15namespace prediction_unit {
     16namespace direction {
     17
    1418namespace meta_predictor {
    1519
    … …  
    8185    if (_have_meta_predictor)
    8286      {
    83     _param_two_level_branch_predictor_0 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_0_have_bht              ,
     87    _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              ,
    8488                                                                                                                                                      _predictor_0_bht_size_shifter      ,
    8589                                                                                                                                                      _predictor_0_bht_nb_shifter        ,
    … …  
    9296                                                                                                                                                      _nb_branch_complete                );
    9397
    94     _param_two_level_branch_predictor_1 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_1_have_bht              ,
     98    _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              ,
    9599                                                                                                                                                      _predictor_1_bht_size_shifter      ,
    96100                                                                                                                                                      _predictor_1_bht_nb_shifter        ,
    … …  
    104108      }
    105109
    106     _param_two_level_branch_predictor_2 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_2_have_bht              ,
     110    _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              ,
    107111                                                                                                                                                      _predictor_2_bht_size_shifter      ,
    108112                                                                                                                                                      _predictor_2_bht_nb_shifter        ,
    … …  
    116120
    117121
    118     _param_meta_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters (_have_meta_predictor               ,
     122    _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               ,
    119123                                                                                                                                       _predictor_0_have_bht              ,
    120124                                                                                                                                       _predictor_0_bht_size_shifter      ,
    … …  
    175179    if (_have_meta_predictor)
    176180      {
    177     _param_two_level_branch_predictor_0 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_0_have_bht              ,
     181    _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              ,
    178182                                                                                                                                                      _predictor_0_bht_size_shifter      ,
    179183                                                                                                                                                      _predictor_0_bht_nb_shifter        ,
    … …  
    186190                                                                                                                                                      _nb_branch_complete                );
    187191
    188     _param_two_level_branch_predictor_1 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_1_have_bht              ,
     192    _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              ,
    189193                                                                                                                                                      _predictor_1_bht_size_shifter      ,
    190194                                                                                                                                                      _predictor_1_bht_nb_shifter        ,
    … …  
    198202      }
    199203
    200     _param_two_level_branch_predictor_2 = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::two_level_branch_predictor::Parameters (_predictor_2_have_bht              ,
     204    _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              ,
    201205                                                                                                                                                      _predictor_2_bht_size_shifter      ,
    202206                                                                                                                                                      _predictor_2_bht_nb_shifter        ,
    … …  
    209213                                                                                                                                                      _nb_branch_complete                );
    210214   
    211     _param_meta_predictor_glue = new morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::meta_predictor_glue::Parameters (_have_meta_predictor               ,
     215    _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               ,
    212216                                                                                                                                       _predictor_0_have_bht              ,
    213217                                                                                                                                       _predictor_0_bht_size_shifter      ,
    … …  
    245249
    246250}; // end namespace meta_predictor
    247 }; // end namespace predictor
    248 }; // end namespace stage_1_ifetch
     251
     252}; // end namespace core
     253}; // end namespace multi_front_end
     254}; // end namespace front_end
     255}; // end namespace prediction_unit
     256}; // end namespace direction
     257
    249258
    250259}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_msg_error.cpp

    r5 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h"
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Types.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1313namespace morpheo                    {
    1414namespace behavioural {
    15 namespace stage_1_ifetch {
    16 namespace predictor {
     15namespace core {
     16namespace multi_front_end {
     17namespace front_end {
     18namespace prediction_unit {
     19namespace direction {
     20
    1721namespace meta_predictor {
    1822
    … …  
    4347
    4448}; // end namespace meta_predictor
    45 }; // end namespace predictor
    46 }; // end namespace stage_1_ifetch
     49
     50}; // end namespace core
     51}; // end namespace multi_front_end
     52}; // end namespace front_end
     53}; // end namespace prediction_unit
     54}; // end namespace direction
     55
    4756
    4857}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Parameters_print.cpp

    r5 r48  
    66 */
    77
    8 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Parameters.h"
     8#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Parameters.h"
    99#include "Behavioural/include/XML.h"
    1010using namespace std;
    … …  
    1212namespace morpheo                    {
    1313namespace behavioural {
    14 namespace stage_1_ifetch {
    15 namespace predictor {
     14namespace core {
     15namespace multi_front_end {
     16namespace front_end {
     17namespace prediction_unit {
     18namespace direction {
     19
    1620namespace meta_predictor {
    1721
    … …  
    132136
    133137  ostream& operator<< (ostream& output_stream ,
    134                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Parameters & x)
     138                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Parameters & x)
    135139  {
    136140    output_stream << x.print(0);
    … …  
    140144
    141145}; // end namespace meta_predictor
    142 }; // end namespace predictor
    143 }; // end namespace stage_1_ifetch
     146
     147}; // end namespace core
     148}; // end namespace multi_front_end
     149}; // end namespace front_end
     150}; // end namespace prediction_unit
     151}; // end namespace direction
     152
    144153}; // end namespace behavioural
    145154}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics.cpp

    r5 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    13 namespace stage_1_ifetch {
    14 namespace predictor {
     13namespace core {
     14namespace multi_front_end {
     15namespace front_end {
     16namespace prediction_unit {
     17namespace direction {
     18
    1519namespace meta_predictor {
    1620
    … …  
    3539
    3640}; // end namespace meta_predictor
    37 }; // end namespace predictor
    38 }; // end namespace stage_1_ifetch
     41
     42}; // end namespace core
     43}; // end namespace multi_front_end
     44}; // end namespace front_end
     45}; // end namespace prediction_unit
     46}; // end namespace direction
     47
    3948
    4049}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_add.cpp

    r5 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923
    … …  
    2630
    2731}; // end namespace meta_predictor
    28 }; // end namespace predictor
    29 }; // end namespace stage_1_ifetch
     32
     33}; // end namespace core
     34}; // end namespace multi_front_end
     35}; // end namespace front_end
     36}; // end namespace prediction_unit
     37}; // end namespace direction
     38
    3039
    3140}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_print.cpp

    r5 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923
    … …  
    4347
    4448  ostream& operator<< (ostream& output_stream ,
    45                        morpheo::behavioural::stage_1_ifetch::predictor::meta_predictor::Statistics & x)
     49                       morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::meta_predictor::Statistics & x)
    4650  {
    4751    output_stream << x.print(0);
    … …  
    5155
    5256}; // end namespace meta_predictor
    53 }; // end namespace predictor
    54 }; // end namespace stage_1_ifetch
     57
     58}; // end namespace core
     59}; // end namespace multi_front_end
     60}; // end namespace front_end
     61}; // end namespace prediction_unit
     62}; // end namespace direction
     63
    5564
    5665}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/src/Statistics_print_body.cpp

    r5 r48  
    77 */
    88
    9 #include "Behavioural/Stage_1_Ifetch/Predictor/Meta_Predictor/include/Statistics.h"
     9#include "Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1414namespace morpheo                    {
    1515namespace behavioural {
    16 namespace stage_1_ifetch {
    17 namespace predictor {
     16namespace core {
     17namespace multi_front_end {
     18namespace front_end {
     19namespace prediction_unit {
     20namespace direction {
     21
    1822namespace meta_predictor {
    1923
    … …  
    3438
    3539}; // end namespace meta_predictor
    36 }; // end namespace predictor
    37 }; // end namespace stage_1_ifetch
     40
     41}; // end namespace core
     42}; // end namespace multi_front_end
     43}; // end namespace front_end
     44}; // end namespace prediction_unit
     45}; // end namespace direction
     46
    3847
    3948}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Counter/Makefile.deps

    r2 r48  
    2424
    2525Counter_library         :
    26                                 @$(MAKE) Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Counter --makefile=Makefile
     26                                @\
     27                                $(MAKE) Behavioural_library; \
     28                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Counter --makefile=Makefile;
    2829       
    2930Counter_library_clean   :
    30                                 @$(MAKE) Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Counter --makefile=Makefile clean
     31                                @\
     32                                $(MAKE) Behavioural_library_clean; \
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Counter --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Group/Makefile.deps

    r2 r48  
    2424
    2525Group_library           :
    26                                 @$(MAKE)  Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Group --makefile=Makefile
     26                                @\
     27                                $(MAKE)  Behavioural_library; \
     28                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Group --makefile=Makefile ;
    2829       
    2930Group_library_clean     :
    30                                 @$(MAKE)  Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Group --makefile=Makefile clean
     31                                @\
     32                                $(MAKE)  Behavioural_library_clean; \
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Group --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/Makefile.deps

    r15 r48  
    2828
    2929RegisterFile_Monolithic_library         :
    30                                 @$(MAKE)  Behavioural_library
    31                                 @$(MAKE)  Group_library
    32                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic --makefile=Makefile
     30                                @\
     31                                $(MAKE)  Behavioural_library; \
     32                                $(MAKE)  Group_library; \
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic --makefile=Makefile;
    3334       
    3435RegisterFile_Monolithic_library_clean   :
    35                                 @$(MAKE)  Behavioural_library_clean
    36                                 @$(MAKE)  Group_library_clean
    37                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic --makefile=Makefile clean
     36                                @\
     37                                $(MAKE)  Behavioural_library_clean; \
     38                                $(MAKE)  Group_library_clean; \
     39                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/Makefile.deps

    r15 r48  
    2424
    2525RegisterFile_Multi_Banked_library               :
    26                                 @$(MAKE) Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked --makefile=Makefile
     26                                @\
     27                                $(MAKE) Behavioural_library; \
     28                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked --makefile=Makefile ;
    2829       
    2930RegisterFile_Multi_Banked_library_clean :
    30                                 @$(MAKE) Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked --makefile=Makefile clean
     31                                @\
     32                                $(MAKE) Behavioural_library_clean; \
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/Makefile.deps

    r15 r48  
    2424
    2525RegisterFile_Multi_Banked_Glue_library          :
    26                                 @$(MAKE) Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue --makefile=Makefile
     26                                @\
     27                                $(MAKE) Behavioural_library; \
     28                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue --makefile=Makefile ;
    2829       
    2930RegisterFile_Multi_Banked_Glue_library_clean    :
    30                                 @$(MAKE) Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue --makefile=Makefile clean
     31                                @\
     32                                $(MAKE) Behavioural_library_clean; \
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/Makefile.deps

    r15 r48  
    2424
    2525Select_Priority_Fixed_library           :
    26                                 @$(MAKE) Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Select/Select_Priority_Fixed --makefile=Makefile
     26                                @\
     27                                $(MAKE) Behavioural_library; \
     28                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Select/Select_Priority_Fixed --makefile=Makefile;
    2829       
    2930Select_Priority_Fixed_library_clean     :
    30                                 @$(MAKE) Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Select/Select_Priority_Fixed --makefile=Makefile clean
     31                                @\
     32                                $(MAKE) Behavioural_library_clean; \
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Select/Select_Priority_Fixed --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Shifter/Makefile.deps

    r2 r48  
    2424
    2525Shifter_library         :
    26                                 @$(MAKE) Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Shifter --makefile=Makefile
     26                                @\
     27                                $(MAKE) Behavioural_library;\
     28                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Shifter --makefile=Makefile;
    2829       
    2930Shifter_library_clean   :
    30                                 @$(MAKE) Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Shifter --makefile=Makefile clean
     31                                @\
     32                                $(MAKE) Behavioural_library_clean;\
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Shifter --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Victim/Victim_Pseudo_LRU/Makefile.deps

    r15 r48  
    2828
    2929Victim_Pseudo_LRU_library               :
    30                                 @$(MAKE)  Behavioural_library
    31                                 @$(MAKE)  Group_library
    32                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile
     30                                @\
     31                                $(MAKE)  Behavioural_library; \
     32                                $(MAKE)  Group_library; \
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile;
    3334                               
    3435Victim_Pseudo_LRU_library_clean :
    35                                 @$(MAKE)  Behavioural_library_clean
    36                                 @$(MAKE)  Group_library_clean
    37                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile clean
     36                                @\
     37                                $(MAKE)  Behavioural_library_clean; \
     38                                $(MAKE)  Group_library_clean; \
     39                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/Generic/Victim/Victim_Pseudo_LRU --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Common

    r15 r48  
    6666
    6767$(DIR_OBJ)/%.o                  : $(DIR_SRC)/%.cpp $(HEADERS)
    68                                 @$(ECHO) "Compilation        : $*"
    69                                 $(CXX) $(CFLAGS) -c -o $@ $<
     68                                @\
     69                                $(ECHO) "Compilation        : $*";\
     70                                $(CXX) $(CFLAGS) -c -o $@ $<;
    7071
    7172$(DIR_OBJ)                      :
    72                                 @$(ECHO) "Create directory   : $@"
    73                                 @$(MKDIR) $@
     73                                @\
     74                                $(ECHO) "Create directory   : $@";\
     75                                $(MKDIR) $@
    7476
    7577common_clean                    :
    76                                 @$(ECHO) "Delete     temporary files in directory "$(PWD)
    77                                 @$(RM)  $(DIR_OBJ)      \
     78                                @\
     79                                $(ECHO) "Delete     temporary files in directory "$(PWD);\
     80                                $(RM)   $(DIR_OBJ)      \
    7881                                        $(DIR_BIN)      \
    7982                                        *~              \
    8083                                        $(DIR_SRC)/*~   \
    81                                         $(DIR_INC)/*~
     84                                        $(DIR_INC)/*~;
    8285
    8386common_help                     :
    84                                 @$(ECHO) " -----[ Common ]-------------------------------------"
    85                                 @$(ECHO) ""
    86                                 @$(ECHO) " * test_env             : test if environnment's variable is set"
    87                                 @$(ECHO) ""
     87                                @\
     88                                $(ECHO) " -----[ Common ]-------------------------------------";\
     89                                $(ECHO) "";\
     90                                $(ECHO) " * test_env             : test if environnment's variable is set";\
     91                                $(ECHO) "";

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Component

    r23 r48  
    1515
    1616$(DIR_LIB)/%.a                  : $(OBJECTS) $(HEADERS)
    17                                 @$(ECHO) "Archive            : $*"
    18                                 @$(AR)  -r $@ $(OBJECTS)
    19                                 @$(RANLIB) $@
     17                                @\
     18                                $(ECHO) "Archive            : $*";\
     19                                $(AR)  -r $@ $(OBJECTS);\
     20                                $(RANLIB) $@;
    2021
    2122$(DIR_LIB)                      :
    22                                 @$(ECHO) "Create directory   : $@"
    23                                 @$(MKDIR) $@
     23                                @\
     24                                $(ECHO) "Create directory   : $@";\
     25                                $(MKDIR) $@;
    2426
    2527document                        :
    … …  
    3032                               
    3133component_help                  :
    32                                 @$(ECHO) " -----[ Component ]----------------------------------"
    33                                 @$(ECHO) ""
    34                                 @$(ECHO) " * all_component        : compile all c++ file and generate library"
    35                                 @$(ECHO) " * document             : Generate documantation"
    36                                 @$(ECHO) " * clean                : Erase all generate files"
    37                                 @$(ECHO) " * help                 : print this text"
    38                                 @$(ECHO) ""
     34                                @\
     35                                $(ECHO) " -----[ Component ]----------------------------------";\
     36                                $(ECHO) "";\
     37                                $(ECHO) " * all_component        : compile all c++ file and generate library";\
     38                                $(ECHO) " * document             : Generate documantation";\
     39                                $(ECHO) " * clean                : Erase all generate files";\
     40                                $(ECHO) " * help                 : print this text";\
     41                                $(ECHO) "";
    3942                               
    4043
    4144help                            :
    42                                 @$(MAKE) common_help
    43                                 @$(MAKE) component_help
     45                                @\
     46                                $(MAKE) common_help;\
     47                                $(MAKE) component_help;
     48
    4449clean                           :
    45                                 @$(MAKE) common_clean
    46                                 @$(MAKE) component_clean
    47                                 @if $(TEST) -d $(DIR_DOC); then $(MAKE) --directory=$(DIR_DOC) --makefile=Makefile clean; fi
     50                                @\
     51                                $(MAKE) common_clean ;\
     52                                $(MAKE) component_clean;\
     53                                if $(TEST) -d $(DIR_DOC); then $(MAKE) --directory=$(DIR_DOC) --makefile=Makefile clean; fi;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Documentation

    r23 r48  
    3131#--------------------------------------------------------------------------------
    3232%.pdf                   : %.ps
    33                         @$(ECHO) "Génération du fichier $*.pdf"
    34                         @$(PS2PDF) $< $@
    35                         @#Copy at directory
     33                        @\
     34                        $(ECHO) "Génération du fichier $*.pdf";         \
     35                        $(PS2PDF) $< $@;
    3636
    3737%.ps                    : %.dvi
    38                         @$(ECHO) "Génération du fichier $*.ps"
    39                         @$(DVIPS) -o $@ $<
     38                        @\
     39                        $(ECHO) "Génération du fichier $*.ps";          \
     40                        $(DVIPS) -o $@ $<;
    4041
    4142%.dvi                   : $(DIR_TEX)/%.tex
    42                         @$(ECHO) "Génération du fichier $*.dvi"
    43                         @#touch $(patsubst %.tex,%.ind,$<)
    44                         @$(LATEX) $<
    45                         @$(LATEX) $< > /dev/null
    46                         @#$(MAKEINDEX) $(patsubst %.tex,%.idx,$<)
    47                         @citation=`$(GREP) "citation" $*.aux`; \
    48                          if $(TEST) -n "$$citation" ; then  \
    49                           $(BIBTEX) $* ; \
    50                         fi
    51                         @$(LATEX) $< > /dev/null
    52                         @$(LATEX) $< > /dev/null
     43                        @\
     44                        $(ECHO) "Génération du fichier $*.dvi";         \
     45                        $(LATEX) $<;                                    \
     46                        $(LATEX) $< > /dev/null;                        \
     47                        citation=`$(GREP) "citation" $*.aux`;           \
     48                        if $(TEST) -n "$$citation" ; then               \
     49                                $(BIBTEX) $* ;                          \
     50                        fi;                                             \
     51                        $(LATEX) $< > /dev/null;                        \
     52                        $(LATEX) $< > /dev/null;
    5353
    5454#--------------------------------------------------------------------------------
    … …  
    5656#--------------------------------------------------------------------------------
    5757$(DIR_SCHEMA_EPS)       :
    58                         @$(ECHO) "Make directory       : $@"
    59                         @$(MKDIR) $@
     58                        @\
     59                        $(ECHO) "Make directory       : $@";            \
     60                        $(MKDIR) $@;
    6061
    6162$(DIR_SCHEMA_EPS)/%.eps : $(DIR_SCHEMA)/%.eps $(DIR_SCHEMA_EPS)
    62                         @$(ECHO) "Generate   files     : $*.eps"
    63                         @$(CP) $(DIR_SCHEMA)/$*.eps $(DIR_SCHEMA_EPS)
     63                        @\
     64                        $(ECHO) "Generate   files     : $*.eps";        \
     65                        $(CP) $(DIR_SCHEMA)/$*.eps $(DIR_SCHEMA_EPS);
    6466
    6567$(DIR_SCHEMA_EPS)/%.eps : $(DIR_SCHEMA)/%.fig $(DIR_SCHEMA_EPS)
    66                         @$(ECHO) "Generate   files     : $*.eps"
    67                         @$(FIG2EPS) $< $@
     68                        @\
     69                        $(ECHO) "Generate   files     : $*.eps";        \
     70                        $(FIG2EPS) $< $@;
    6871
    6972#--------------------------------------------------------------------------------
    … …  
    7275
    7376clean                   :
    74                         @$(ECHO) "Delete     temporary files              "$(PWD)
    75                         @$(RM) $(DIR_SCHEMA_EPS)
    76                         @$(RM) $(DVI_FILES) $(PS_FILES) $(PDF_FILES)
    77                         @$(MAKE) clean_rec DIR_CLEAN=. 
     77                        @\
     78                        $(ECHO) "Delete     temporary files              "$(PWD); \
     79                        $(RM) $(DIR_SCHEMA_EPS);                        \
     80                        $(RM) $(DVI_FILES) $(PS_FILES) $(PDF_FILES);    \
     81                        $(MAKE) clean_rec DIR_CLEAN=.;
    7882
    7983#Clean recursive
    8084clean_rec               :
    81                         @$(ECHO) "Delete     temporary files in directory $(DIR_CLEAN)"
    82                         @$(RM)  $(DIR_CLEAN)/*~                 \
     85                        @\
     86                        $(ECHO) "Delete     temporary files in directory $(DIR_CLEAN)"; \
     87                        $(RM)   $(DIR_CLEAN)/*~                 \
    8388                                $(DIR_CLEAN)/*.bak              \
    8489                                $(DIR_CLEAN)/*.aux              \
    … …  
    95100                                $(DIR_CLEAN)/*.nav              \
    96101                                $(DIR_CLEAN)/*.snm              \
    97                                 $(DIR_CLEAN)/missfont.log
    98                         @# The .bbl file is to be removed if "bibtex" is used.
    99                         @for files in `$(LS) $(DIR_CLEAN)`; do                                                  \
     102                                $(DIR_CLEAN)/missfont.log;      \
     103                        for files in `$(LS) $(DIR_CLEAN)`; do                                                   \
    100104                                if $(TEST) -d $(DIR_CLEAN)/$$files;                                             \
    101105                                then                                                                            \
    … …  
    109113
    110114help                    :
    111                         @$(ECHO) " -----[ Documentation ]------------------------------"
    112                         @$(ECHO) ""
    113                         @$(ECHO) " * all_documentation    : Generate all documents"
    114                         @$(ECHO) " * clean                : Erase all generate files"
    115                         @$(ECHO) " * help                 : Print this message"
    116                         @$(ECHO) ""
     115                        @\
     116                        $(ECHO) " -----[ Documentation ]------------------------------";\
     117                        $(ECHO) "";                                                     \
     118                        $(ECHO) " * all_documentation    : Generate all documents";     \
     119                        $(ECHO) " * clean                : Erase all generate files";   \
     120                        $(ECHO) " * help                 : Print this message";         \
     121                        $(ECHO) "";

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Selftest

    r44 r48  
    3030
    3131all_selftest                    : test_env $(DIR_OBJ) $(DIR_BIN) $(DIR_LOG)
    32                                 @$(MAKE) library
    33                                 @$(MAKE) $(DIR_BIN)/$(EXEC).x
     32                                @\
     33                                $(MAKE) library;\
     34                                $(MAKE) $(DIR_BIN)/$(EXEC).x;
    3435
    3536execute                         : all_selftest
    36                                 @$(MAKE) $(EXEC_LOG)
     37                                @$(MAKE) $(EXEC_LOG);
    3738
    3839reconfig                        :
    39                                 @$(MAKE) config_clean
    40                                 @$(MAKE) config
     40                                @\
     41                                $(MAKE) config_clean;\
     42                                $(MAKE) config;
    4143
    4244config_clean                    :
    … …  
    4446
    4547config                          : $(DIR_CFG_GEN)
    46                                 @$(ECHO) "Generate configuration"
    47                                 @                                                                                                       \
     48                                @\
     49                                $(ECHO) "Generate configuration";\
    4850                                declare -i  CPT=0;                                                                                      \
    4951                                declare     files;                                                                                      \
    … …  
    111113
    112114$(DIR_LOG)/%.exec.log           : $(DIR_CFG_GEN)/%.cfg $(DIR_BIN)/$(EXEC).x
    113                                 @$(ECHO) "Execute            : $*"
    114                                 @$(EXPORT) SYSTEMC=$(SYSTEMC_$(SIMULATOR)) ; ./$(DIR_BIN)/$(EXEC).x $(EXEC_PARAMS) $* `$(CAT) $<` &> $@
     115                                @\
     116                                $(ECHO) "Execute            : $*";\
     117                                $(EXPORT) SYSTEMC=$(SYSTEMC_$(SIMULATOR)) ; ./$(DIR_BIN)/$(EXEC).x $(EXEC_PARAMS) $* `$(CAT) $<` &> $@
    115118                                declare -i count=`$(GREP) -ch "Test OK" $@`;            \
    116119                                if $(TEST) $$count -ne 0;                               \
    … …  
    120123
    121124$(DIR_BIN)/%.x                  : $(OBJECTS) $(HEADERS) $(DIR_LIB)
    122                                 @$(ECHO) "Linkage            : $*"
    123                                 $(CXX) $(LFLAGS) -o $@ $(OBJECTS) $(LIBS)
     125                                @\
     126                                $(ECHO) "Linkage            : $*";\
     127                                $(CXX) $(LFLAGS) -o $@ $(OBJECTS) $(LIBS);
    124128
    125129$(DIR_BIN)                      :
    126                                 @$(ECHO) "Create directory   : $@"
    127                                 @$(MKDIR) $@
     130                                @\
     131                                $(ECHO) "Create directory   : $@";\
     132                                $(MKDIR) $@;
    128133
    129134$(DIR_LOG)                      :
    130                                 @$(ECHO) "Create directory   : $@"
    131                                 @$(MKDIR) $@
     135                                @\
     136                                $(ECHO) "Create directory   : $@";\
     137                                $(MKDIR) $@;
    132138
    133139$(DIR_CFG_GEN)                  :
    134                                 @$(ECHO) "Create directory   : $@"
    135                                 @$(MKDIR) $@
     140                                @\
     141                                $(ECHO) "Create directory   : $@";\
     142                                $(MKDIR) $@;
    136143
    137144selftest_clean_all              : library_clean
    … …  
    144151                                        *.stat                  \
    145152                                        generated_by_systemcass \
    146                                         core*
     153                                        core*;
    147154
    148155selftest_help                   :
    149                                 @$(ECHO) " -----[ Selftest ]-----------------------------------"
    150                                 @$(ECHO) ""
    151                                 @$(ECHO) " * all_selftest         : compile all c++ file and execute"
    152                                 @$(ECHO) " * execute              : execute all instance"
    153                                 @$(ECHO) " * config               : generate configuration with configuration's file"
    154                                 @$(ECHO) " * reconfig             : regenerate configuration with configuration's file"
    155                                 @$(ECHO) " * clean                : Erase all generate files"
    156                                 @$(ECHO) " * clean_all            : Clean + Erase all dependant library"
    157                                 @$(ECHO) " * help                 : print this text"
    158                                 @$(ECHO) ""
     156                                @\
     157                                $(ECHO) " -----[ Selftest ]-----------------------------------";\
     158                                $(ECHO) "";\
     159                                $(ECHO) " * all_selftest         : compile all c++ file and execute";\
     160                                $(ECHO) " * execute              : execute all instance";\
     161                                $(ECHO) " * config               : generate configuration with configuration's file" ;\
     162                                $(ECHO) " * reconfig             : regenerate configuration with configuration's file" ;\
     163                                $(ECHO) " * clean                : Erase all generate files";\
     164                                $(ECHO) " * clean_all            : Clean + Erase all dependant library";\
     165                                $(ECHO) " * help                 : print this text";\
     166                                $(ECHO) "";
    159167
    160168help                            :
    161                                 @$(MAKE) common_help 
    162                                 @$(MAKE) synthesis_help 
    163                                 @$(MAKE) selftest_help
     169                                @\
     170                                $(MAKE) common_help  ;\
     171                                $(MAKE) synthesis_help;\ 
     172                                $(MAKE) selftest_help;
    164173
    165174clean                           :
    166                                 @$(MAKE) common_clean
    167                                 @$(MAKE) synthesis_clean
    168                                 @$(MAKE) selftest_clean
     175                                @\
     176                                $(MAKE) common_clean ;\
     177                                $(MAKE) synthesis_clean ;\
     178                                $(MAKE) selftest_clean;
    169179
    170180clean_all                       :
    171                                 @$(MAKE) clean
    172                                 @$(MAKE) selftest_clean_all
     181                                @\
     182                                $(MAKE) clean ;\
     183                                $(MAKE) selftest_clean_all;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.Synthesis

    r42 r48  
    2525
    2626vhdl                            : execute $(DIR_WORK)
    27                                 @                                                                                                       \
     27                                @\
    2828                                declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*_Pack.vhdl));                                              \
    2929                                declare -a log_files=($${vhdl_files[*]/%.vhdl/.vhdl.log});                                              \
    30                                 if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi           
    31                                 @                                                                                                       \
    32                                 declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*_Testbench.vhdl));                                 \
     30                                if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi;          \
     31                                declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*_Testbench.vhdl));                                         \
    3332                                declare -a log_files=($${vhdl_files[*]/%.vhdl/.vhdl.log});                                              \
    34                                 if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi           
    35                                 @                                                                                                       \
     33                                if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi;          \
    3634                                declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*.vhdl|$(GREP_NOT) "(_Pack\.|_Testbench\.)"));              \
    3735                                declare -a log_files=($${vhdl_files[*]/%.vhdl/.vhdl.log});                                              \
    38                                 if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi           
     36                                if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi;
    3937
    4038vhdl_sim                        : vhdl
    41                                 @                                                                                                       \
     39                                @\
    4240                                declare -a vhdl_files=($$($(LS) $(DIR_VHDL)/*_Testbench.vhdl));                                         \
    4341                                declare -a log_files=($${vhdl_files[*]/%.vhdl/.vhdl_sim.log});                                          \
    44                                 if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi
     42                                if $(TEST) $${#log_files[*]} -ne 0; then $(MAKE) $${log_files[*]/#$(DIR_VHDL)/$(DIR_LOG)}; fi;
    4543
    4644fpga                            : vhdl_sim
    47                                 @$(ECHO) -e "" > $(FPGA_CFG_FILE_LOCAL)
    48                                 @$(ECHO) "files :::::::: $(FPGA_FILES)"
    49                                 @for file in $(FPGA_FILES); do                                                                          \
     45                                @\
     46                                $(ECHO) -e "" > $(FPGA_CFG_FILE_LOCAL); \
     47                                $(ECHO) "files :::::::: $(FPGA_FILES)"; \
     48                                for file in $(FPGA_FILES); do                                                                           \
    5049                                        declare -a files=($$($(LS) $$file*.vhdl|$(GREP_NOT) "(_Testbench\.)"));                         \
    5150                                        $(ECHO) -e "# $$file"                             >> $(FPGA_CFG_FILE_LOCAL);                    \
    … …  
    5453                                        $(ECHO) -e "target_dep\t$$file.prj\t$${files[*]}" >> $(FPGA_CFG_FILE_LOCAL);                    \
    5554                                        $(ECHO) -e ""                                     >> $(FPGA_CFG_FILE_LOCAL);                    \
    56                                 done
    57                                 @($(XILINX_ENV); $(CD) $(FPGA_CFG_FILE_GLOBAL_DIR); ./$(FPGA_CFG_FILE_GLOBAL)) 
    58                                 @$(MAKE) $(FPGA_LOG_FILES)
     55                                done;                                   \
     56                                ($(XILINX_ENV); $(CD) $(FPGA_CFG_FILE_GLOBAL_DIR); ./$(FPGA_CFG_FILE_GLOBAL));                          \
     57                                $(MAKE) $(FPGA_LOG_FILES);
    5958
    6059$(DIR_LOG)/%.fpga.log           :
    61                                 @$(ECHO) "Synthetis on FPGA  : $*"
    62                                 @$(XILINX_ENV); $(MAKE) -f Makefile.mkf $*.ngc &> $@
     60                                @\
     61                                $(ECHO) "Synthetis on FPGA  : $*"; \
     62                                $(XILINX_ENV); $(MAKE) -f Makefile.mkf $*.ngc &> $@;
    6363
    6464$(DIR_WORK)                     :
    65                                 @$(ECHO) "Create work-space  : $@"
    66                                 @$(MODELTECH_VLIB) $@
     65                                @\
     66                                $(ECHO) "Create work-space  : $@"; \
     67                                $(MODELTECH_VLIB) $@;
    6768
    6869$(DIR_LOG)/%.vhdl_sim.log       : $(DIR_VHDL)/%.vhdl $(DIR_LOG)/%.vhdl.log
    69                                 @$(ECHO) "VHDL's Simulation  : $*"
    70                                 @$(MODELTECH_VSIM) "$(DIR_WORK).`$(BASENAME) $* |$(UPPERtoLOWER)`" &> $@
     70                                @\
     71                                $(ECHO) "VHDL's Simulation  : $*"; \
     72                                $(MODELTECH_VSIM) "$(DIR_WORK).`$(BASENAME) $* |$(UPPERtoLOWER)`" &> $@; \
    7173                                declare -i count=`$(GREP) -ch "Test OK" $@`;            \
    7274                                if $(TEST) $$count -ne 0;                               \
    … …  
    7678
    7779$(DIR_LOG)/%.vhdl.log           : $(DIR_VHDL)/%.vhdl
    78                                 @$(ECHO) "VHDL's Compilation : $*"
    79                                 @$(MODELTECH_VCOM) $< &> $@
     80                                @\
     81                                $(ECHO) "VHDL's Compilation : $*"; \
     82                                $(MODELTECH_VCOM) $< &> $@;
    8083
    8184synthesis_clean                 :
    82                                 @if $(TEST) -f Makefile.mkf; then $(MAKE) -f Makefile.mkf clean; fi
    83                                 @$(RM) $(DIR_WORK) transcript Makefile.mkf
     85                                @\
     86                                if $(TEST) -f Makefile.mkf; then $(MAKE) -f Makefile.mkf clean; fi; \
     87                                $(RM) $(DIR_WORK) transcript Makefile.mkf;
    8488
    8589synthesis_help                  :
    86                                 @$(ECHO) " -----[ Synthesis ]----------------------------------"
    87                                 @$(ECHO) ""
    88                                 @$(ECHO) " * vhdl                 : compile all vhdl's file"
    89                                 @$(ECHO) " * vhdl_sim             : simulate all testbench's file"
    90                                 @$(ECHO) " * fpga                 : synthetis with fpga's tools"
    91                                 @$(ECHO) ""
     90                                @\
     91                                $(ECHO) " -----[ Synthesis ]----------------------------------";\
     92                                $(ECHO) "";\
     93                                $(ECHO) " * vhdl                 : compile all vhdl's file";\
     94                                $(ECHO) " * vhdl_sim             : simulate all testbench's file";\
     95                                $(ECHO) " * fpga                 : synthetis with fpga's tools";\
     96                                $(ECHO) "";

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Makefile.deps

    r43 r48  
    2626
    2727Behavioural_library             :
    28                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural --makefile=Makefile
     28                                @\
     29                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural --makefile=Makefile ;
    2930
    3031#                               @$(MAKE) Common_library
    3132       
    3233Behavioural_library_clean       :
    33                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural --makefile=Makefile clean
     34                                @\
     35                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural --makefile=Makefile clean;
    3436
    3537#                               @$(MAKE) Common_library_clean

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/Makefile.deps

    r2 r48  
    2424
    2525@COMPONENT_library              :
    26                                 @$(MAKE) Behavioural_library
    27                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/@DIRECTORY --makefile=Makefile
     26                                @\
     27                                $(MAKE) Behavioural_library; \
     28                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/@DIRECTORY --makefile=Makefile;
    2829       
    2930@COMPONENT_library_clean        :
    30                                 @$(MAKE) Behavioural_library_clean
    31                                 @$(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/@DIRECTORY --makefile=Makefile clean
     31                                @\
     32                                $(MAKE) Behavioural_library_clean; \
     33                                $(MAKE) --directory=$(DIR_MORPHEO)/Behavioural/@DIRECTORY --makefile=Makefile clean;

  • trunk/IPs/systemC/processor/Morpheo/Documentation/Source/Makefile

    r45 r48  
    6464
    6565doc                     : $(PNG_FILES) $(DIR_TEX)
    66                         @                                                                                       \
     66                        @\
    6767                        for file in $(ALL_FILES); do                                                            \
    6868                                file=`$(BASENAME) $$file`;                                                      \

  • trunk/IPs/systemC/processor/Morpheo/Makefile

    r23 r48  
    1717#~~~~~[ doc ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    1818doc                     :
    19                         @$(ECHO) ""
    20                         @$(ECHO) "=====[ doc ]====================================="
    21                         @$(ECHO) ""
    22                         @$(MAKE) -C $(DIR_DOC) view
     19                        @\
     20                        $(ECHO) "";\
     21                        $(ECHO) "=====[ doc ]=====================================";\
     22                        $(ECHO) "";\
     23                        $(MAKE) -C $(DIR_DOC) view;
    2324
    2425#~~~~~[ path ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    2526path                    :
    26                         @$(ECHO) ""
    27                         @$(ECHO) "=====[ path ]===================================="
    28                         @$(ECHO) "";
    29                         @$(ECHO) -n "+ ";
    30                         @$(BASENAME) $(PWD);
    31                         @$(ECHO) "| <Top Level>";
    32                         @$(ECHO) "|";
    33                         @$(MAKE) path_rec TAB="|    " DIR_PATH=.
     27                        @\
     28                        $(ECHO) "";\
     29                        $(ECHO) "=====[ path ]====================================";\
     30                        $(ECHO) "";\
     31                        $(ECHO) -n "+ ";\
     32                        $(BASENAME) $(PWD);\
     33                        $(ECHO) "| <Top Level>";\
     34                        $(ECHO) "|";\
     35                        $(MAKE) path_rec TAB="|    " DIR_PATH=.;
    3436
    3537path_rec                :
    36                         @                                                                                               \
    37                                                                                                                         \
     38                        @\
    3839                        for files in `$(LS) $(DIR_PATH)`; do                                                            \
    3940                                if $(TEST) -d $(DIR_PATH)/$$files;                                                      \
    … …  
    5859
    5960lib                     :
    60                         @$(ECHO) ""
    61                         @$(ECHO) "=====[ lib ]====================================="
    62                         @$(ECHO) ""
    63                         @$(ECHO) " Function unimplemented"
    64                         @$(ECHO) ""
     61                        @\
     62                        $(ECHO) "";\
     63                        $(ECHO) "=====[ lib ]=====================================";\
     64                        $(ECHO) "";\
     65                        $(ECHO) " Function unimplemented";\
     66                        $(ECHO) "";
     67
    6568#                       @$(ECHO) " The library is generate into the directory : $(PWD)/$(DIR_LIB)"
    6669
    … …  
    6871
    6972clean                   :
    70                         @$(ECHO) ""
    71                         @$(ECHO) "=====[ clean ]==================================="
    72                         @$(ECHO) ""
    73                         @$(ECHO) "Delete     temporary files              "$(PWD)
    74                         @$(RM) *~
     73                        @\
     74                        $(ECHO) "";\
     75                        $(ECHO) "=====[ clean ]===================================";\
     76                        $(ECHO) "";\
     77                        $(ECHO) "Delete     temporary files              "$(PWD);\
     78                        $(RM) *~;
    7579#                       @$(MAKE) clean_rec DIR_CLEAN=.
    7680
    … …  
    9599
    96100help                    :
    97                         @$(ECHO) ""
    98                         @$(ECHO) "=====[ help ]===================================="
    99                         @$(ECHO) ""
    100                         @$(ECHO) " Rules              Description"
    101                         @$(ECHO) ""
    102                         @$(ECHO) " * all              cf rule \"help\""
    103                         @$(ECHO) " * clean            Delete temporary files"
    104                         @$(ECHO) " * doc              View documentation files"
    105                         @$(ECHO) " * lib              Generate the library to include"
    106                         @$(ECHO) " * help             Print this message"
    107                         @$(ECHO) " * path             Print a little description of each directory"
    108                         @$(ECHO) ""
     101                        @\
     102                        $(ECHO) "";\
     103                        $(ECHO) "=====[ help ]====================================";\
     104                        $(ECHO) "";\
     105                        $(ECHO) " Rules              Description";\
     106                        $(ECHO) "";\
     107                        $(ECHO) " * all              cf rule \"help\"";\
     108                        $(ECHO) " * clean            Delete temporary files";\
     109                        $(ECHO) " * doc              View documentation files";\
     110                        $(ECHO) " * lib              Generate the library to include";\
     111                        $(ECHO) " * help             Print this message";\
     112                        $(ECHO) " * path             Print a little description of each directory";\
     113                        $(ECHO) "";
    109114

  • trunk/Makefile.tools

    r24 r48  
    2424TR                                      = tr
    2525UPPERtoLOWER                            = $(TR) [:lower:] [:upper:]
    26 CXX                                     = export LANG=C; g++
     26CXX                                     = export LANG=C; g++4
    2727SED                                     = sed
    2828TOUCH                                   = touch
     29VALGRIND                                = valgrind --tool=memcheck --leak-check=yes --show-reachable=yes --leak-resolution=high
    2930# Commands to generate all documents
    3031FIG2EPS                                 = fig2dev -L eps
    31 EPS2JPG                                 = convert -quality 100
     32EPS2PNG                                 = convert -quality 0
    3233LATEX                                   = latex
    3334BIBTEX                                  = bibtex
    … …  
    9495
    9596#-----[ newlib ]-------------------------------------------
     97
     98#-----[ qt ]-----------------------------------------------
     99QT_BIN                                  = $(QT)/bin
     100QT_INCDIR                               = $(QT)/include
     101QT_LIBDIR                               = $(QT)/lib
     102QT_LIBNAME                              =

  • trunk/Makefile.tools_path

    r24 r48  
    11#-----[ path ]---------------------------------------------
    2 SOCLIB                                  =  /users/outil/soc/soclib/
    3 SYSTEMC_systemc                         = /users/outil/systemc/systemc-2.1.v1/
    4 SYSTEMC_systemcass                      = /users/outil/systemc/systemcass/systemcass/latest/i686-Linux.SLA4x/
     2SOCLIB                                  =  /users/outil/soc/soclib
     3SYSTEMC_systemc                         = /users/outil/systemc/systemc-2.1.v1
     4SYSTEMC_systemcass                      = /users/outil/systemc/systemcass/systemcass/latest/i686-Linux.SLA4x
    55SYSTEMC_systemcass_deps                 = $(SYSTEMC_systemcass)
    6 XILINX                                  = /dsk/l1/misc/Xilinx91i/
    7 MODELTECH                               = /users/outil/m1archi/modeltech/
    8 MODELTECH_LICENCE                       = /users/soft/mentor/licence/etc/
    9 OR1K                                    = ../../Tools/or32-elf/
     6XILINX                                  = /dsk/l1/misc/Xilinx91i
     7MODELTECH                               = /users/outil/m1archi/modeltech
     8MODELTECH_LICENCE                       = /users/soft/mentor/licence/etc
     9OR1K                                    = ../../Tools/or32-elf
    1010NEWLIB                                  = ../../Tools/newlib-1.14.0
    11 
     11QT                                      = /dsk/l1/misc/kane/qt-x11-opensource-4.2.3

  • trunk/Platforms/Generic/Makefile

    r2 r48  
    135135                                $(error "variable TOOLS   is undefined");
    136136endif
    137                                 @$(ECHO) "$(ID) : Create directory"
    138                                 @$(MKDIR) $(REP_OBJ) $(REP_BIN)
     137                                @\
     138                                $(ECHO) "$(ID) : Create directory";     \
     139                                $(MKDIR) $(REP_OBJ) $(REP_BIN);
    139140
    140141# Création du fichier exe
    141142
    142143$(EXE)                          : $(OBJS)
    143                                 @$(ECHO) "$(ID) : Compilation of execute"
    144                                 $(CXX) $(LXX_OPT) -o $@    $< $(LIBS) 2>&1 | $(CXXFILT)
     144                                @\
     145                                $(ECHO) "$(ID) : Compilation of execute";               \
     146                                $(CXX) $(LXX_OPT) -o $@    $< $(LIBS) 2>&1 | $(CXXFILT);
    145147
    146148# Fichier objet
    147149$(REP_OBJ)/%_$(ID).o            : $(REP_SRC)/%.cpp
    148                                 @$(ECHO) "$(ID) : Compilation of files $@"
    149                                 $(CXX) $(CXX_OPT) -o $@ -c $<         2>&1 | $(CXXFILT)
     150                                @\
     151                                $(ECHO) "$(ID) : Compilation of files $@";              \
     152                                $(CXX) $(CXX_OPT) -o $@ -c $<         2>&1 | $(CXXFILT);
    150153
    151154# Maintenance
    152155clean                           :
    153                                 @$(ECHO) "Delete temporary files"
    154                                 @$(RM) $(REP_OBJ) *~ $(REP_SRC)/*~ $(REP_INC)/*~ *.trace tty*
    155                                 @$(RM) $(REP_BIN)
     156                                @\
     157                                $(ECHO) "Delete temporary files";                               \
     158                                $(RM) $(REP_OBJ) *~ $(REP_SRC)/*~ $(REP_INC)/*~ *.trace tty*;   \
     159                                $(RM) $(REP_BIN);

  • trunk/Softwares/Basic_test.or32/Makefile

    r2 r48  
    3838
    3939$(DIR_BIN)/%.x.txt      : $(DIR_BIN)/%.x
    40                         @$(ECHO) "List symbols        of $*"
    41                         @$(NM)      $(NM_OPT)      $^ > $@.nm
    42                         @$(ECHO) "Display information of $*"
    43                         @$(OBJDUMP) $(OBJDUMP_OPT) $^ > $@
     40                        @\
     41                        $(ECHO) "List symbols        of $*";\
     42                        $(NM)      $(NM_OPT)      $^ > $@.nm;\
     43                        $(ECHO) "Display information of $*";\
     44                        $(OBJDUMP) $(OBJDUMP_OPT) $^ > $@;
    4445
    4546$(DIR_BIN)/%.x          : $(OBJ_SYS) $(OBJ)
    46                         @$(ECHO) "Linkage             of $*"
    47                         @$(LD) -o $@ $^ $(LD_OPT)
     47                        @\
     48                        $(ECHO) "Linkage             of $*";\
     49                        $(LD) -o $@ $^ $(LD_OPT);
    4850
    4951$(DIR_OBJ)/%.o          : $(DIR_LOCAL_ASM)/%.s 
    50                         @$(ECHO) "Compile             of $*"
    51                         @$(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^
    52                         @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^
     52                        @\
     53                        $(ECHO) "Compile             of $*";\
     54                        $(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^ ;\
     55                        $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ;
    5356#                       @$(AS) $(AS_OPT) $^ -o $@
    5457
    5558$(DIR_OBJ)/%.o          : $(DIR_LOCAL_SYS)/%.s 
    56                         @$(ECHO) "Compile             of $*"
    57                         @$(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^
    58                         @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^
     59                        @\
     60                        $(ECHO) "Compile             of $*";\
     61                        $(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^ ;\
     62                        $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ;
    5963#                       @$(AS) $(AS_OPT) $^ -o $@
    6064
    6165$(DIR_OBJ)/%.o          : $(DIR_LOCAL_C)/%.c
    62                         @$(ECHO) "Compile             of $*"
    63                         @$(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^
    64                         @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^
     66                        @\
     67                        $(ECHO) "Compile             of $*";\
     68                        $(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^ ;\
     69                        $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ;
    6570
    6671$(DIR_OBJ)/%.o          : $(DIR_GLOBAL_ASM)/%.s
    67                         @$(ECHO) "Compile             of $*"
    68                         @$(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^
    69                         @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^
     72                        @\
     73                        $(ECHO) "Compile             of $*";\
     74                        $(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^ ;\
     75                        $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ;
    7076#                       @$(AS) $(AS_OPT) $^ -o $@
    7177
    7278$(DIR_OBJ)/%.o          : $(DIR_GLOBAL_SYS)/%.s
    73                         @$(ECHO) "Compile             of $*"
    74                         @$(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^
    75                         @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^
     79                        @\
     80                        $(ECHO) "Compile             of $*";\
     81                        $(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^ ;\
     82                        $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ;
    7683#                       @$(AS) $(AS_OPT) $^ -o $@
    7784
    7885$(DIR_OBJ)/%.o          : $(DIR_GLOBAL_C)/%.c
    79                         @$(ECHO) "Compile             of $*"
    80                         @$(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^
    81                         @$(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^
     86                        @\
     87                        $(ECHO) "Compile             of $*";\
     88                        $(CC) $(CC_OPT) $(DIR_INC)    -o $@   -c $^ ;\
     89                        $(CC) $(CC_OPT) $(DIR_INC) -S -o $@.s -c $^ ;
    8290
    8391#-----[ Environement ]------------------------------------------------------------
    … …  
    93101#-----[ Maintenance ]-------------------------------------------------------------
    94102clean                   :
    95                         @$(ECHO) "Delete     temporary files              "`$(PWD)`
    96                         @$(RM) $(DIR_OBJ) $(DIR_BIN)
    97                         @$(MAKE) clean_rec DIR_CLEAN=.
     103                        @\
     104                        $(ECHO) "Delete     temporary files              "`$(PWD)`;\
     105                        $(RM) $(DIR_OBJ) $(DIR_BIN);\
     106                        $(MAKE) clean_rec DIR_CLEAN=.;
    98107
    99108#Clean recursive
    100109clean_rec               :
    101                         @$(ECHO) "Delete     temporary files in directory $(DIR_CLEAN)"
    102                         @$(RM) -f $(DIR_CLEAN)/*~
    103                         @for files in `$(LS) $(DIR_CLEAN)`; do                                  \
     110                        @\
     111                        $(ECHO) "Delete     temporary files in directory $(DIR_CLEAN)";\
     112                        $(RM) -f $(DIR_CLEAN)/*~;\
     113                        for files in `$(LS) $(DIR_CLEAN)`; do                                   \
    104114                                if $(TEST) -d $(DIR_CLEAN)/$$files;                             \
    105115                                then                                                            \
    … …  
    110120#-----[ Help ]--------------------------------------------------------------------
    111121help                    :
    112                         @$(ECHO) ""
    113                         @$(ECHO) "List of directive   : "
    114                         @$(ECHO) " * make             : Compile the software"
    115                         @$(ECHO) " * make clean       : Erase all files generates"
    116                         @$(ECHO) " * make bench_list  : View all benchmark"
    117                         @$(ECHO) " * make bench_exec  : Print the file \"$(FILE_BENCH)\" - it's the Workload"
    118                         @$(ECHO) " * make bench       : Compile the Benchmark Suite"
    119                         @$(ECHO) ""
     122                        @\
     123                        $(ECHO) "";\
     124                        $(ECHO) "List of directive   : ";\
     125                        $(ECHO) " * make             : Compile the software";\
     126                        $(ECHO) " * make clean       : Erase all files generates";\
     127                        $(ECHO) " * make bench_list  : View all benchmark";\
     128                        $(ECHO) " * make bench_exec  : Print the file \"$(FILE_BENCH)\" - it's the Workload";\
     129                        $(ECHO) " * make bench       : Compile the Benchmark Suite";\
     130                        $(ECHO) "";

  • trunk/Softwares/Min.or32/Makefile

    r2 r48  
    2727
    2828$(DIR_BIN)/%.x.txt      : $(DIR_BIN)/%.x
    29                         @$(ECHO) "List symbols        of $*"
    30                         @$(NM)      $(NM_OPT)      $^ > $@.nm
    31                         @$(ECHO) "Display information of $*"
    32                         @$(OBJDUMP) $(OBJDUMP_OPT) $^ > $@
     29                        @\
     30                        $(ECHO) "List symbols        of $*";\
     31                        $(NM)      $(NM_OPT)      $^ > $@.nm;\
     32                        $(ECHO) "Display information of $*";\
     33                        $(OBJDUMP) $(OBJDUMP_OPT) $^ > $@;
    3334
    3435$(DIR_BIN)/%.x          : $(OBJ_SYS) $(OBJ)
    35                         @$(ECHO) "Linkage             of $*"
    36                         @$(LD) -o $@ $^ $(LD_OPT)
     36                        @\
     37                        $(ECHO) "Linkage             of $*";\
     38                        $(LD) -o $@ $^ $(LD_OPT);
    3739
    3840$(DIR_OBJ)/%.o          : $(DIR_ASM)/%.s       
    39                         @$(ECHO) "Compile             of $*"
    40                         @$(CC) $(CC_OPT) -I$(DIR_INC)    -o $@   -c $^
    41                         @$(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^
     41                        @\
     42                        $(ECHO) "Compile             of $*";\
     43                        $(CC) $(CC_OPT) -I$(DIR_INC)    -o $@   -c $^ ;\
     44                        $(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^ ;
    4245#                       @$(AS) $(AS_OPT) $^ -o $@
    4346
    4447$(DIR_OBJ)/%.o          : $(DIR_SYS)/%.s       
    45                         @$(ECHO) "Compile             of $*"
    46                         @$(CC) $(CC_OPT) -I$(DIR_INC)    -o $@   -c $^
    47                         @$(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^
     48                        @\
     49                        $(ECHO) "Compile             of $*";\
     50                        $(CC) $(CC_OPT) -I$(DIR_INC)    -o $@   -c $^ ;\
     51                        $(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^ ;
    4852#                       @$(AS) $(AS_OPT) $^ -o $@
    4953
    5054$(DIR_OBJ)/%.o          : $(DIR_C)/%.c
    51                         @$(ECHO) "Compile             of $*"
    52                         @$(CC) $(CC_OPT) -I$(DIR_INC)    -o $@   -c $^
    53                         @$(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^
     55                        @\
     56                        $(ECHO) "Compile             of $*";\
     57                        $(CC) $(CC_OPT) -I$(DIR_INC)    -o $@   -c $^ ;\
     58                        $(CC) $(CC_OPT) -I$(DIR_INC) -S -o $@.s -c $^ ;
    5459
    5560#-----[ Environement ]------------------------------------------------------------
    … …  
    6570#-----[ Maintenance ]-------------------------------------------------------------
    6671clean                   :
    67                         @$(ECHO) "Delete     temporary files              "`$(PWD)`
    68                         @$(RM) $(DIR_OBJ) $(DIR_BIN)
    69                         @$(MAKE) clean_rec DIR_CLEAN=.
     72                        @\
     73                        $(ECHO) "Delete     temporary files              "`$(PWD)`;\
     74                        $(RM) $(DIR_OBJ) $(DIR_BIN);\
     75                        $(MAKE) clean_rec DIR_CLEAN=.;
    7076
    7177#Clean recursive
    7278clean_rec               :
    73                         @$(ECHO) "Delete     temporary files in directory $(DIR_CLEAN)"
    74                         @$(RM) -f $(DIR_CLEAN)/*~
    75                         @for files in `$(LS) $(DIR_CLEAN)`; do                                  \
     79                        @\
     80                        $(ECHO) "Delete     temporary files in directory $(DIR_CLEAN)";\
     81                        $(RM) -f $(DIR_CLEAN)/*~;\
     82                        for files in `$(LS) $(DIR_CLEAN)`; do                                   \
    7683                                if $(TEST) -d $(DIR_CLEAN)/$$files;                             \
    7784                                then                                                            \
    … …  
    8289#-----[ Help ]--------------------------------------------------------------------
    8390help                    :
    84                         @$(ECHO) ""
    85                         @$(ECHO) "List of directive   : "
    86                         @$(ECHO) " * make             : Compile the software"
    87                         @$(ECHO) " * make clean       : Erase all files generates"
    88                         @$(ECHO) ""
     91                        @\
     92                        $(ECHO) "";\
     93                        $(ECHO) "List of directive   : ";\
     94                        $(ECHO) " * make             : Compile the software";\
     95                        $(ECHO) " * make clean       : Erase all files generates";\
     96                        $(ECHO) "";
Note: See TracChangeset for help on using the changeset viewer.