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/Meta_Predictor_Glue
Files:
31 edited

Legend:

Unmodified
Added
Removed

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