Changeset 391


Ignore:
Timestamp:
May 17, 2013, 10:29:24 AM (11 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/modules/vci_block_device_tsar/caba/source/include/vci_block_device_tsar.h

    r374 r391  
    7878#include <stdint.h>
    7979#include <systemc>
     80#include <unistd.h>
    8081#include "caba_base_module.h"
    8182#include "mapping_table.h"
  • trunk/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp

    r385 r391  
    430430         "MEMC ERROR : VCI internal data width must be 32 bits");
    431431         
    432     assert( (vci_param_ext::B == 8 ) and
    433          "MEMC ERROR : VCI external data width must be 32 or 64 bits");
     432    assert( (vci_param_ext::B == 8) and
     433         "MEMC ERROR : VCI external data width must be 64 bits");
    434434
    435435    // Check coherence between internal & external addresses
     
    72507250      p_vci_ixr.address = (addr_t)( (r_write_to_ixr_cmd_nline.read() * m_words +
    72517251                                     r_ixr_cmd_cpt.read()) * 4 );
    7252       p_vci_ixr.wdata   = (wide_data_t)(r_write_to_ixr_cmd_data[r_ixr_cmd_cpt.read()].read() |
    7253                                         r_write_to_ixr_cmd_data[r_ixr_cmd_cpt.read()+1].read());
     7252      p_vci_ixr.wdata   = ((wide_data_t)(r_write_to_ixr_cmd_data[r_ixr_cmd_cpt.read()].read()) |
     7253                          ((wide_data_t)(r_write_to_ixr_cmd_data[r_ixr_cmd_cpt.read()+1].read()) << 32));
    72547254      p_vci_ixr.trdid   = r_write_to_ixr_cmd_trdid.read();
    72557255      p_vci_ixr.eop     = (r_ixr_cmd_cpt == (m_words-2));
     
    72717271    p_vci_ixr.address   = (addr_t)( (r_xram_rsp_to_ixr_cmd_nline.read() * m_words +
    72727272                                   r_ixr_cmd_cpt.read()) * 4 );
    7273     p_vci_ixr.wdata     = (wide_data_t)(r_xram_rsp_to_ixr_cmd_data[r_ixr_cmd_cpt.read()].read() |
    7274                                         r_xram_rsp_to_ixr_cmd_data[r_ixr_cmd_cpt.read()+1].read());
     7273    p_vci_ixr.wdata     = ((wide_data_t)(r_xram_rsp_to_ixr_cmd_data[r_ixr_cmd_cpt.read()].read()) |
     7274                          ((wide_data_t)(r_xram_rsp_to_ixr_cmd_data[r_ixr_cmd_cpt.read()+1].read()) << 32));
    72757275    p_vci_ixr.trdid     = r_xram_rsp_to_ixr_cmd_trdid.read();
    72767276    p_vci_ixr.eop       = (r_ixr_cmd_cpt == (m_words-2));
Note: See TracChangeset for help on using the changeset viewer.