Ignore:
Timestamp:
Jan 31, 2008, 6:46:41 PM (16 years ago)
Author:
rosiere
Message:

Update all component (except front_end) to :

  • new statistics model
  • no namespace std
Location:
trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic
Files:
1 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Parameters.h

    r62 r75  
    3737  public : ~Parameters () ;
    3838
    39   public : string msg_error (void);
    40 
    41   public :        string   print      (uint32_t depth);
    42   public : friend ostream& operator<< (ostream& output_stream,
    43                                        morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters & x);
     39  public :        std::string   msg_error  (void);
     40  public :        std::string   print      (uint32_t depth);
     41  public : friend std::ostream& operator<< (std::ostream& output_stream,
     42                                            morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters & x);
    4443  };
    4544

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/RegisterFile_Monolithic.h

    r71 r75  
    1616#include "Common/include/ToString.h"
    1717#include <iostream>
    18 using namespace std;
    1918
    2019#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Parameters.h"
    … …  
    2827#endif
    2928#include "Behavioural/include/Usage.h"
    30 
    31 using namespace std;
    3229
    3330namespace morpheo                    {
    … …  
    4643    // -----[ fields ]----------------------------------------------------
    4744    // Parameters
    48   protected : const string       _name;
     45  protected : const std::string       _name;
    4946  protected : const Parameters * _param;
    5047  private   : const Tusage_t     _usage;
    5148
    5249#ifdef STATISTICS
    53   private   : Stat                           * _stat;
     50  public    : Stat                           * _stat;
    5451   
    5552  private   : counter_t                      * _stat_nb_read;
    … …  
    106103   sc_module_name                              name
    107104#else                                         
    108    string                                      name
     105   std::string                                      name
    109106#endif                                         
    110107#ifdef STATISTICS
    … …  
    128125#ifdef STATISTICS
    129126  public  : void     statistics_declaration    (morpheo::behavioural::Parameters_Statistics * param_statistics);
    130   public  : string   statistics_print          (uint32_t depth);
    131127#endif                                         
    132128
    … …  
    137133#endif                                         
    138134                                               
     135#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    139136  private : void     end_cycle                 (void);
    140 
     137#endif
    141138  };
    142139

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

    r62 r75  
    1010#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Types.h"
    1111#include <sstream>
    12 using namespace std;
    1312
    1413namespace morpheo                    {
    … …  
    1817namespace registerfile_monolithic    {
    1918
    20   string Parameters::msg_error(void)
     19  std::string Parameters::msg_error(void)
    2120  {
    22     string msg = "";
     21    std::string msg = "";
    2322
    2423    if ((8*sizeof(Tdata_t)) < _size_word)

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

    r55 r75  
    88#include <stdint.h>
    99#include "Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/include/Parameters.h"
    10 #include <sstream>
    11 using namespace std;
     10#include "Behavioural/include/XML.h"
    1211
    1312namespace morpheo                    {
    … …  
    1716namespace registerfile_monolithic    {
    1817
    19   string Parameters::print (uint32_t depth)
     18  std::string Parameters::print (uint32_t depth)
    2019  {
    21     string tab = string(depth,'\t');
    22     ostringstream msg;
    23     msg << tab << "<registerfile_monolithic>" << endl
    24         << tab << "\t<nb_port_read       value=\"" << _nb_port_read       << "\" />" << endl
    25         << tab << "\t<nb_port_write      value=\"" << _nb_port_write      << "\" />" << endl
    26         << tab << "\t<nb_port_read_write value=\"" << _nb_port_read_write << "\" />" << endl
    27         << tab << "\t<nb_word            value=\"" << _nb_word            << "\" />" << endl
    28         << tab << "\t<size_word          value=\"" << _size_word          << "\" />" << endl
    29         << tab << "</registerfile_monolithic>" << endl;
    30    
    31     return msg.str();
     20    XML xml ("registerfile_monolithic");
     21
     22    xml.balise_open("registerfile_monolithic");
     23    xml.singleton_begin("nb_port_read      "); xml.attribut("value",toString(_nb_port_read      )); xml.singleton_end();
     24    xml.singleton_begin("nb_port_write     "); xml.attribut("value",toString(_nb_port_write     )); xml.singleton_end();
     25    xml.singleton_begin("nb_port_read_write"); xml.attribut("value",toString(_nb_port_read_write)); xml.singleton_end();
     26    xml.singleton_begin("nb_word           "); xml.attribut("value",toString(_nb_word           )); xml.singleton_end();
     27    xml.singleton_begin("size_word         "); xml.attribut("value",toString(_size_word         )); xml.singleton_end();
     28    xml.balise_close();
     29
     30    return xml.get_body(depth);
    3231  };
    3332
    34   ostream& operator<< (ostream& output_stream ,
    35                        morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters & x)
     33  std::ostream& operator<< (std::ostream& output_stream ,
     34                            morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters & x)
    3635  {
    3736    output_stream << x.print(0);

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

    r71 r75  
    1919   sc_module_name name,
    2020#else
    21    string name        ,
     21   std::string name        ,
    2222#endif
    2323#ifdef STATISTICS
    … …  
    3737
    3838#ifdef STATISTICS
    39     statistics_declaration(param_statistics);
     39    if (_usage & USE_STATISTICS)
     40      statistics_declaration(param_statistics);
    4041#endif
    4142
    … …  
    102103#ifdef STATISTICS
    103104    if (_usage & USE_STATISTICS)
    104       {
    105         delete _stat;
    106       }
     105      delete _stat;
    107106#endif
    108107

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_allocation.cpp

    r62 r75  
    124124    for (uint32_t i=0; i<_param->_nb_word; i++)
    125125      {
    126         string rename = "reg_DATA["  + toString(i) + "]";
     126        std::string rename = "reg_DATA["  + toString(i) + "]";
    127127        reg_DATA [i]  = new SC_REGISTER (Tdata_t) (rename.c_str());
    128128      }

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_end_cycle.cpp

    r71 r75  
     1#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    12/*
    23 * $Id$
    … …  
    3738}; // end namespace behavioural         
    3839}; // end namespace morpheo             
     40#endif

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_statistics_declaration.cpp

    r71 r75  
    1717  void RegisterFile_Monolithic::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics)
    1818  {
    19     _stat = new Stat (static_cast<string>(_name),
     19    _stat = new Stat (static_cast<std::string>(_name),
    2020                      "RegisterFile_Monolithic",
    2121                      param_statistics);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_transition.cpp

    r71 r75  
    7979#endif   
    8080
     81#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    8182    end_cycle();
    82 
     83#endif
    8384    log_printf(FUNC,RegisterFile,"transition","End");
    8485  };

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic_vhdl_body.cpp

    r62 r75  
    3838    for (uint32_t i = 0; i < _param->_nb_port_read; i++)
    3939      {
    40         string str_address;
     40        std::string str_address;
    4141        if (_param->_have_port_address)
    4242          str_address = "conv_integer(in_READ_"+toString(i)+"_ADDRESS)";
    … …  
    4848    for (uint32_t i = 0; i < _param->_nb_port_read_write; i++)
    4949      {
    50         string str_address;
     50        std::string str_address;
    5151        if (_param->_have_port_address)
    5252          str_address = "conv_integer(in_READ_WRITE_"+toString(i)+"_ADDRESS)";
    … …  
    6868    for (uint32_t i = 0; i < _param->_nb_port_write; i++)
    6969      {
    70         string str_address;
     70        std::string str_address;
    7171        if (_param->_have_port_address)
    7272          str_address = "conv_integer(in_WRITE_"+toString(i)+"_ADDRESS)";
    … …  
    8080    for (uint32_t i = 0; i < _param->_nb_port_read_write; i++)
    8181      {
    82         string str_address;
     82        std::string str_address;
    8383        if (_param->_have_port_address)
    8484          str_address = "conv_integer(in_READ_WRITE_"+toString(i)+"_ADDRESS)";
Note: See TracChangeset for help on using the changeset viewer.