Changeset 391 for trunk/modules

Timestamp:

May 17, 2013, 10:29:24 AM (12 years ago)

Author:

lambert

Message:

Bug fix in Vci_mem_cache :

• When line evicion in write fsm to IXR_CMD, second word should be shifted for 64 bits support
• Fixing assert message for vci_param_ext, only support for cell_size = 8

Adding include in Vci_block_device_tsar to fix compiling problem

Location:

trunk/modules

Files:

• vci_block_device_tsar/caba/source/include/vci_block_device_tsar.h (modified) (1 diff)
• vci_mem_cache/caba/source/src/vci_mem_cache.cpp (modified) (3 diffs)

trunk/modules/vci_block_device_tsar/caba/source/include/vci_block_device_tsar.h

@@ -78 +78 @@
 #include <stdint.h>
 #include <systemc>
+#include <unistd.h>
 #include "caba_base_module.h"
 #include "mapping_table.h"

trunk/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

@@ -430 +430 @@
          "MEMC ERROR : VCI internal data width must be 32 bits");
           
-    assert( (vci_param_ext::B == 8 ) and
-         "MEMC ERROR : VCI external data width must be 32 or 64 bits");
+    assert( (vci_param_ext::B == 8) and
+         "MEMC ERROR : VCI external data width must be 64 bits");
 
     // Check coherence between internal & external addresses
@@ -7250 +7250 @@
       p_vci_ixr.address = (addr_t)( (r_write_to_ixr_cmd_nline.read() * m_words +
                                      r_ixr_cmd_cpt.read()) * 4 );
-      p_vci_ixr.wdata   = (wide_data_t)(r_write_to_ixr_cmd_data[r_ixr_cmd_cpt.read()].read() |
-                                        r_write_to_ixr_cmd_data[r_ixr_cmd_cpt.read()+1].read());
+      p_vci_ixr.wdata   = ((wide_data_t)(r_write_to_ixr_cmd_data[r_ixr_cmd_cpt.read()].read()) |
+                          ((wide_data_t)(r_write_to_ixr_cmd_data[r_ixr_cmd_cpt.read()+1].read()) << 32));
       p_vci_ixr.trdid   = r_write_to_ixr_cmd_trdid.read();
       p_vci_ixr.eop     = (r_ixr_cmd_cpt == (m_words-2));
@@ -7271 +7271 @@
     p_vci_ixr.address   = (addr_t)( (r_xram_rsp_to_ixr_cmd_nline.read() * m_words +
                                    r_ixr_cmd_cpt.read()) * 4 );
-    p_vci_ixr.wdata     = (wide_data_t)(r_xram_rsp_to_ixr_cmd_data[r_ixr_cmd_cpt.read()].read() |
-                                        r_xram_rsp_to_ixr_cmd_data[r_ixr_cmd_cpt.read()+1].read());
+    p_vci_ixr.wdata     = ((wide_data_t)(r_xram_rsp_to_ixr_cmd_data[r_ixr_cmd_cpt.read()].read()) |
+                          ((wide_data_t)(r_xram_rsp_to_ixr_cmd_data[r_ixr_cmd_cpt.read()+1].read()) << 32));
     p_vci_ixr.trdid     = r_xram_rsp_to_ixr_cmd_trdid.read();
     p_vci_ixr.eop       = (r_ixr_cmd_cpt == (m_words-2));