Changeset 680 for branches/MESI/modules/vci_mem_cache/caba/source/include

Timestamp:

Apr 17, 2014, 11:12:35 AM (11 years ago)

Author:

haoliu

Message:

MESI Bug fixed

Location:

branches/MESI/modules/vci_mem_cache/caba/source/include

Files:

• update_tab.h (modified) (11 diffs)
• vci_mem_cache.h (modified) (1 diff)

branches/MESI/modules/vci_mem_cache/caba/source/include/update_tab.h

@@ -27 +27 @@
   addr_t        nline;      // The identifier of the cache line
   size_t        count;      // The number of acknowledge responses to receive
-  bool      is_change;  // multi ack miss req sends this bit to 1
+  bool      type;       // for a command read or write
+  bool      is_changed; // multi ack miss req sends this bit to 1
 
   UpdateTabEntry()
@@ -41 +42 @@
     nline           = 0;
     count           = 0;
-    is_change   = 0;
+    type            = 0;
+    is_changed  = 0;
   }
 
@@ -54 +56 @@
                  addr_t i_nline,
                  size_t i_count,
-                 size_t i_is_change) 
+                 bool   i_type,
+                 bool   i_is_changed) 
   {
     valid           = i_valid;
@@ -66 +69 @@
     nline           = i_nline;
     count           = i_count;
-    is_change   = i_is_change;
+    type        = i_type;
+    is_changed  = i_is_changed;
   }
 
@@ -81 +85 @@
     nline       = source.nline;
     count       = source.count;
-    is_change   = source.is_change;
+    type        = source.type;
+    is_changed  = source.is_changed;
   }
 
@@ -99 +104 @@
     nline       = 0;
     count       = 0;
-    is_change   = 0;
+    type        = 0;
+    is_changed  = 0;
   }
 
@@ -119 +125 @@
     nline       = source.nline;
     count       = source.count;
-    is_change   = source.is_change;
+    type        = source.type;
+    is_changed  = source.is_changed;
   }
 
@@ -136 +143 @@
               << " / trdid = " << trdid   
               << " / pktid = " << pktid
+              << " / type = "  << type
+              << " / is_changed = "  << is_changed
               << " / nline = " << nline  << std::endl;
   }
@@ -227 +236 @@
            const addr_t nline,
            const size_t count,
+           const bool   type,
            size_t       &index,
-           const bool   is_change=false)
+           const bool   is_changed=false)
   {
     for ( size_t i=0 ; i<size_tab ; i++ ) 
@@ -244 +254 @@
         tab[i].nline            = (addr_t) nline;
         tab[i].count            = (size_t) count;
-        tab[i].is_change    = is_change;
+        tab[i].type         = type;
+        tab[i].is_changed   = is_changed;
         index                       = i;
         return true;
@@ -464 +475 @@
   {
     assert(index<size_tab && "Bad Update Tab Entry");
-    tab[index].is_change = true;
-  }
-
-  size_t is_change(const size_t index)
-  {
-    assert(index<size_tab && "Bad Update Tab Entry");
-    return tab[index].is_change;
+    tab[index].is_changed = true;
+  }
+
+  bool is_changed(const size_t index)
+  {
+    assert(index<size_tab && "Bad Update Tab Entry");
+    return tab[index].is_changed;
+  }
+
+  bool is_read(const size_t index)
+  {
+    assert(index<size_tab && "Bad Update Tab Entry");
+    return tab[index].type;
   }
 };

branches/MESI/modules/vci_mem_cache/caba/source/include/vci_mem_cache.h

@@ -1024 +1024 @@
       sc_signal<size_t>   r_cleanup_locked_index;   // ivt index
       sc_signal<bool>     r_cleanup_locked_is_updt; 
-      sc_signal<bool>     r_cleanup_locked_is_change; 
+      sc_signal<bool>     r_cleanup_locked_is_changed; 
+      sc_signal<bool>     r_cleanup_locked_is_read; 
 
       sc_signal<size_t>   r_cleanup_miss_srcid;   // srcid of write rsp