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/Select/Select_Priority_Fixed
Files:
6 deleted
7 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h

    r44 r75  
    3434  public : ~Parameters () ;
    3535
    36   public : string msg_error (void);
    37 
    38   public :        string   print      (uint32_t depth);
    39   public : friend ostream& operator<< (ostream& output_stream,
    40                                        morpheo::behavioural::generic::select::select_priority_fixed::Parameters & x);
     36  public :        std::string   msg_error  (void);
     37  public :        std::string   print      (uint32_t depth);
     38  public : friend std::ostream& operator<< (std::ostream& output_stream,
     39                                            morpheo::behavioural::generic::select::select_priority_fixed::Parameters & x);
    4140  };
    4241

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h

    r57 r75  
    2020#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Types.h"
    2121#ifdef STATISTICS
    22 #include "Behavioural/Generic/Select/Select_Priority_Fixed/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 {
    … …  
    4442    // -----[ fields ]----------------------------------------------------
    4543    // Parameters
    46   protected : const string     _name;
     44  protected : const std::string     _name;
    4745  protected : const Parameters * _param;
    4846  private   : const Tusage_t     _usage;
    … …  
    5250
    5351#ifdef STATISTICS
    54   private   : Statistics                     * _stat;
     52  public    : Stat                           * _stat;
    5553#endif
    5654
    … …  
    8785   sc_module_name                              name,
    8886#else                                         
    89    string                                      name,
     87   std::string                                 name,
    9088#endif                                         
    9189#ifdef STATISTICS
    … …  
    10199  private : void     deallocation              (void);
    102100                                               
    103 #if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     101# if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    104102  public  : void     transition                (void);
    105 #endif
     103# endif
    106104  public  : void     genMealy_entity           (void);
    107105#endif                                         
    108 #ifdef STATISTICS
    109   public  : string   statistics                (uint32_t depth);
    110 #endif
    111106                                               
    112107#if VHDL                                       
    … …  
    116111#endif                                         
    117112                                               
    118 #ifdef VHDL_TESTBENCH                         
    119   private : void     vhdl_testbench_transition (void);
     113#ifdef STATISTICS
     114  public  : void        statistics_declaration    (morpheo::behavioural::Parameters_Statistics * param_statistics);
     115#endif
     116#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     117  private : void        end_cycle                 (void);
    120118#endif
    121119  };

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Parameters_msg_error.cpp

    r40 r75  
    99#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Types.h"
    1010#include <sstream>
    11 using namespace std;
    1211
    1312namespace morpheo                    {
    … …  
    1817
    1918
    20   string Parameters::msg_error(void)
     19  std::string Parameters::msg_error(void)
    2120  {
    2221    log_printf(FUNC,Select_Priority_Fixed,"msg_error","Begin");
    2322
    24     string msg = "";
     23    std::string msg = "";
    2524
    2625    if ((_encoding_one_hot or _encoding_compact) == false)

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Parameters_print.cpp

    r15 r75  
    88#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h"
    99#include "Behavioural/include/XML.h"
    10 using namespace std;
    1110
    1211namespace morpheo                    {
    … …  
    1615namespace select_priority_fixed {
    1716
    18   string Parameters::print (uint32_t depth)
     17  std::string Parameters::print (uint32_t depth)
    1918  {
    2019    log_printf(FUNC,Select_Priority_Fixed,"print","Begin");
    … …  
    3332  };
    3433
    35   ostream& operator<< (ostream& output_stream ,
    36                        morpheo::behavioural::generic::select::select_priority_fixed::Parameters & x)
     34  std::ostream& operator<< (std::ostream& output_stream ,
     35                            morpheo::behavioural::generic::select::select_priority_fixed::Parameters & x)
    3736  {
    3837    output_stream << x.print(0);

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed.cpp

    r68 r75  
    3030    _param            (param),
    3131    _usage            (usage)
    32 // #ifdef STATISTICS
    33 //                            ,_param_statistics (param_statistics)
    34 // #endif
    3532  {
    3633    log_printf(FUNC,Select_Priority_Fixed,"Select_Priority_Fixed","Begin");
    … …  
    4441        log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Allocation of statistics");
    4542       
    46         // Allocation of statistics
    47         _stat = new Statistics (static_cast<string>(_name),
    48                                 param_statistics          ,
    49                                 param);
     43        statistics_declaration(param_statistics);
    5044      }
    5145#endif
    … …  
    106100        log_printf(INFO,Select_Priority_Fixed,"~Select_Priority_Fixed","Generate Statistics file");
    107101       
    108         _stat->generate_file(statistics(0));
    109102        delete _stat;
    110103      }

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_end_cycle.cpp

    r59 r75  
    1 #ifdef VHDL_TESTBENCH
     1#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    22/*
    33 * $Id$
    … …  
    1515namespace select_priority_fixed {
    1616
     17#undef  FUNCTION
     18#define FUNCTION "Select_Priority_Fixed::end_cycle"
     19void Select_Priority_Fixed::end_cycle ()
     20  {
     21    log_printf(FUNC,Select_Priority_Fixed,FUNCTION,"Begin");
    1722
    18   void Select_Priority_Fixed::vhdl_testbench_transition ()
    19   {
    20     log_printf(FUNC,Select_Priority_Fixed,"vhdl_testbench_transition","Begin");
     23#ifdef STATISTICS
     24    _stat->end_cycle();
     25#endif   
    2126
     27#ifdef VHDL_TESTBENCH
    2228    // Evaluation before read the ouput signal
    23 //     sc_start(0);
     29//  sc_start(0);
     30    _interfaces->testbench();
     31#endif
    2432
    25     _interfaces->testbench();
    26 
    27     log_printf(FUNC,Select_Priority_Fixed,"vhdl_testbench_transition","End");
     33    log_printf(FUNC,Select_Priority_Fixed,FUNCTION,"End");
    2834  };
    2935

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_statistics_declaration.cpp

    r59 r75  
    1515namespace select_priority_fixed {
    1616
     17#undef  FUNCTION
     18#define FUNCTION "Select_Priority_Fixed::statistics_declaration"
     19  void Select_Priority_Fixed::statistics_declaration (morpheo::behavioural::Parameters_Statistics * param_statistics)
     20  {
     21    log_printf(FUNC,Select_Priority_Fixed,FUNCTION,"Begin");
    1722
    18   string Select_Priority_Fixed::statistics (uint32_t depth)
    19   {
    20     log_printf(FUNC,Select_Priority_Fixed,"statistics","Begin");
    21 
    22     string txt = _stat->print(depth);
     23    _stat = new Stat (static_cast<std::string>(_name),
     24                      "Select_Priority_Fixed",
     25                      param_statistics);
    2326   
    24     log_printf(FUNC,Select_Priority_Fixed,"statistics","End");
    25 
    26     return txt;
     27    log_printf(FUNC,Select_Priority_Fixed,FUNCTION,"End");
    2728  };
    2829

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_transition.cpp

    r15 r75  
    2121    log_printf(FUNC,Select_Priority_Fixed,"transition","Begin");
    2222
    23 #ifdef STATISTICS
    24     _stat->add();
    25 #endif   
    26 
    27 #ifdef VHDL_TESTBENCH
    28     vhdl_testbench_transition ();
     23#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
     24    end_cycle();
    2925#endif
    3026

  • trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed/src/Select_Priority_Fixed_vhdl_body.cpp

    r59 r75  
    3838    if (_param->_encoding_compact)
    3939      {
    40         string range = ((_param->_size_entity-1)==0)?"(0)":std_logic_range(_param->_size_entity-1,0);
     40        std::string range = ((_param->_size_entity-1)==0)?"(0)":std_logic_range(_param->_size_entity-1,0);
    4141
    4242        vhdl->set_body ("out_ENTITY     <=     internal_entity"+range+";");
Note: See TracChangeset for help on using the changeset viewer.