Changeset 137 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select

Timestamp:

Feb 16, 2010, 1:35:48 PM (14 years ago)

Author:

rosiere

Message:

Various modif (add test, and vhdl)

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Select/Select_Priority_Fixed

Files:

• include/Parameters.h (modified) (1 diff)
• src/Parameters.cpp (modified) (2 diffs)
• src/Select_Priority_Fixed_vhdl_body.cpp (modified) (2 diffs)

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

@@ -22 +22 @@
   {
     //-----[ fields ]------------------------------------------------------------
-  public : const uint32_t _nb_entity       ;
-  public : const bool     _encoding_one_hot;
-  public : const bool     _encoding_compact;
-  public : const uint32_t _size_entity;
+  public : uint32_t _nb_entity       ;
+  public : bool     _encoding_one_hot;
+  public : bool     _encoding_compact;
+
+  public : uint32_t _size_entity;
 
     //-----[ methods ]-----------------------------------------------------------

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

@@ -7 +7 @@
 
 #include "Behavioural/Generic/Select/Select_Priority_Fixed/include/Parameters.h"
+#include "Common/include/Log2.h"
 
 namespace morpheo {
@@ -17 +18 @@
   Parameters::Parameters (uint32_t nb_entity       ,
                           bool     encoding_one_hot,
-                          bool     encoding_compact):
-    _nb_entity        (nb_entity       ),
-    _encoding_one_hot (encoding_one_hot),
-    _encoding_compact (encoding_compact),
-    _size_entity (static_cast<uint32_t> (ceil(log2(nb_entity))))
+                          bool     encoding_compact)
   {
     log_printf(FUNC,Select_Priority_Fixed,"Parameters","Begin");
+
+    _nb_entity        = nb_entity       ;
+    _encoding_one_hot = encoding_one_hot;
+    _encoding_compact = encoding_compact;
+    _size_entity      = log2(nb_entity);
+
     test();
     log_printf(FUNC,Select_Priority_Fixed,"Parameters","End");

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

@@ -24 +24 @@
     for (uint32_t i=0; i<_param->_nb_entity; i++)
       {
-        vhdl->set_body("\t"+std_logic_conv(_param->_size_entity+1,i)+" when in_VAL_"+toString(i)+"='1' else");
+        vhdl->set_body("\t"+std_logic_conv(_param->_size_entity+1,i)+" when in_"+toString(i)+"_VAL='1' else");
       }
     vhdl->set_body("\t"+std_logic_conv(_param->_size_entity+1,1<<_param->_size_entity)+";");
@@ -32 +32 @@
       {
         for (uint32_t i=0; i<_param->_nb_entity; i++)
-          vhdl->set_body("out_ACK_"+toString(i)+" <= '1' when internal_entity"+std_logic_range(_param->_size_entity+1)+" = "+std_logic_conv(_param->_size_entity+1,i)+" else '0';");
+          vhdl->set_body("out_"+toString(i)+"_ACK <= '1' when internal_entity"+std_logic_range(_param->_size_entity+1)+" = "+std_logic_conv(_param->_size_entity+1,i)+" else '0';");
         vhdl->set_body ("");
       }