Ignore:
Timestamp:
Apr 5, 2007, 4:17:30 PM (17 years ago)
Author:
rosiere
Message:

Interface normalisé
Début du banc de registres multi niveaux

Location:
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src
Files:
3 added
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/Parameters.cpp

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Parameters.h"
     8#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Parameters.h"
    99
    1010namespace morpheo {
    1111namespace behavioural {
    1212namespace generic {
     13namespace registerfile{
    1314namespace registerfile_multi_banked {
    1415namespace registerfile_multi_banked_glue {
    1516
    16   Parameters::Parameters (uint32_t nb_port_read ,
    17                           uint32_t nb_port_write,
    18                           uint32_t size_address ,
    19                           uint32_t size_word    ,
    20                           uint32_t nb_bank      ):
     17  Parameters::Parameters (uint32_t    nb_port_read         ,
     18                          uint32_t    nb_port_write        ,
     19                          uint32_t    size_address         ,
     20                          uint32_t    size_word            ,
     21                          uint32_t    nb_bank              ,
     22                          uint32_t    nb_port_read_by_bank ,
     23                          uint32_t    nb_port_write_by_bank,
     24                          Tcrossbar_t crossbar             ):
    2125    _nb_port_read          (nb_port_read         ),
    2226    _nb_port_write         (nb_port_write        ),
    … …  
    2428    _size_word             (size_word            ),
    2529    _nb_bank               (nb_bank              ),
    26     _nb_port_read_by_bank  (nb_port_read /nb_bank),
    27     _nb_port_write_by_bank (nb_port_write/nb_bank)
     30    _nb_port_read_by_bank  (nb_port_read_by_bank ),
     31    _nb_port_write_by_bank (nb_port_write_by_bank),
     32    _crossbar              (crossbar             ),
     33    _shift_address         (static_cast<uint32_t>(ceil(log2(_nb_bank))))
    2834  {
    2935    log_printf(FUNC,RegisterFile_Multi_Banked_Glue,"Parameters","Begin");
     36
     37    if (_crossbar == PARTIAL_CROSSBAR)
     38      {
     39        // All port_src is connected with one port_dest on each bank
     40       
     41        _link_port_read  = new uint32_t [_nb_port_read ];
     42        for (uint32_t i=0; i<_nb_port_read ; i++)
     43          _link_port_read  [i] = i%_nb_port_read_by_bank;
     44
     45        _link_port_write = new uint32_t [_nb_port_write];
     46        for (uint32_t i=0; i<_nb_port_write; i++)
     47          _link_port_write [i] = i%_nb_port_write_by_bank;
     48      }
     49    // else : don't allocate
     50
     51    _nb_port_select_by_bank_read_port  = new uint32_t [_nb_port_read_by_bank ];
     52   
     53    if (_crossbar == FULL_CROSSBAR)
     54      // All port_src is connected with all port_dest on each bank
     55      for (uint32_t i=0; i<_nb_port_read_by_bank ;i++)
     56        _nb_port_select_by_bank_read_port [i] = _nb_port_read;
     57    else
     58      // All port_src is connected with one port_dest on each bank
     59      {
     60        for (uint32_t i=0; i<_nb_port_read_by_bank ;i++)
     61          _nb_port_select_by_bank_read_port [i] = 0;
     62
     63        for (uint32_t i=0; i<_nb_port_read         ;i++)
     64          _nb_port_select_by_bank_read_port [_link_port_read [i]] ++;
     65      }
     66   
     67    _nb_port_select_by_bank_write_port = new uint32_t [_nb_port_write_by_bank];
     68
     69    if (_crossbar == FULL_CROSSBAR)
     70      // All port_src is connected with all port_dest on each bank
     71      for (uint32_t i=0; i<_nb_port_write_by_bank ;i++)
     72        _nb_port_select_by_bank_write_port [i] = _nb_port_write;
     73    else
     74      // All port_src is connected with one port_dest on each bank
     75      {
     76        for (uint32_t i=0; i<_nb_port_write_by_bank ;i++)
     77          _nb_port_select_by_bank_write_port [i] = 0;
     78
     79        for (uint32_t i=0; i<_nb_port_write         ;i++)
     80          _nb_port_select_by_bank_write_port [_link_port_write[i]] ++;
     81      }
     82   
    3083    test();
    3184    log_printf(FUNC,RegisterFile_Multi_Banked_Glue,"Parameters","End");
    … …  
    3386 
    3487  Parameters::Parameters (Parameters & param):
    35    _nb_port_read          (param._nb_port_read ),
    36    _nb_port_write         (param._nb_port_write),
    37    _size_address          (param._size_address ),
    38    _size_word             (param._size_word    ),
    39    _nb_bank               (param._nb_bank      ),
    40    _nb_port_read_by_bank  (param._nb_port_read ),
    41    _nb_port_write_by_bank (param._nb_port_write)
     88    _nb_port_read          (param._nb_port_read         ),
     89    _nb_port_write         (param._nb_port_write        ),
     90    _size_address          (param._size_address         ),
     91    _size_word             (param._size_word            ),
     92    _nb_bank               (param._nb_bank              ),
     93    _nb_port_read_by_bank  (param._nb_port_read_by_bank ),
     94    _nb_port_write_by_bank (param._nb_port_write_by_bank),
     95    _crossbar              (param._crossbar             ),
     96    _shift_address         (param._shift_address        )
    4297   {
    43     log_printf(FUNC,RegisterFile_Multi_Banked_Glue,"Parameters","Begin");
     98    log_printf(FUNC,RegisterFile_Multi_Banked_Glue,"Parameters (copy)","Begin");
     99
     100    _nb_port_select_by_bank_read_port  = new uint32_t [_nb_port_read_by_bank ];
     101    for (uint32_t i=0; i<_nb_port_read_by_bank; i++)
     102      _nb_port_select_by_bank_read_port [i] = param._nb_port_select_by_bank_read_port [i];
     103   
     104    _nb_port_select_by_bank_write_port = new uint32_t [_nb_port_write_by_bank ];
     105    for (uint32_t i=0; i<_nb_port_write_by_bank; i++)
     106      _nb_port_select_by_bank_write_port[i] = param._nb_port_select_by_bank_write_port [i];
     107   
    44108    test();
    45     log_printf(FUNC,RegisterFile_Multi_Banked_Glue,"Parameters","End");
     109    log_printf(FUNC,RegisterFile_Multi_Banked_Glue,"Parameters (copy)","End");
    46110  };
    47111
    … …  
    54118}; // end namespace registerfile_multi_banked_glue
    55119}; // end namespace registerfile_multi_banked
     120}; // end namespace registerfile
    56121}; // end namespace generic
    57122}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/Parameters_msg_error.cpp

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Parameters.h"
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Types.h"
     8#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Parameters.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    1212
    13 namespace morpheo                    {
     13namespace morpheo {
    1414namespace behavioural {
    1515namespace generic {
     16namespace registerfile{
    1617namespace registerfile_multi_banked {
    1718namespace registerfile_multi_banked_glue {
    18 
    1919
    2020  string Parameters::msg_error(void)
    … …  
    2424    string msg = "";
    2525
     26    if (_nb_port_read < _nb_port_read_by_bank)
     27      {
     28        msg += "  - Each bank read's port must be higher at number of read port\n";
     29        msg += "    * nb_port_read                    : " + toString(_nb_port_read        ) + "\n";
     30        msg += "    * nb_port_read_by_bank            : " + toString(_nb_port_read_by_bank) + "\n";
     31      }
     32
     33    if (_nb_port_write < _nb_port_write_by_bank)
     34      {
     35        msg += "  - Each bank write's port must be higher at number of write port\n";
     36        msg += "    * nb_port_write                   : " + toString(_nb_port_write        ) + "\n";
     37        msg += "    * nb_port_write_by_bank           : " + toString(_nb_port_write_by_bank) + "\n";
     38      }
     39   
     40    if (_nb_bank < 1)
     41      {
     42        msg += "  - nb_bank must be higher at 1\n";
     43        msg += "    * nb_bank                         : " + toString(_nb_bank             ) + "\n";
     44      }
     45     
    2646    return msg;
    2747
    … …  
    3151}; // end namespace registerfile_multi_banked_glue
    3252}; // end namespace registerfile_multi_banked
     53}; // end namespace registerfile
    3354}; // end namespace generic
    34 
    3555}; // end namespace behavioural
    3656}; // end namespace morpheo             

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/Parameters_print.cpp

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Parameters.h"
     8#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Parameters.h"
    99#include "Behavioural/include/XML.h"
    1010using namespace std;
    … …  
    1313namespace behavioural {
    1414namespace generic {
     15namespace registerfile{
    1516namespace registerfile_multi_banked {
    1617namespace registerfile_multi_banked_glue {
    … …  
    2425
    2526    xml.balise_open("registerfile_multi_banked_glue");
    26     xml.singleton_begin("nb_port_read "); xml.attribut("value",toString(_nb_port_read )); xml.singleton_end();
    27     xml.singleton_begin("nb_port_write"); xml.attribut("value",toString(_nb_port_write)); xml.singleton_end();
    28     xml.singleton_begin("size_address "); xml.attribut("value",toString(_size_address )); xml.singleton_end();
    29     xml.singleton_begin("size_word    "); xml.attribut("value",toString(_size_word    )); xml.singleton_end();
    30     xml.singleton_begin("nb_bank      "); xml.attribut("value",toString(_nb_bank      )); xml.singleton_end();
     27    xml.singleton_begin("nb_port_read         "); xml.attribut("value",toString(_nb_port_read         )); xml.singleton_end();
     28    xml.singleton_begin("nb_port_write        "); xml.attribut("value",toString(_nb_port_write        )); xml.singleton_end();
     29    xml.singleton_begin("size_address         "); xml.attribut("value",toString(_size_address         )); xml.singleton_end();
     30    xml.singleton_begin("size_word            "); xml.attribut("value",toString(_size_word            )); xml.singleton_end();
     31    xml.singleton_begin("nb_bank              "); xml.attribut("value",toString(_nb_bank              )); xml.singleton_end();
     32    xml.singleton_begin("nb_port_read_by_bank "); xml.attribut("value",toString(_nb_port_read_by_bank )); xml.singleton_end();
     33    xml.singleton_begin("nb_port_write_by_bank"); xml.attribut("value",toString(_nb_port_write_by_bank)); xml.singleton_end();
     34    xml.singleton_begin("crossbar             "); xml.attribut("value",toString(_crossbar             )); xml.singleton_end();
    3135    xml.balise_close();
    3236
    … …  
    3741
    3842  ostream& operator<< (ostream& output_stream ,
    39                        morpheo::behavioural::generic::registerfile_multi_banked::registerfile_multi_banked_glue::Parameters & x)
     43                       morpheo::behavioural::generic::registerfile::registerfile_multi_banked::registerfile_multi_banked_glue::Parameters & x)
    4044  {
    4145    output_stream << x.print(0);
    … …  
    4650}; // end namespace registerfile_multi_banked_glue
    4751}; // end namespace registerfile_multi_banked
     52}; // end namespace registerfile
    4853}; // end namespace generic
    4954

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue.cpp

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     8#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    1212namespace generic {
     13namespace registerfile{
    1314namespace registerfile_multi_banked {
    1415namespace registerfile_multi_banked_glue {
    … …  
    2324                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2425#endif
    25                               morpheo::behavioural::generic::registerfile_multi_banked::registerfile_multi_banked_glue::Parameters param ):
     26                              morpheo::behavioural::generic::registerfile::registerfile_multi_banked::registerfile_multi_banked_glue::Parameters param ):
    2627                              _name              (name)
    2728                              ,_param            (param)
    … …  
    6667    allocation ();
    6768
    68 //#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     69#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    6970    log_printf(INFO,RegisterFile_Multi_Banked_Glue,"RegisterFile_Multi_Banked_Glue","Method - transition");
    7071
    … …  
    7273    dont_initialize ();
    7374    sensitive_pos << *(in_CLOCK);
    74 //#endif
     75#endif
     76
     77    log_printf(INFO,RegisterFile_Multi_Banked_Glue,"RegisterFile_Multi_Banked_Glue","Method - transition");
     78
     79    SC_METHOD (genMealy_read_in);
     80    dont_initialize ();
     81    for (uint32_t l=0; l<_param._nb_port_read; l++)
     82      sensitive << (*(in_READ_IN_ADDRESS [l]));
     83    for (uint32_t i=0; i<_param._nb_bank; i++)
     84       for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
     85         {
     86           sensitive << (*(in_READ_OUT_ACK      [i][j]))
     87                     << (*(in_READ_OUT_DATA     [i][j]));
     88           for (uint32_t k=0; k<_param._nb_port_select_by_bank_read_port[j]; k++)
     89             sensitive << (*(in_READ_SELECT_ACK [i][j][k]));
     90         }
    7591
    7692#ifdef SYSTEMCASS_SPECIFIC
    7793    // List dependency information
     94    for (uint32_t l=0; l<_param._nb_port_read; l++)
     95      {
     96        (*(out_READ_IN_ACK  [l])) (*(in_READ_IN_ADDRESS [l]));
     97        (*(out_READ_IN_DATA [l])) (*(in_READ_IN_ADDRESS [l]));
     98
     99        for (uint32_t i=0; i<_param._nb_bank; i++)
     100          for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
     101            {
     102              (*(out_READ_IN_ACK  [l])) (*(in_READ_OUT_ACK      [i][j]));
     103              (*(out_READ_IN_DATA [l])) (*(in_READ_OUT_DATA     [i][j]));
     104              for (uint32_t k=0; k<_param._nb_port_select_by_bank_read_port[j]; k++)
     105                {
     106                  (*(out_READ_IN_ACK  [l])) (*(in_READ_SELECT_ACK [i][j][k]));
     107                  (*(out_READ_IN_DATA [l])) (*(in_READ_SELECT_ACK [i][j][k]));
     108                }
     109            }
     110      }
    78111#endif   
    79112
    … …  
    113146}; // end namespace registerfile_multi_banked_glue
    114147}; // end namespace registerfile_multi_banked
     148}; // end namespace registerfile
    115149}; // end namespace generic
    116150

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_allocation.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    1313namespace generic {
     14namespace registerfile{
    1415namespace registerfile_multi_banked {
    1516namespace registerfile_multi_banked_glue {
    … …  
    3031    in_READ_IN_ADDRESS   = new SC_IN (Taddress_t)           * [_param._nb_port_read];
    3132   out_READ_IN_DATA      = new SC_OUT(Tdata_t   )           * [_param._nb_port_read];
    32     in_READ_SELECT_VAL   = new SC_IN (Tcontrol_t)           * [_param._nb_port_read];
    33    out_READ_SELECT_ACK   = new SC_OUT(Tcontrol_t)           * [_param._nb_port_read];
    3433
    3534   for (uint32_t i=0; i<_param._nb_port_read; i++)
    … …  
    4645       rename = "out_READ_IN_DATA_"+toString(i)+"     ";
    4746       out_READ_IN_DATA      [i] = new SC_OUT(Tdata_t   ) (rename.c_str());
    48 
    49        rename = " in_READ_SELECT_VAL_"+toString(i)+"  ";
    50         in_READ_SELECT_VAL   [i] = new SC_IN (Tcontrol_t) (rename.c_str());
    51 
    52        rename = "out_READ_SELECT_ACK_"+toString(i)+"  ";
    53        out_READ_SELECT_ACK   [i] = new SC_OUT(Tcontrol_t) (rename.c_str());
    5447     }
    5548                                                     
    56    out_READ_OUT_VAL      = new SC_OUT(Tcontrol_t)          ** [_param._nb_bank];
    57     in_READ_OUT_ACK      = new SC_IN (Tcontrol_t)          ** [_param._nb_bank];
    58    out_READ_OUT_ADDRESS  = new SC_OUT(Taddress_t)          ** [_param._nb_bank];
    59     in_READ_OUT_DATA     = new SC_IN (Tdata_t   )          ** [_param._nb_bank];
     49   out_READ_SELECT_VAL  = new SC_OUT(Tcontrol_t) *** [_param._nb_bank];
     50    in_READ_SELECT_ACK  = new SC_IN (Tcontrol_t) *** [_param._nb_bank];
     51
     52    for (uint32_t i=0; i<_param._nb_bank; i++)
     53      {
     54        out_READ_SELECT_VAL [i] = new SC_OUT(Tcontrol_t)  ** [_param._nb_port_read_by_bank];
     55         in_READ_SELECT_ACK [i] = new SC_IN (Tcontrol_t)  ** [_param._nb_port_read_by_bank];
     56
     57         for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
     58           {
     59             out_READ_SELECT_VAL [i][j] = new SC_OUT(Tcontrol_t)   * [_param._nb_port_select_by_bank_read_port [j]];
     60              in_READ_SELECT_ACK [i][j] = new SC_IN (Tcontrol_t)   * [_param._nb_port_select_by_bank_read_port [j]];
     61             
     62             for (uint32_t k=0; k<_param._nb_port_select_by_bank_read_port [j]; k++)
     63               {
     64                 rename="out_READ_SELECT_VAL_"+toString(i)+"_"+toString(j)+"_"+toString(k)+" ";
     65                 out_READ_SELECT_VAL [i][j][k] = new SC_OUT(Tcontrol_t) (rename.c_str());
     66                 
     67                 rename=" in_READ_SELECT_ACK_"+toString(i)+"_"+toString(j)+"_"+toString(k)+" ";
     68                  in_READ_SELECT_ACK [i][j][k] = new SC_IN (Tcontrol_t) (rename.c_str());
     69               }
     70           }
     71      }
     72
     73   out_READ_OUT_VAL         = new SC_OUT(Tcontrol_t)          ** [_param._nb_bank];
     74    in_READ_OUT_ACK         = new SC_IN (Tcontrol_t)          ** [_param._nb_bank];
     75   out_READ_OUT_ADDRESS     = new SC_OUT(Taddress_t)          ** [_param._nb_bank];
     76    in_READ_OUT_DATA        = new SC_IN (Tdata_t   )          ** [_param._nb_bank];
    6077
    6178    for (uint32_t i=0; i<_param._nb_bank; i++)
    … …  
    87104    in_WRITE_IN_ADDRESS  = new SC_IN (Taddress_t)           * [_param._nb_port_write];
    88105    in_WRITE_IN_DATA     = new SC_IN (Tdata_t   )           * [_param._nb_port_write];
    89     in_WRITE_SELECT_VAL  = new SC_IN (Tcontrol_t)           * [_param._nb_port_write];
    90    out_WRITE_SELECT_ACK  = new SC_OUT(Tcontrol_t)           * [_param._nb_port_write];
    91106
    92107   for (uint32_t i=0; i<_param._nb_port_write; i++)
    … …  
    103118       rename = " in_WRITE_IN_DATA_"+toString(i)+"    ";
    104119        in_WRITE_IN_DATA     [i] = new SC_IN (Tdata_t   ) (rename.c_str());
    105 
    106        rename = " in_WRITE_SELECT_VAL_"+toString(i)+" ";
    107         in_WRITE_SELECT_VAL   [i] = new SC_IN (Tcontrol_t) (rename.c_str());
    108 
    109        rename = "out_WRITE_SELECT_ACK_"+toString(i)+" ";
    110        out_WRITE_SELECT_ACK   [i] = new SC_OUT(Tcontrol_t) (rename.c_str());
    111120     }
    112121   
     122   out_WRITE_SELECT_VAL  = new SC_OUT(Tcontrol_t) *** [_param._nb_bank];
     123    in_WRITE_SELECT_ACK  = new SC_IN (Tcontrol_t) *** [_param._nb_bank];
     124
     125    for (uint32_t i=0; i<_param._nb_bank; i++)
     126      {
     127        out_WRITE_SELECT_VAL [i] = new SC_OUT(Tcontrol_t)  ** [_param._nb_port_write_by_bank];
     128         in_WRITE_SELECT_ACK [i] = new SC_IN (Tcontrol_t)  ** [_param._nb_port_write_by_bank];
     129
     130         for (uint32_t j=0; j<_param._nb_port_write_by_bank; j++)
     131           {
     132             out_WRITE_SELECT_VAL [i][j] = new SC_OUT(Tcontrol_t)   * [_param._nb_port_select_by_bank_write_port [j]];
     133              in_WRITE_SELECT_ACK [i][j] = new SC_IN (Tcontrol_t)   * [_param._nb_port_select_by_bank_write_port [j]];
     134             
     135             for (uint32_t k=0; k<_param._nb_port_select_by_bank_write_port [j]; k++)
     136               {
     137                 rename="out_WRITE_SELECT_VAL_"+toString(i)+"_"+toString(j)+"_"+toString(k)+"";
     138                 out_WRITE_SELECT_VAL [i][j][k] = new SC_OUT(Tcontrol_t) (rename.c_str());
     139                 
     140                 rename=" in_WRITE_SELECT_ACK_"+toString(i)+"_"+toString(j)+"_"+toString(k)+"";
     141                  in_WRITE_SELECT_ACK [i][j][k] = new SC_IN (Tcontrol_t) (rename.c_str());
     142               }
     143           }
     144      }
    113145   
    114146   out_WRITE_OUT_VAL     = new SC_OUT(Tcontrol_t)          ** [_param._nb_bank];
    … …  
    147179}; // end namespace registerfile_multi_banked_glue
    148180}; // end namespace registerfile_multi_banked
     181}; // end namespace registerfile
    149182}; // end namespace generic
    150183

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_deallocation.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    1313namespace generic {
     14namespace registerfile{
    1415namespace registerfile_multi_banked {
    1516namespace registerfile_multi_banked_glue {
    … …  
    2930       delete  in_READ_IN_ADDRESS   [i];
    3031       delete out_READ_IN_DATA      [i];
    31        delete  in_READ_SELECT_VAL   [i];
    32        delete out_READ_SELECT_ACK   [i];
    3332     }
    3433                                                     
    … …  
    3736   delete  in_READ_IN_ADDRESS;
    3837   delete out_READ_IN_DATA   ;
    39    delete  in_READ_SELECT_VAL;
    40    delete out_READ_SELECT_ACK;
    41 
    42     for (uint32_t i=0; i<_param._nb_bank; i++)
     38   
     39   for (uint32_t i=0; i<_param._nb_bank; i++)
     40     {
     41       for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
     42         {
     43           for (uint32_t k=0; k<_param._nb_port_select_by_bank_read_port[j]; k++)
     44             {
     45               delete out_READ_SELECT_VAL [i][j][k];
     46               delete  in_READ_SELECT_ACK [i][j][k];
     47             }
     48           delete out_READ_SELECT_VAL [i][j];
     49           delete  in_READ_SELECT_ACK [i][j];
     50         }
     51       delete out_READ_SELECT_VAL [i];
     52       delete  in_READ_SELECT_ACK [i];
     53     }
     54   delete out_READ_SELECT_VAL;
     55   delete  in_READ_SELECT_ACK;
     56   
     57   for (uint32_t i=0; i<_param._nb_bank; i++)
    4358      {
    4459        for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
    … …  
    6782       delete  in_WRITE_IN_ADDRESS  [i];
    6883       delete  in_WRITE_IN_DATA     [i];
    69        delete  in_WRITE_SELECT_VAL  [i];
    70        delete out_WRITE_SELECT_ACK  [i];
    7184     }
    7285
    … …  
    7588   delete  in_WRITE_IN_ADDRESS;
    7689   delete  in_WRITE_IN_DATA   ;
    77    delete  in_WRITE_SELECT_VAL;
    78    delete out_WRITE_SELECT_ACK;
     90
     91   for (uint32_t i=0; i<_param._nb_bank; i++)
     92     {
     93       for (uint32_t j=0; j<_param._nb_port_write_by_bank; j++)
     94         {
     95           for (uint32_t k=0; k<_param._nb_port_select_by_bank_write_port[j]; k++)
     96             {
     97               delete out_WRITE_SELECT_VAL [i][j][k];
     98               delete  in_WRITE_SELECT_ACK [i][j][k];
     99             }
     100           delete out_WRITE_SELECT_VAL [i][j];
     101           delete  in_WRITE_SELECT_ACK [i][j];
     102         }
     103       delete out_WRITE_SELECT_VAL [i];
     104       delete  in_WRITE_SELECT_ACK [i];
     105     }
     106   delete out_WRITE_SELECT_VAL;
     107   delete  in_WRITE_SELECT_ACK;
    79108   
    80109   for (uint32_t i=0; i<_param._nb_bank; i++)
    … …  
    106135}; // end namespace registerfile_multi_banked_glue
    107136}; // end namespace registerfile_multi_banked
     137}; // end namespace registerfile
    108138}; // end namespace generic
    109139}; // end namespace behavioural

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_statistics.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    1313namespace generic {
     14namespace registerfile{
    1415namespace registerfile_multi_banked {
    1516namespace registerfile_multi_banked_glue {
    … …  
    2930}; // end namespace registerfile_multi_banked_glue
    3031}; // end namespace registerfile_multi_banked
     32}; // end namespace registerfile
    3133}; // end namespace generic
    3234

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_transition.cpp

    r10 r15  
    11#ifdef SYSTEMC
    2 //#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     2#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    33/*
    44 * $Id$
    … …  
    88 */
    99
    10 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     10#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    1111
    1212namespace morpheo                    {
    1313namespace behavioural {
    1414namespace generic {
     15namespace registerfile{
    1516namespace registerfile_multi_banked {
    1617namespace registerfile_multi_banked_glue {
    … …  
    3435}; // end namespace registerfile_multi_banked_glue
    3536}; // end namespace registerfile_multi_banked
     37}; // end namespace registerfile
    3638}; // end namespace generic
    37 
    3839}; // end namespace behavioural
    3940}; // end namespace morpheo             
    4041#endif
    41 //#endif
     42#endif

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_vhdl.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    … …  
    1313namespace behavioural {
    1414namespace generic {
     15namespace registerfile{
    1516namespace registerfile_multi_banked {
    1617namespace registerfile_multi_banked_glue {
    … …  
    3536}; // end namespace registerfile_multi_banked_glue
    3637}; // end namespace registerfile_multi_banked
     38}; // end namespace registerfile
    3739}; // end namespace generic
    3840

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_vhdl_body.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    1313namespace generic {
     14namespace registerfile{
    1415namespace registerfile_multi_banked {
    1516namespace registerfile_multi_banked_glue {
    … …  
    2526}; // end namespace registerfile_multi_banked_glue
    2627}; // end namespace registerfile_multi_banked
     28}; // end namespace registerfile
    2729}; // end namespace generic
    2830

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_vhdl_declaration.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    1010
    1111namespace morpheo {
    1212namespace behavioural {
    1313namespace generic {
     14namespace registerfile{
    1415namespace registerfile_multi_banked {
    1516namespace registerfile_multi_banked_glue {
    … …  
    2425}; // end namespace registerfile_multi_banked_glue
    2526}; // end namespace registerfile_multi_banked
     27}; // end namespace registerfile
    2628}; // end namespace generic
    2729

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_vhdl_port.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    1010
    1111#ifdef VHDL_TESTBENCH
    … …  
    1818namespace behavioural {
    1919namespace generic {
     20namespace registerfile{
    2021namespace registerfile_multi_banked {
    2122namespace registerfile_multi_banked_glue {
    … …  
    2627    log_printf(FUNC,RegisterFile_Multi_Banked_Glue,"vhdl_port","Begin");
    2728
     29    log_printf(TRACE,RegisterFile_Multi_Banked_Glue,"vhdl_port","Interface READ_IN");
    2830   for (uint32_t i=0; i<_param._nb_port_read; i++)
    2931     {
    … …  
    3234       VHDL_SET_PORT(" in_READ_IN_ADDRESS_"+toString(i)+"  ", IN, _param._size_address);
    3335       VHDL_SET_PORT("out_READ_IN_DATA_"+toString(i)+"     ",OUT, _param._size_word   );
    34        VHDL_SET_PORT(" in_READ_SELECT_VAL_"+toString(i)+"  ", IN, 1);
    35        VHDL_SET_PORT("out_READ_SELECT_ACK_"+toString(i)+"  ",OUT, 1);
    3636     }
    37                                                      
     37
     38   log_printf(TRACE,RegisterFile_Multi_Banked_Glue,"vhdl_port","Interface READ_SELECT");
     39       
     40   for (uint32_t i=0; i<_param._nb_bank; i++)
     41     {
     42       log_printf(TRACE,RegisterFile_Multi_Banked_Glue,"vhdl_port","READ_SELECT[%d]",i);
     43       for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
     44         {
     45           log_printf(TRACE,RegisterFile_Multi_Banked_Glue,"vhdl_port","READ_SELECT[%d][%d]",i,j);
     46           for (uint32_t k=0; k<_param._nb_port_select_by_bank_read_port [j]; k++)
     47             {
     48               log_printf(TRACE,RegisterFile_Multi_Banked_Glue,"vhdl_port","READ_SELECT[%d][%d][%d]",i,j,k);
     49               VHDL_SET_PORT("out_READ_SELECT_VAL_"+toString(i)+"_"+toString(j)+"_"+toString(k)+" ",OUT, 1);
     50               VHDL_SET_PORT(" in_READ_SELECT_ACK_"+toString(i)+"_"+toString(j)+"_"+toString(k)+" ", IN, 1);
     51             }
     52         }
     53     }
     54   log_printf(TRACE,RegisterFile_Multi_Banked_Glue,"vhdl_port","Interface READ_OUT");
     55   
    3856    for (uint32_t i=0; i<_param._nb_bank; i++)
    39       {
    40         for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
    41           {
    42             VHDL_SET_PORT("out_READ_OUT_VAL_"+toString(i)+"_"+toString(j)+"      ",OUT, 1);
    43             VHDL_SET_PORT(" in_READ_OUT_ACK_"+toString(i)+"_"+toString(j)+"      ", IN, 1);
    44             VHDL_SET_PORT("out_READ_OUT_ADDRESS_"+toString(i)+"_"+toString(j)+"  ",OUT, _param._size_address);
    45             VHDL_SET_PORT(" in_READ_OUT_DATA_"+toString(i)+"_"+toString(j)+"     ", IN, _param._size_word   );
    46           }
    47       }
     57      for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
     58        {
     59          VHDL_SET_PORT("out_READ_OUT_VAL_"+toString(i)+"_"+toString(j)+"      ",OUT, 1);
     60          VHDL_SET_PORT(" in_READ_OUT_ACK_"+toString(i)+"_"+toString(j)+"      ", IN, 1);
     61          VHDL_SET_PORT("out_READ_OUT_ADDRESS_"+toString(i)+"_"+toString(j)+"  ",OUT, _param._size_address);
     62          VHDL_SET_PORT(" in_READ_OUT_DATA_"+toString(i)+"_"+toString(j)+"     ", IN, _param._size_word   );
     63        }
    4864
     65    log_printf(TRACE,RegisterFile_Multi_Banked_Glue,"vhdl_port","Interface WRITE_IN");
     66   
    4967   for (uint32_t i=0; i<_param._nb_port_write; i++)
    5068     {
    … …  
    5371       VHDL_SET_PORT(" in_WRITE_IN_ADDRESS_"+toString(i)+" ", IN, _param._size_address);
    5472       VHDL_SET_PORT(" in_WRITE_IN_DATA_"+toString(i)+"    ", IN, _param._size_word   );
    55        VHDL_SET_PORT(" in_WRITE_SELECT_VAL_"+toString(i)+" ", IN, 1);
    56        VHDL_SET_PORT("out_WRITE_SELECT_ACK_"+toString(i)+" ",OUT, 1);
    5773     }
    5874   
    59     for (uint32_t i=0; i<_param._nb_bank; i++)
    60       {
    61         for (uint32_t j=0; j<_param._nb_port_write_by_bank; j++)
    62           {
    63             VHDL_SET_PORT("out_WRITE_OUT_VAL_"+toString(i)+"_"+toString(j)+"     ",OUT, 1);
    64             VHDL_SET_PORT(" in_WRITE_OUT_ACK_"+toString(i)+"_"+toString(j)+"     ", IN, 1);
    65             VHDL_SET_PORT("out_WRITE_OUT_ADDRESS_"+toString(i)+"_"+toString(j)+" ",OUT, _param._size_address);
    66             VHDL_SET_PORT("out_WRITE_OUT_DATA_"+toString(i)+"_"+toString(j)+"    ",OUT, _param._size_word   );
    67           }
    68       }
     75   log_printf(TRACE,RegisterFile_Multi_Banked_Glue,"vhdl_port","Interface WRITE_SELECT");
     76
     77   for (uint32_t i=0; i<_param._nb_bank; i++)
     78     for (uint32_t j=0; j<_param._nb_port_write_by_bank; j++)
     79       for (uint32_t k=0; k<_param._nb_port_select_by_bank_write_port [j]; k++)
     80         {
     81           VHDL_SET_PORT("out_WRITE_SELECT_VAL_"+toString(i)+"_"+toString(j)+"_"+toString(k)+" ",OUT, 1);
     82           VHDL_SET_PORT(" in_WRITE_SELECT_ACK_"+toString(i)+"_"+toString(j)+"_"+toString(k)+" ", IN, 1);
     83         }
     84   
     85   log_printf(TRACE,RegisterFile_Multi_Banked_Glue,"vhdl_port","Interface WRITE_OUT");
     86   
     87   for (uint32_t i=0; i<_param._nb_bank; i++)
     88     for (uint32_t j=0; j<_param._nb_port_write_by_bank; j++)
     89       {
     90         VHDL_SET_PORT("out_WRITE_OUT_VAL_"+toString(i)+"_"+toString(j)+"     ",OUT, 1);
     91         VHDL_SET_PORT(" in_WRITE_OUT_ACK_"+toString(i)+"_"+toString(j)+"     ", IN, 1);
     92         VHDL_SET_PORT("out_WRITE_OUT_ADDRESS_"+toString(i)+"_"+toString(j)+" ",OUT, _param._size_address);
     93         VHDL_SET_PORT("out_WRITE_OUT_DATA_"+toString(i)+"_"+toString(j)+"    ",OUT, _param._size_word   );
     94       }
    6995
    7096    log_printf(FUNC,RegisterFile_Multi_Banked_Glue,"vhdl_port","End");
    … …  
    7399}; // end namespace registerfile_multi_banked_glue
    74100}; // end namespace registerfile_multi_banked
     101}; // end namespace registerfile
    75102}; // end namespace generic
    76103

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_vhdl_testbench_label.cpp

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     8#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    99
    1010namespace morpheo                    {
    1111namespace behavioural {
    1212namespace generic {
     13namespace registerfile{
    1314namespace registerfile_multi_banked {
    1415namespace registerfile_multi_banked_glue {
    … …  
    2829}; // end namespace registerfile_multi_banked_glue
    2930}; // end namespace registerfile_multi_banked
     31}; // end namespace registerfile
    3032}; // end namespace generic
    3133

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/RegisterFile_Multi_Banked_Glue_vhdl_testbench_transition.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/RegisterFile_Multi_Banked_Glue.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    1313namespace generic {
     14namespace registerfile{
    1415namespace registerfile_multi_banked {
    1516namespace registerfile_multi_banked_glue {
    … …  
    3536       _vhdl_testbench->add_input (PORT_READ( in_READ_IN_ADDRESS   [i]));
    3637       _vhdl_testbench->add_input (PORT_READ(out_READ_IN_DATA      [i]));
    37        _vhdl_testbench->add_input (PORT_READ( in_READ_SELECT_VAL   [i]));
    38        _vhdl_testbench->add_output(PORT_READ(out_READ_SELECT_ACK   [i]));
    3938     }
    40                                                      
     39
     40   for (uint32_t i=0; i<_param._nb_bank; i++)
     41     for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
     42       for (uint32_t k=0; k<_param._nb_port_select_by_bank_read_port [j]; k++)
     43         {
     44           _vhdl_testbench->add_output(PORT_READ(out_READ_SELECT_VAL [i][j][k]));
     45           _vhdl_testbench->add_input (PORT_READ( in_READ_SELECT_ACK [i][j][k]));
     46         }
     47   
    4148    for (uint32_t i=0; i<_param._nb_bank; i++)
    4249      for (uint32_t j=0; j<_param._nb_port_read_by_bank; j++)
    … …  
    5461       _vhdl_testbench->add_input (PORT_READ( in_WRITE_IN_ADDRESS  [i]));
    5562       _vhdl_testbench->add_input (PORT_READ( in_WRITE_IN_DATA     [i]));
    56        _vhdl_testbench->add_input (PORT_READ( in_WRITE_SELECT_VAL  [i]));
    57        _vhdl_testbench->add_output(PORT_READ(out_WRITE_SELECT_ACK  [i]));
    5863     }
     64   
     65   for (uint32_t i=0; i<_param._nb_bank; i++)
     66     for (uint32_t j=0; j<_param._nb_port_write_by_bank; j++)
     67       for (uint32_t k=0; k<_param._nb_port_select_by_bank_write_port [j]; k++)
     68         {
     69           _vhdl_testbench->add_output(PORT_READ(out_WRITE_SELECT_VAL [i][j][k]));
     70           _vhdl_testbench->add_input (PORT_READ( in_WRITE_SELECT_ACK [i][j][k]));
     71         }
    5972   
    6073    for (uint32_t i=0; i<_param._nb_bank; i++)
    … …  
    8093}; // end namespace registerfile_multi_banked_glue
    8194}; // end namespace registerfile_multi_banked
     95}; // end namespace registerfile
    8296}; // end namespace generic
    8397

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/Statistics.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Statistics.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    1212namespace behavioural {
    1313namespace generic {
     14namespace registerfile{
    1415namespace registerfile_multi_banked {
    1516namespace registerfile_multi_banked_glue {
    … …  
    3637}; // end namespace registerfile_multi_banked_glue
    3738}; // end namespace registerfile_multi_banked
     39}; // end namespace registerfile
    3840}; // end namespace generic
    3941

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/Statistics_add.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Statistics.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1515namespace behavioural {
    1616namespace generic {
     17namespace registerfile{
    1718namespace registerfile_multi_banked {
    1819namespace registerfile_multi_banked_glue {
    … …  
    2728}; // end namespace registerfile_multi_banked_glue
    2829}; // end namespace registerfile_multi_banked
     30}; // end namespace registerfile
    2931}; // end namespace generic
    3032

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/Statistics_print.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Statistics.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1515namespace behavioural {
    1616namespace generic {
     17namespace registerfile{
    1718namespace registerfile_multi_banked {
    1819namespace registerfile_multi_banked_glue {
    … …  
    3637
    3738  ostream& operator<< (ostream& output_stream ,
    38                        morpheo::behavioural::generic::registerfile_multi_banked::registerfile_multi_banked_glue::Statistics & x)
     39                       morpheo::behavioural::generic::registerfile::registerfile_multi_banked::registerfile_multi_banked_glue::Statistics & x)
    3940  {
    4041    output_stream << x.print(0);
    … …  
    4546}; // end namespace registerfile_multi_banked_glue
    4647}; // end namespace registerfile_multi_banked
     48}; // end namespace registerfile
    4749}; // end namespace generic
    4850

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/src/Statistics_print_body.cpp

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Statistics.h"
     9#include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/RegisterFile_Multi_Banked_Glue/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1515namespace behavioural {
    1616namespace generic {
     17namespace registerfile{
    1718namespace registerfile_multi_banked {
    1819namespace registerfile_multi_banked_glue {
    … …  
    3536}; // end namespace registerfile_multi_banked_glue
    3637}; // end namespace registerfile_multi_banked
     38}; // end namespace registerfile
    3739}; // end namespace generic
    3840
Note: See TracChangeset for help on using the changeset viewer.