Changeset 82 for trunk/modules/vci_mem_cache_v4/caba/source

Timestamp:

Sep 2, 2010, 2:22:12 PM (14 years ago)

Author:

guthmull

Message:

Add broadcast limitation compatibility, indicate the type of response when possible

Location:

trunk/modules/vci_mem_cache_v4/caba/source

Files:

• include/vci_mem_cache_v4.h (modified) (1 diff)
• src/vci_mem_cache_v4.cpp (modified) (9 diffs)

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

@@ -354 +354 @@
       const soclib::common::AddressMaskingTable<vci_addr_t>   m_nline; 
 
+      // broadcast address
+      vci_addr_t broadcast_addr;
+
       //////////////////////////////////////////////////
       // Others registers

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

@@ -321 +321 @@
       assert(nways <= 32);
 
+      // Set the broadcast address with Xmin,Xmax,Ymin,Ymax set to maximum
+      broadcast_addr = 0x3 | (0x7C1F << (vci_param::N-20));
 
       // Get the segments associated to the MemCache 
@@ -2324 +2326 @@
             }
             if ( (p_vci_tgt_cleanup.cmd.read() == vci_param::CMD_WRITE) &&
-                (((addr_t)(p_vci_tgt_cleanup.address.read())) != BROADCAST_ADDR) &&
+                (((addr_t)(p_vci_tgt_cleanup.address.read())&0x3) != 0x3) &&
                 reached) {
 
@@ -4247 +4249 @@
         p_vci_tgt.rtrdid   = r_write_to_tgt_rsp_trdid.read();
         p_vci_tgt.rpktid   = r_write_to_tgt_rsp_pktid.read();
-        p_vci_tgt.rerror   = 0;
+        p_vci_tgt.rerror   = 0x2 & ( (1 << (vci_param::E + 1)) - 1); // Write OK
         p_vci_tgt.reop     = true;
         break;
@@ -4256 +4258 @@
         p_vci_tgt.rtrdid   = r_cleanup_to_tgt_rsp_trdid.read();
         p_vci_tgt.rpktid   = r_cleanup_to_tgt_rsp_pktid.read();
-        p_vci_tgt.rerror   = 0;
+        p_vci_tgt.rerror   = 0; // Can be a SC rsp
         p_vci_tgt.reop     = true;
         break;
@@ -4283 +4285 @@
         p_vci_tgt.rtrdid   = r_init_rsp_to_tgt_rsp_trdid.read();
         p_vci_tgt.rpktid   = r_init_rsp_to_tgt_rsp_pktid.read();
-        p_vci_tgt.rerror   = 0;
+        p_vci_tgt.rerror   = 0; // Can be a SC rsp
         p_vci_tgt.reop     = true;      
         break;
@@ -4331 +4333 @@
       case INIT_CMD_XRAM_BRDCAST:
         p_vci_ini.cmdval  = true;
-        p_vci_ini.address = BROADCAST_ADDR;
+        p_vci_ini.address = broadcast_addr;
         p_vci_ini.wdata   = (uint32_t)r_xram_rsp_to_init_cmd_nline.read();
         p_vci_ini.be      = ((r_xram_rsp_to_init_cmd_nline.read() >> 32) & 0x3);
@@ -4341 +4343 @@
       case INIT_CMD_WRITE_BRDCAST:
         p_vci_ini.cmdval  = true;
-        p_vci_ini.address = BROADCAST_ADDR;
+        p_vci_ini.address = broadcast_addr;
         p_vci_ini.wdata   = (addr_t)r_write_to_init_cmd_nline.read();
         p_vci_ini.be      = ((r_write_to_init_cmd_nline.read() >> 32) & 0x3);
@@ -4396 +4398 @@
       case INIT_CMD_SC_BRDCAST:
         p_vci_ini.cmdval  = true;
-        p_vci_ini.address = BROADCAST_ADDR;
+        p_vci_ini.address = broadcast_addr;
         p_vci_ini.wdata   = (addr_t)r_llsc_to_init_cmd_nline.read();
         p_vci_ini.be      = ((r_llsc_to_init_cmd_nline.read() >> 32) & 0x3);
@@ -4507 +4509 @@
           p_vci_tgt_cleanup.rpktid = r_cleanup_pktid.read();
           p_vci_tgt_cleanup.rtrdid = r_cleanup_trdid.read();
-          p_vci_tgt_cleanup.rerror = 0;
+          p_vci_tgt_cleanup.rerror = 0x2 & ( (1 << (vci_param::E + 1)) - 1);
           p_vci_tgt_cleanup.reop   = 1;
           break;