Changeset 137 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/Parameters.cpp

Timestamp:

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

Author:

rosiere

Message:

Various modif (add test, and vhdl)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/Parameters.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/Parameters.cpp

@@ -8 +8 @@
 #include "Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/include/Parameters.h"
 #include "Common/include/BitManipulation.h"
+#include "Common/include/Log2.h"
 
 namespace morpheo {
@@ -25 +26 @@
                           Tcrossbar_t crossbar             ,
                           std::string init_value
-                          ):
-    _nb_port_read          (nb_port_read         ),
-    _nb_port_write         (nb_port_write        ),
-    _nb_word               (nb_word              ),
-    _size_word             (size_word            ),
-    _nb_bank               (nb_bank              ),
-    _nb_port_read_by_bank  (nb_port_read_by_bank ),
-    _nb_port_write_by_bank (nb_port_write_by_bank),
-    _crossbar              (crossbar             ),
-    _have_init_value       (init_value != ""     ),
-    _init_value            (init_value           ),
-    _size_address          (static_cast<uint32_t>(ceil(log2(_nb_word)))),
-    _size_address_by_bank  (_size_address - static_cast<uint32_t>(ceil(log2(_nb_bank)))),
+                          )
+  {
+    log_printf(FUNC,RegisterFile_Multi_Banked,"Parameters","Begin");
+
+    _nb_port_read           = nb_port_read         ;
+    _nb_port_write          = nb_port_write        ;
+    _nb_word                = nb_word              ;
+    _size_word              = size_word            ;
+    _nb_bank                = nb_bank              ;
+    _nb_port_read_by_bank   = nb_port_read_by_bank ;
+    _nb_port_write_by_bank  = nb_port_write_by_bank;
+    _crossbar               = crossbar             ;
+    _init_value             = init_value           ;
+
+    _size_address           = log2(_nb_word);
+    _size_address_by_bank   = _size_address - log2(_nb_bank);
 
     // Address : [....................]  [size_address-1:0]
     // Bank    : [....]                  [size_address-1:size_address-1-log2(nb_bank)]
     // num_reg :      ]...............]  [size_address-2-log2(nb_bank):0]
-    _bank_shift            (_size_address_by_bank),
-    _bank_mask             (gen_mask<Taddress_t>(static_cast<Taddress_t>(ceil(log2(_nb_bank))))),
-    _num_reg_shift         (0),
-    _num_reg_mask          (gen_mask<Taddress_t>(_size_address_by_bank)),
-    _nb_word_by_bank       (_nb_word / _nb_bank),
-    _have_port_address     (_size_address         != 0),
-    _have_bank_port_address(_size_address_by_bank != 0)
-  {
-    log_printf(FUNC,RegisterFile_Multi_Banked,"Parameters","Begin");
+    _bank_shift             = _size_address_by_bank;
+    _bank_mask              = gen_mask<Taddress_t>(log2(_nb_bank));
+    _num_reg_shift          = 0;
+    _num_reg_mask           = gen_mask<Taddress_t>(_size_address_by_bank);
+    _nb_word_by_bank        = _nb_word / _nb_bank;
+    _have_port_address      = _size_address         != 0;
+    _have_bank_port_address = _size_address_by_bank != 0;
+    _have_init_value        = init_value != ""     ;
 
     if (_crossbar == PARTIAL_CROSSBAR)