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/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/Meta_Predictor/Two_Level_Branch_Predictor/Branch_History_Table
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.