Hand merge

--HG--
extra : convert_revision : 86c7399b79c17558041a73056745227f70fe8b3b

1 files changed, 13 insertions, 5 deletions

diff --git a/objects/BaseCache.mpy b/objects/BaseCache.mpy
index 67ca3c04e..98a422e30 100644
--- a/objects/BaseCache.mpy
+++ b/objects/BaseCache.mpy
@@ -1,30 +1,38 @@
 from BaseMem import BaseMem
 
 simobj BaseCache(BaseMem):
-    adaptive_compression = Param.Bool(false,
+    type = 'BaseCache'
+    adaptive_compression = Param.Bool(False,
         "Use an adaptive compression scheme")
     assoc = Param.Int("associativity")
     block_size = Param.Int("block size in bytes")
-    compressed_bus = Param.Bool(false,
+    compressed_bus = Param.Bool(False,
         "This cache connects to a compressed memory")
     compression_latency = Param.Int(0,
         "Latency in cycles of compression algorithm")
-    do_copy = Param.Bool(false, "perform fast copies in the cache")
+    do_copy = Param.Bool(False, "perform fast copies in the cache")
     hash_delay = Param.Int(1, "time in cycles of hash access")
     in_bus = Param.Bus(NULL, "incoming bus object")
+    lifo = Param.Bool(False,
+        "whether this NIC partition should use LIFO repl. policy")
     max_miss_count = Param.Counter(0,
         "number of misses to handle before calling exit")
     mshrs = Param.Int("number of MSHRs (max outstanding requests)")
     out_bus = Param.Bus("outgoing bus object")
-    prioritizeRequests = Param.Bool(false,
+    prioritizeRequests = Param.Bool(False,
         "always service demand misses first")
     protocol = Param.CoherenceProtocol(NULL, "coherence protocol to use")
     repl = Param.Repl(NULL, "replacement policy")
     size = Param.Int("capacity in bytes")
-    store_compressed = Param.Bool(false,
+    split = Param.Bool(False, "whether or not this cache is split")
+    split_size = Param.Int(0,
+        "How many ways of the cache belong to CPU/LRU partition")
+    store_compressed = Param.Bool(False,
         "Store compressed data in the cache")
     subblock_size = Param.Int(0,
         "Size of subblock in IIC used for compression")
     tgts_per_mshr = Param.Int("max number of accesses per MSHR")
     trace_addr = Param.Addr(0, "address to trace")
+    two_queue = Param.Bool(False,
+        "whether the lifo should have two queue replacement")
     write_buffers = Param.Int(8, "number of write buffers")