Merge pull request #58 from comparch-security/goodie-from-spike

add good stuff form recent commits of the spike branch

Makefile

@@ -25,12 +25,15 @@ endif
 
 UTIL_HEADERS  = $(wildcard util/*.hpp)
 CACHE_HEADERS = $(wildcard cache/*.hpp)
-DSL_HEADERS   = $(wildcard dsl/*.hpp)
 
 CRYPTO_LIB    = cryptopp/libcryptopp.a
 CACHE_OBJS    = cache/metadata.o
 UTIL_OBJS     = util/random.o util/query.o util/monitor.o
 
+all: libflexicas.a
+
+.PONY: all
+
 $(CRYPTO_LIB):
 	CXXFLAGS="-g0" $(MAKE) -C cryptopp -j$(NCORE)
 
@@ -65,6 +68,9 @@ regression: $(REGRESSION_TESTS_RST)
 clean-regression:
 	-rm $(REGRESSION_TESTS_LOG) $(REGRESSION_TESTS_EXE) $(REGRESSION_TESTS_RST)
 
+libflexicas.a: $(CACHE_OBJS) $(UTIL_OBJS) $(CRYPTO_LIB)
+	ar rvs $@ $(CACHE_OBJS) $(UTIL_OBJS) $(CRYPTO_LIB)
+
 .PHONY: regression
 
 clean:

cache/cache.hpp

@@ -133,6 +133,7 @@ class CacheBase : public CacheMonitorSupport
   virtual CMMetadataBase *meta_copy_buffer() = 0;           // allocate a copy buffer, needed by exclusive cache with extended meta
   virtual void meta_return_buffer(CMMetadataBase *buf) = 0; // return a copy buffer, used to detect conflicts in copy buffer
 
+  virtual std::tuple<int, int, int> size() const = 0;           // return the size parameters of the cache
   uint32_t get_id() const { return id; }
   const std::string& get_name() const { return name;} 
 
@@ -191,6 +192,8 @@ class CacheSkewed : public CacheBase
     for(auto &buf: meta_buffer_state) delete buf.first;
   }
 
+  virtual std::tuple<int, int, int> size() const { return std::make_tuple(P, 1ul<<IW, NW); }
+
   virtual bool hit(uint64_t addr, uint32_t *ai, uint32_t *s, uint32_t *w ) {
     for(*ai=0; *ai<P; (*ai)++) {
       *s = indexer.index(addr, *ai);

cache/coherence.hpp

@@ -318,6 +318,18 @@ class CoreInterface : public InnerCohPortUncached {
     assert(nullptr == "Error: L1.writeback_invalidate() is not implemented yet!");
   }
 
+  // flush the whole cache
+  virtual void flush_cache(uint64_t *delay) {
+    auto [npar, nset, nway] = cache->size();
+    for(int ipar=0; ipar<npar; ipar++)
+      for(int iset=0; iset < nset; iset++)
+        for(int iway=0; iway < nway; iway++) {
+          auto [meta, data] = cache->access_line(ipar, iset, iway);
+          if(meta->is_valid())
+            flush_line(meta->addr(iset), policy->cmd_for_flush(), delay);
+        }
+  }
+
   virtual void query_loc(uint64_t addr, std::list<LocInfo> *locs){
     addr = normalize(addr);
     outer->query_loc_req(addr, locs);