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/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue
Files:
6 deleted
7 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Parameters.h

    r60 r75  
    5050  public : ~Parameters () ;
    5151
    52   public : string msg_error (void);
     52  public :        std::string   msg_error (void);
    5353
    54   public :        string   print      (uint32_t depth);
    55   public : friend ostream& operator<< (ostream& output_stream,
    56                                        morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::register_unit_glue::Parameters & x);
     54  public :        std::string   print      (uint32_t depth);
     55  public : friend std::ostream& operator<< (std::ostream& output_stream,
     56                                            morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::register_unit_glue::Parameters & x);
    5757  };
    5858

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Register_unit_Glue.h

    r61 r75  
    2020#include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Parameters.h"
    2121#ifdef STATISTICS
    22 #include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Statistics.h"
     22#include "Behavioural/include/Stat.h"
    2323#endif
    2424#include "Behavioural/include/Component.h"
    … …  
    2727#endif
    2828#include "Behavioural/include/Usage.h"
    29 
    30 using namespace std;
    3129
    3230namespace morpheo {
    … …  
    4745    // -----[ fields ]----------------------------------------------------
    4846    // Parameters
    49   protected : const string       _name;
     47  protected : const std::string       _name;
    5048  protected : const Parameters * _param;
    5149  private   : const Tusage_t     _usage;
    5250
    53 //#ifdef STATISTICS
    54 //  protected : const morpheo::behavioural::Parameters_Statistics * _param_statistics;
    55 //#endif
    56 
    57 #ifdef STATISTICS
    58   private   : Statistics                     * _stat;
     51#ifdef STATISTICS
     52  public    : Stat                           * _stat;
    5953#endif
    6054
    … …  
    169163   sc_module_name                                name,
    170164#else                                         
    171    string                                        name,
     165   std::string                                        name,
    172166#endif                                         
    173167#ifdef STATISTICS
    … …  
    183177                                               
    184178#ifdef SYSTEMC                                 
    185 //#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    186179  public  : void     transition                      (void);
    187180  public  : void     genMealy_gpr_read               (void);
    … …  
    199192  public  : void     genMealy_insert                 (void);
    200193  public  : void     genMealy_retire                 (void);
    201 
    202 //#endif
    203194#endif                                         
    204 #ifdef STATISTICS
    205   public  : string   statistics                (uint32_t depth);
     195
     196#ifdef STATISTICS
     197  public  : void     statistics_declaration    (morpheo::behavioural::Parameters_Statistics * param_statistics);
    206198#endif
    207199                                               
    … …  
    212204#endif                                         
    213205                                               
    214 #ifdef VHDL_TESTBENCH                         
    215   private : void     vhdl_testbench_transition (void);
     206#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     207  private : void     end_cycle                (void);
    216208#endif
    217209  };

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Parameters_msg_error.cpp

    r60 r75  
    99#include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Parameters.h"
    1010#include <sstream>
    11 using namespace std;
    1211
    1312namespace morpheo                    {
    … …  
    2221#undef  FUNCTION
    2322#define FUNCTION "Register_unit_Glue::msg_error"
    24   string Parameters::msg_error(void)
     23  std::string Parameters::msg_error(void)
    2524  {
    2625    log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin");
    2726
    28     string msg = "";
     27    std::string msg = "";
    2928
    3029    return msg;

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Parameters_print.cpp

    r60 r75  
    88#include "Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/include/Parameters.h"
    99#include "Behavioural/include/XML.h"
    10 using namespace std;
    1110
    1211namespace morpheo                    {
    … …  
    2120#undef  FUNCTION
    2221#define FUNCTION "Register_unit_Glue::print"
    23   string Parameters::print (uint32_t depth)
     22  std::string Parameters::print (uint32_t depth)
    2423  {
    2524    log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin");
    … …  
    5655#undef  FUNCTION
    5756#define FUNCTION "Register_unit_Glue::operator<<"
    58   ostream& operator<< (ostream& output_stream ,
    59                        morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::register_unit_glue::Parameters & x)
     57  std::ostream& operator<< (std::ostream& output_stream ,
     58                            morpheo::behavioural::core::multi_execute_loop::execute_loop::register_unit::register_unit_glue::Parameters & x)
    6059  {
    6160    log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin");

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue.cpp

    r61 r75  
    2424   sc_module_name name,
    2525#else
    26    string name,
     26   std::string name,
    2727#endif
    2828#ifdef STATISTICS
    … …  
    3535    ,_param            (param)
    3636    ,_usage            (usage)
    37 // #ifdef STATISTICS
    38 //                            ,_param_statistics (param_statistics)
    39 // #endif
    4037  {
    4138    log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin");
    … …  
    4845
    4946    // Allocation of statistics
    50     _stat = new Statistics (static_cast<string>(_name),
    51                             param_statistics          ,
    52                             param);
     47    statistics_declaration(param_statistics);
    5348#endif
    5449
    … …  
    549544    log_printf(INFO,Register_unit_Glue,FUNCTION,"Generate Statistics file");
    550545
    551     _stat->generate_file(statistics(0));
    552546    delete _stat;
    553547#endif

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue_allocation.cpp

    r60 r75  
    2222  void Register_unit_Glue::allocation (void)
    2323  {
    24     string rename;
    25 
    2624    log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin");
    2725

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue_end_cycle.cpp

    r60 r75  
    1 #ifdef VHDL_TESTBENCH
     1#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    22/*
    33 * $Id$
    … …  
    1717namespace register_unit_glue {
    1818
    19 
    2019#undef  FUNCTION
    21 #define FUNCTION "Register_unit_Glue::vhdl_testbench_transition"
    22   void Register_unit_Glue::vhdl_testbench_transition ()
     20#define FUNCTION "Register_unit_Glue::end_cycle"
     21void Register_unit_Glue::end_cycle ()
    2322  {
    2423    log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin");
    2524
     25#ifdef STATISTICS
     26    _stat->end_cycle();
     27#endif   
     28
     29#ifdef VHDL_TESTBENCH
    2630    // Evaluation before read the ouput signal
    27 //     sc_start(0);
    28 
     31//  sc_start(0);
    2932    _interfaces->testbench();
     33#endif
    3034
    3135    log_printf(FUNC,Register_unit_Glue,FUNCTION,"End");

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue_statistics_declaration.cpp

    r60 r75  
    1717namespace register_unit_glue {
    1818
    19 
    2019#undef  FUNCTION
    21 #define FUNCTION "Register_unit_Glue::statistics"
    22   string Register_unit_Glue::statistics (uint32_t depth)
     20#define FUNCTION "Register_unit_Glue::statistics_declaration"
     21  void Register_unit_Glue::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics)
    2322  {
    2423    log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin");
    2524
    26     string txt = _stat->print(depth);
     25    _stat = new Stat (static_cast<std::string>(_name),
     26                      "Register_unit_Glue",
     27                      param_statistics);
    2728   
    2829    log_printf(FUNC,Register_unit_Glue,FUNCTION,"End");
    29 
    30     return txt;
    3130  };
    3231

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Register_unit/Register_unit_Glue/src/Register_unit_Glue_transition.cpp

    r60 r75  
    11#ifdef SYSTEMC
    2 //#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    32/*
    43 * $Id$
    … …  
    2524    log_printf(FUNC,Register_unit_Glue,FUNCTION,"Begin");
    2625
    27 #ifdef STATISTICS
    28     _stat->add();
    29 #endif   
    30 
    31 #ifdef VHDL_TESTBENCH
    32     vhdl_testbench_transition ();
     26#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     27    end_cycle();
    3328#endif
    3429
    … …  
    4540}; // end namespace morpheo             
    4641#endif
    47 //#endif
Note: See TracChangeset for help on using the changeset viewer.