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/Select/Select_Priority_Fixed/src
Files:
19 edited

Legend:

Unmodified
Added
Removed

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

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/Select/Priority_Fixed/include/Parameters.h"
     8#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h"
    99
    1010namespace morpheo {
    … …  
    1212namespace generic {
    1313namespace select {
    14 namespace priority_fixed {
     14namespace select_priority_fixed {
    1515
    1616
    … …  
    2323    _size_entity (static_cast<uint32_t> (ceil(log2(nb_entity))))
    2424  {
    25     log_printf(FUNC,Priority_Fixed,"Parameters","Begin");
     25    log_printf(FUNC,Select_Priority_Fixed,"Parameters","Begin");
    2626    test();
    27     log_printf(FUNC,Priority_Fixed,"Parameters","End");
     27    log_printf(FUNC,Select_Priority_Fixed,"Parameters","End");
    2828  };
    2929 
    … …  
    3434    _size_entity      (param._size_entity     )
    3535  {
    36     log_printf(FUNC,Priority_Fixed,"Parameters","Begin");
     36    log_printf(FUNC,Select_Priority_Fixed,"Parameters","Begin");
    3737    test();
    38     log_printf(FUNC,Priority_Fixed,"Parameters","End");
     38    log_printf(FUNC,Select_Priority_Fixed,"Parameters","End");
    3939  };
    4040
    4141  Parameters::~Parameters ()
    4242  {
    43     log_printf(FUNC,Priority_Fixed,"~Parameters","Begin");
    44     log_printf(FUNC,Priority_Fixed,"~Parameters","End");
     43    log_printf(FUNC,Select_Priority_Fixed,"~Parameters","Begin");
     44    log_printf(FUNC,Select_Priority_Fixed,"~Parameters","End");
    4545  };
    4646
    47 }; // end namespace priority_fixed
     47}; // end namespace select_priority_fixed
    4848}; // end namespace select
    4949}; // end namespace generic

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

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/Select/Priority_Fixed/include/Parameters.h"
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Types.h"
     8#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Types.h"
    1010#include <sstream>
    1111using namespace std;
    … …  
    1515namespace generic {
    1616namespace select {
    17 namespace priority_fixed {
     17namespace select_priority_fixed {
    1818
    1919
    2020  string Parameters::msg_error(void)
    2121  {
    22     log_printf(FUNC,Priority_Fixed,"msg_error","Begin");
     22    log_printf(FUNC,Select_Priority_Fixed,"msg_error","Begin");
    2323
    2424    string msg = "";
    … …  
    3333    return msg;
    3434
    35     log_printf(FUNC,Priority_Fixed,"msg_error","End");
     35    log_printf(FUNC,Select_Priority_Fixed,"msg_error","End");
    3636  };
    3737
    38 }; // end namespace priority_fixed
     38}; // end namespace select_priority_fixed
    3939}; // end namespace select
    4040}; // end namespace generic

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

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/Select/Priority_Fixed/include/Parameters.h"
     8#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h"
    99#include "Behavioural/include/XML.h"
    1010using namespace std;
    … …  
    1414namespace generic {
    1515namespace select {
    16 namespace priority_fixed {
     16namespace select_priority_fixed {
    1717
    1818  string Parameters::print (uint32_t depth)
    1919  {
    20     log_printf(FUNC,Priority_Fixed,"print","Begin");
     20    log_printf(FUNC,Select_Priority_Fixed,"print","Begin");
    2121
    22     XML xml ("priority_fixed");
     22    XML xml ("select_priority_fixed");
    2323
    24     xml.balise_open("priority_fixed");
     24    xml.balise_open("select_priority_fixed");
    2525    xml.singleton_begin("nb_entity       "); xml.attribut("value",toString(_nb_entity       )); xml.singleton_end();
    2626    xml.singleton_begin("encoding_one_hot"); xml.attribut("value",toString(_encoding_one_hot)); xml.singleton_end();
    … …  
    2828    xml.balise_close();
    2929
    30     log_printf(FUNC,Priority_Fixed,"print","End");
     30    log_printf(FUNC,Select_Priority_Fixed,"print","End");
    3131   
    3232    return xml.get_body(depth);
    … …  
    3434
    3535  ostream& operator<< (ostream& output_stream ,
    36                        morpheo::behavioural::generic::select::priority_fixed::Parameters & x)
     36                       morpheo::behavioural::generic::select::select_priority_fixed::Parameters & x)
    3737  {
    3838    output_stream << x.print(0);
    … …  
    4141  };
    4242
    43 }; // end namespace priority_fixed
     43}; // end namespace select_priority_fixed
    4444}; // end namespace select
    4545}; // end namespace generic

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

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     8#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    99
    1010namespace morpheo                    {
    … …  
    1212namespace generic {
    1313namespace select {
    14 namespace priority_fixed {
     14namespace select_priority_fixed {
    1515
    1616
    1717#ifdef SYSTEMC
    18   Priority_Fixed::Priority_Fixed (sc_module_name name,
     18  Select_Priority_Fixed::Select_Priority_Fixed (sc_module_name name,
    1919#else
    20   Priority_Fixed::Priority_Fixed (string name,
     20  Select_Priority_Fixed::Select_Priority_Fixed (string name,
    2121#endif
    2222#ifdef STATISTICS
    2323                              morpheo::behavioural::Parameters_Statistics             param_statistics,
    2424#endif
    25                               morpheo::behavioural::generic::select::priority_fixed::Parameters param ):
     25                              morpheo::behavioural::generic::select::select_priority_fixed::Parameters param ):
    2626                              _name              (name)
    2727                              ,_param            (param)
    … …  
    3030// #endif
    3131  {
    32     log_printf(FUNC,Priority_Fixed,"Priority_Fixed","Begin");
     32    log_printf(FUNC,Select_Priority_Fixed,"Select_Priority_Fixed","Begin");
    3333
    3434#ifdef STATISTICS
    35     log_printf(INFO,Priority_Fixed,"Priority_Fixed","Allocation of statistics");
     35    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Allocation of statistics");
    3636
    3737    // Allocation of statistics
    … …  
    4242
    4343#ifdef VHDL_TESTBENCH
    44     log_printf(INFO,Priority_Fixed,"Priority_Fixed","Creation of a testbench");
     44    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Creation of a testbench");
    4545
    4646    // Creation of a testbench
    … …  
    5353#ifdef VHDL
    5454    // generate the vhdl
    55     log_printf(INFO,Priority_Fixed,"Priority_Fixed","Generate the vhdl");
     55    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Generate the vhdl");
    5656
    5757    vhdl();
    … …  
    5959
    6060#ifdef VHDL_TESTBENCH
    61     _vhdl_testbench->set_clock    ("in_CLOCK",false);
     61    _vhdl_testbench->set_clock    ("in_CLOCK",true);
    6262#endif
    6363
    6464#ifdef SYSTEMC
    65     log_printf(INFO,Priority_Fixed,"Priority_Fixed","Allocation");
     65    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Allocation");
    6666
    6767    allocation ();
    6868
    6969#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    70     log_printf(INFO,Priority_Fixed,"Priority_Fixed","Method - transition");
     70    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Method - transition");
    7171
    7272    SC_METHOD (transition);
    … …  
    7575#endif
    7676
    77     log_printf(INFO,Priority_Fixed,"Priority_Fixed","Method - genMealy_entity");
     77    log_printf(INFO,Select_Priority_Fixed,"Select_Priority_Fixed","Method - genMealy_entity");
    7878
    7979    SC_METHOD (genMealy_entity);
    … …  
    100100
    101101#endif
    102     log_printf(FUNC,Priority_Fixed,"Priority_Fixed","End");
     102    log_printf(FUNC,Select_Priority_Fixed,"Select_Priority_Fixed","End");
    103103  };
    104104 
    105   Priority_Fixed::~Priority_Fixed (void)
     105  Select_Priority_Fixed::~Select_Priority_Fixed (void)
    106106  {
    107     log_printf(FUNC,Priority_Fixed,"~Priority_Fixed","Begin");
     107    log_printf(FUNC,Select_Priority_Fixed,"~Select_Priority_Fixed","Begin");
    108108
    109109#ifdef VHDL_TESTBENCH
    110     log_printf(INFO,Priority_Fixed,"~Priority_Fixed","Generate Testbench  file");
     110    log_printf(INFO,Select_Priority_Fixed,"~Select_Priority_Fixed","Generate Testbench  file");
    111111
    112112    // generate the test bench
    … …  
    116116
    117117#ifdef STATISTICS
    118     log_printf(INFO,Priority_Fixed,"~Priority_Fixed","Generate Statistics file");
     118    log_printf(INFO,Select_Priority_Fixed,"~Select_Priority_Fixed","Generate Statistics file");
    119119
    120120    _stat->generate_file(statistics(0));
    … …  
    124124
    125125#ifdef SYSTEMC
    126     log_printf(INFO,Priority_Fixed,"~Priority_Fixed","Deallocation");
     126    log_printf(INFO,Select_Priority_Fixed,"~Select_Priority_Fixed","Deallocation");
    127127
    128128    deallocation ();
    129129#endif
    130130
    131     log_printf(FUNC,Priority_Fixed,"~Priority_Fixed","End");
     131    log_printf(FUNC,Select_Priority_Fixed,"~Select_Priority_Fixed","End");
    132132  };
    133133
    134 }; // end namespace priority_fixed
     134}; // end namespace select_priority_fixed
    135135}; // end namespace select
    136136}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1010
    1111namespace morpheo                    {
    … …  
    1313namespace generic {
    1414namespace select {
    15 namespace priority_fixed {
     15namespace select_priority_fixed {
    1616
    1717
    18   void Priority_Fixed::allocation (void)
     18  void Select_Priority_Fixed::allocation (void)
    1919  {
    2020    string rename;
    2121
    22     log_printf(FUNC,Priority_Fixed,"allocation","Begin");
     22    log_printf(FUNC,Select_Priority_Fixed,"allocation","Begin");
    2323
    24 #if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    25      in_CLOCK        = new SC_CLOCK           ("in_CLOCK");
    26 #endif
    27    
     24     in_CLOCK        = new SC_CLOCK           ("in_CLOCK ");
     25     in_NRESET       = new SC_IN (Tcontrol_t) ("in_NRESET");
     26
    2827     in_VAL          = new SC_IN (Tcontrol_t)           * [_param._nb_entity];
    2928    if (_param._encoding_one_hot)
    … …  
    4948    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    5049
    51     log_printf(FUNC,Priority_Fixed,"allocation","End");
     50    log_printf(FUNC,Select_Priority_Fixed,"allocation","End");
    5251  };
    5352
    54 }; // end namespace priority_fixed
     53}; // end namespace select_priority_fixed
    5554}; // end namespace select
    5655}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1010
    1111namespace morpheo                    {
    … …  
    1313namespace generic {
    1414namespace select {
    15 namespace priority_fixed {
     15namespace select_priority_fixed {
    1616
    1717
    18   void Priority_Fixed::deallocation (void)
     18  void Select_Priority_Fixed::deallocation (void)
    1919  {
    20     log_printf(FUNC,Priority_Fixed,"deallocation","Begin");
     20    log_printf(FUNC,Select_Priority_Fixed,"deallocation","Begin");
    2121
    22 //#if defined(STATISTICS) or defined(VHDL_TESTBENCH)
    2322    delete in_CLOCK;
    24 //#endif
     23    delete in_NRESET;
    2524
    2625    for (uint32_t i=0; i<_param._nb_entity; i++)
    … …  
    4140    // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~   
    4241
    43     log_printf(FUNC,Priority_Fixed,"deallocation","End");
     42    log_printf(FUNC,Select_Priority_Fixed,"deallocation","End");
    4443  };
    4544
    46 }; // end namespace priority_fixed
     45}; // end namespace select_priority_fixed
    4746}; // end namespace select
    4847}; // end namespace generic

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

    r10 r15  
    88 */
    99
    10 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     10#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1111
    1212namespace morpheo                    {
    … …  
    1414namespace generic {
    1515namespace select {
    16 namespace priority_fixed {
     16namespace select_priority_fixed {
    1717
    1818
    19   void Priority_Fixed::genMealy_entity (void)
     19  void Select_Priority_Fixed::genMealy_entity (void)
    2020  {
    21     log_printf(FUNC,Priority_Fixed,"genMealy_entity","Begin");
     21    log_printf(FUNC,Select_Priority_Fixed,"genMealy_entity","Begin");
    2222
    2323    // init
    … …  
    3131      ack [i] = 0;
    3232
    33     log_printf(TRACE,Priority_Fixed,"genMealy_entity","Scearch...");
     33    log_printf(TRACE,Select_Priority_Fixed,"genMealy_entity","Scearch...");
    3434    for (entity=0; entity<_param._nb_entity; entity++)
    3535      {
    3636        if (PORT_READ(in_VAL [entity]) == 1)
    3737          {
    38             log_printf(TRACE,Priority_Fixed,"genMealy_entity","Find! entity %d",entity);
     38            log_printf(TRACE,Select_Priority_Fixed,"genMealy_entity","Find! entity %d",entity);
    3939            if (_param._encoding_one_hot)
    4040              ack [entity] = 1;
    … …  
    5454        PORT_WRITE(out_ENTITY_ACK,  find                );
    5555      }
    56     log_printf(FUNC,Priority_Fixed,"genMealy_entity","End");
     56    log_printf(FUNC,Select_Priority_Fixed,"genMealy_entity","End");
    5757  };
    5858
    59 }; // end namespace priority_fixed
     59}; // end namespace select_priority_fixed
    6060}; // end namespace select
    6161}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1010
    1111namespace morpheo {
    … …  
    1313namespace generic {
    1414namespace select {
    15 namespace priority_fixed {
     15namespace select_priority_fixed {
    1616
    1717
    18   string Priority_Fixed::statistics (uint32_t depth)
     18  string Select_Priority_Fixed::statistics (uint32_t depth)
    1919  {
    20     log_printf(FUNC,Priority_Fixed,"statistics","Begin");
     20    log_printf(FUNC,Select_Priority_Fixed,"statistics","Begin");
    2121
    2222    string txt = _stat->print(depth);
    2323   
    24     log_printf(FUNC,Priority_Fixed,"statistics","End");
     24    log_printf(FUNC,Select_Priority_Fixed,"statistics","End");
    2525
    2626    return txt;
    2727  };
    2828
    29 }; // end namespace priority_fixed
     29}; // end namespace select_priority_fixed
    3030}; // end namespace select
    3131}; // end namespace generic

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

    r10 r15  
    88 */
    99
    10 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     10#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1111
    1212namespace morpheo                    {
    … …  
    1414namespace generic {
    1515namespace select {
    16 namespace priority_fixed {
     16namespace select_priority_fixed {
    1717
    1818
    19   void Priority_Fixed::transition (void)
     19  void Select_Priority_Fixed::transition (void)
    2020  {
    21     log_printf(FUNC,Priority_Fixed,"transition","Begin");
     21    log_printf(FUNC,Select_Priority_Fixed,"transition","Begin");
    2222
    2323#ifdef STATISTICS
    … …  
    2929#endif
    3030
    31     log_printf(FUNC,Priority_Fixed,"transition","End");
     31    log_printf(FUNC,Select_Priority_Fixed,"transition","End");
    3232  };
    3333
    34 }; // end namespace priority_fixed
     34}; // end namespace select_priority_fixed
    3535}; // end namespace select
    3636}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1010#include "Behavioural/include/Vhdl.h"
    1111
    … …  
    1414namespace generic {
    1515namespace select {
    16 namespace priority_fixed {
     16namespace select_priority_fixed {
    1717
    1818
    19   void Priority_Fixed::vhdl (void)
     19  void Select_Priority_Fixed::vhdl (void)
    2020  {
    21     log_printf(FUNC,Priority_Fixed,"vhdl","Begin");
     21    log_printf(FUNC,Select_Priority_Fixed,"vhdl","Begin");
    2222    Vhdl vhdl (_name);
    2323
    … …  
    2929
    3030    vhdl.generate_file();
    31     log_printf(FUNC,Priority_Fixed,"vhdl","End");
     31    log_printf(FUNC,Select_Priority_Fixed,"vhdl","End");
    3232
    3333  };
    3434
    35 }; // end namespace priority_fixed
     35}; // end namespace select_priority_fixed
    3636}; // end namespace select
    3737}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1010
    1111namespace morpheo                    {
    … …  
    1313namespace generic {
    1414namespace select {
    15 namespace priority_fixed {
     15namespace select_priority_fixed {
    1616
    1717
    18   void Priority_Fixed::vhdl_body (Vhdl & vhdl)
     18  void Select_Priority_Fixed::vhdl_body (Vhdl & vhdl)
    1919  {
    20     log_printf(FUNC,Priority_Fixed,"vhdl_body","Begin");
     20    log_printf(FUNC,Select_Priority_Fixed,"vhdl_body","Begin");
    2121    vhdl.set_body ("");
    2222
    … …  
    4242      }   
    4343   
    44     log_printf(FUNC,Priority_Fixed,"vhdl_body","End");
     44    log_printf(FUNC,Select_Priority_Fixed,"vhdl_body","End");
    4545  };
    4646
    47 }; // end namespace priority_fixed
     47}; // end namespace select_priority_fixed
    4848}; // end namespace select
    4949}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1010
    1111namespace morpheo {
    … …  
    1313namespace generic {
    1414namespace select {
    15 namespace priority_fixed {
     15namespace select_priority_fixed {
    1616
    1717
    18   void Priority_Fixed::vhdl_declaration (Vhdl & vhdl)
     18  void Select_Priority_Fixed::vhdl_declaration (Vhdl & vhdl)
    1919  {
    20     log_printf(FUNC,Priority_Fixed,"vhdl_declaration","Begin");
     20    log_printf(FUNC,Select_Priority_Fixed,"vhdl_declaration","Begin");
    2121
    2222    vhdl.set_signal("internal_entity",_param._size_entity+1);
    2323
    24     log_printf(FUNC,Priority_Fixed,"vhdl_declaration","End");
     24    log_printf(FUNC,Select_Priority_Fixed,"vhdl_declaration","End");
    2525  };
    2626
    27 }; // end namespace priority_fixed
     27}; // end namespace select_priority_fixed
    2828}; // end namespace select
    2929}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1010
    1111#ifdef VHDL_TESTBENCH
    … …  
    1919namespace generic {
    2020namespace select {
    21 namespace priority_fixed {
     21namespace select_priority_fixed {
    2222
    2323
    24   void Priority_Fixed::vhdl_port (Vhdl & vhdl)
     24  void Select_Priority_Fixed::vhdl_port (Vhdl & vhdl)
    2525  {
    26     log_printf(FUNC,Priority_Fixed,"vhdl_port","Begin");
     26    log_printf(FUNC,Select_Priority_Fixed,"vhdl_port","Begin");
    2727
     28    vhdl.set_port (" in_CLOCK ", IN, 1);
     29    VHDL_SET_PORT (" in_NRESET", IN, 1);
     30       
    2831    for (uint32_t i=0; i<_param._nb_entity; i++)
    2932      {
    … …  
    3740    VHDL_SET_PORT ("out_ENTITY_ACK",OUT,1);
    3841      }
    39     log_printf(FUNC,Priority_Fixed,"vhdl_port","End");
     42    log_printf(FUNC,Select_Priority_Fixed,"vhdl_port","End");
    4043  };
    4144
    42 }; // end namespace priority_fixed
     45}; // end namespace select_priority_fixed
    4346}; // end namespace select
    4447}; // end namespace generic

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

    r10 r15  
    66 */
    77
    8 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     8#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    99
    1010namespace morpheo                    {
    … …  
    1212namespace generic {
    1313namespace select {
    14 namespace priority_fixed {
     14namespace select_priority_fixed {
    1515
    1616
    17   void Priority_Fixed::vhdl_testbench_label (string label)
     17  void Select_Priority_Fixed::vhdl_testbench_label (string label)
    1818  {
    19     log_printf(FUNC,Priority_Fixed,"vhdl_testbench_label","Begin");
     19    log_printf(FUNC,Select_Priority_Fixed,"vhdl_testbench_label","Begin");
    2020
    2121#ifdef VHDL_TESTBENCH
    … …  
    2323#endif
    2424   
    25     log_printf(FUNC,Priority_Fixed,"vhdl_testbench_label","End");
     25    log_printf(FUNC,Select_Priority_Fixed,"vhdl_testbench_label","End");
    2626  };
    2727
    28 }; // end namespace priority_fixed
     28}; // end namespace select_priority_fixed
    2929}; // end namespace select
    3030}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Priority_Fixed.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Select_Priority_Fixed.h"
    1010
    1111namespace morpheo                    {
    … …  
    1313namespace generic {
    1414namespace select {
    15 namespace priority_fixed {
     15namespace select_priority_fixed {
    1616
    1717
    18   void Priority_Fixed::vhdl_testbench_transition ()
     18  void Select_Priority_Fixed::vhdl_testbench_transition ()
    1919  {
    20     log_printf(FUNC,Priority_Fixed,"vhdl_testbench_transition","Begin");
     20    log_printf(FUNC,Select_Priority_Fixed,"vhdl_testbench_transition","Begin");
    2121
    2222    // Evaluation before read the ouput signal
    2323    sc_start(0);
    2424
    25     // In order with file Priority_Fixed_vhdl_testbench_port.cpp
     25    // In order with file Select_Priority_Fixed_vhdl_testbench_port.cpp
    2626    // Warning : if a output depend of a subcomponent, take directly the port of subcomponent
    2727    // (because we have no control on the ordonnancer's policy)
    2828
     29    _vhdl_testbench->add_input (PORT_READ( in_NRESET));
     30   
    2931    for (uint32_t i=0; i<_param._nb_entity; i++)
    3032      {
    … …  
    4648    _vhdl_testbench->new_cycle (); // always at the end
    4749
    48     log_printf(FUNC,Priority_Fixed,"vhdl_testbench_transition","End");
     50    log_printf(FUNC,Select_Priority_Fixed,"vhdl_testbench_transition","End");
    4951  };
    5052
    51 }; // end namespace priority_fixed
     53}; // end namespace select_priority_fixed
    5254}; // end namespace select
    5355}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Statistics.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Statistics.h"
    1010
    1111namespace morpheo                    {
    … …  
    1313namespace generic {
    1414namespace select {
    15 namespace priority_fixed {
     15namespace select_priority_fixed {
    1616
    1717
    … …  
    2424    _parameters(parameters)
    2525  {
    26     log_printf(FUNC,Priority_Fixed,"Statistics","Begin");
    27     log_printf(FUNC,Priority_Fixed,"Statistics","End");
     26    log_printf(FUNC,Select_Priority_Fixed,"Statistics","Begin");
     27    log_printf(FUNC,Select_Priority_Fixed,"Statistics","End");
    2828  };
    2929 
    3030  Statistics::~Statistics ()
    3131  {
    32     log_printf(FUNC,Priority_Fixed,"~Statistics","Begin");
    33     log_printf(FUNC,Priority_Fixed,"~Statistics","End");
     32    log_printf(FUNC,Select_Priority_Fixed,"~Statistics","Begin");
     33    log_printf(FUNC,Select_Priority_Fixed,"~Statistics","End");
    3434  };
    3535
    36 }; // end namespace priority_fixed
     36}; // end namespace select_priority_fixed
    3737}; // end namespace select
    3838}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Statistics.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1616namespace generic {
    1717namespace select {
    18 namespace priority_fixed {
     18namespace select_priority_fixed {
    1919
    2020
    2121  void Statistics::add ()
    2222  {
    23     log_printf(FUNC,Priority_Fixed,"add","Begin");
    24     log_printf(FUNC,Priority_Fixed,"add","End");
     23    log_printf(FUNC,Select_Priority_Fixed,"add","Begin");
     24    log_printf(FUNC,Select_Priority_Fixed,"add","End");
    2525  };
    2626
    27 }; // end namespace priority_fixed
     27}; // end namespace select_priority_fixed
    2828}; // end namespace select
    2929}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Statistics.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1616namespace generic {
    1717namespace select {
    18 namespace priority_fixed {
     18namespace select_priority_fixed {
    1919
    2020
    2121  string Statistics::print (uint32_t depth)
    2222  {
    23     log_printf(FUNC,Priority_Fixed,"print","Begin");
     23    log_printf(FUNC,Select_Priority_Fixed,"print","Begin");
    2424
    2525    string        tab = string(depth,'\t');
    2626    ostringstream msg;
    2727
    28     msg << tab << "<priority_fixed name=\"" << _name << "\" >" << endl
     28    msg << tab << "<select_priority_fixed name=\"" << _name << "\" >" << endl
    2929        << print_body(depth+1) << endl
    30         << tab << "</priority_fixed>" << endl;
     30        << tab << "</select_priority_fixed>" << endl;
    3131   
    32     log_printf(FUNC,Priority_Fixed,"print","End");
     32    log_printf(FUNC,Select_Priority_Fixed,"print","End");
    3333
    3434    return msg.str();
    … …  
    3636
    3737  ostream& operator<< (ostream& output_stream ,
    38                        morpheo::behavioural::generic::select::priority_fixed::Statistics & x)
     38                       morpheo::behavioural::generic::select::select_priority_fixed::Statistics & x)
    3939  {
    4040    output_stream << x.print(0);
    … …  
    4343  };
    4444
    45 }; // end namespace priority_fixed
     45}; // end namespace select_priority_fixed
    4646}; // end namespace select
    4747}; // end namespace generic

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

    r10 r15  
    77 */
    88
    9 #include "Behavioural/Generic/Select/Priority_Fixed/include/Statistics.h"
     9#include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Statistics.h"
    1010
    1111#include <sstream>
    … …  
    1616namespace generic {
    1717namespace select {
    18 namespace priority_fixed {
     18namespace select_priority_fixed {
    1919
    2020
    2121  string Statistics::print_body (uint32_t depth)
    2222  {
    23     log_printf(FUNC,Priority_Fixed,"print_body","Begin");
     23    log_printf(FUNC,Select_Priority_Fixed,"print_body","Begin");
    2424
    2525    string        tab = string(depth,'\t');
    … …  
    2828    msg << tab << "";
    2929   
    30     log_printf(FUNC,Priority_Fixed,"print_body","End");
     30    log_printf(FUNC,Select_Priority_Fixed,"print_body","End");
    3131
    3232    return msg.str();
    3333  };
    3434
    35 }; // end namespace priority_fixed
     35}; // end namespace select_priority_fixed
    3636}; // end namespace select
    3737}; // end namespace generic
Note: See TracChangeset for help on using the changeset viewer.