From 363c76a8947a476d13f270dacff00430ca7c460c Mon Sep 17 00:00:00 2001
From: John Ingalls <43973001+johningalls-sifive@users.noreply.github.com>
Date: Mon, 16 Dec 2019 15:55:39 -0800
Subject: extend the commit and memory writes log feature with memory reads
 (#370)

---
 riscv/execute.cc  | 16 +++++++++++-----
 riscv/mmu.h       | 27 +++++++++++++++++++++------
 riscv/processor.h |  1 +
 3 files changed, 33 insertions(+), 11 deletions(-)

(limited to 'riscv')

diff --git a/riscv/execute.cc b/riscv/execute.cc
index a623eb6..e138683 100644
--- a/riscv/execute.cc
+++ b/riscv/execute.cc
@@ -42,7 +42,8 @@ static void commit_log_print_insn(state_t* state, reg_t pc, insn_t insn)
 {
 #ifdef RISCV_ENABLE_COMMITLOG
   auto& reg = state->log_reg_write;
-  auto& mem = state->log_mem_write;
+  auto& load = state->log_mem_read;
+  auto& store = state->log_mem_write;
   int priv = state->last_inst_priv;
   int xlen = state->last_inst_xlen;
   int flen = state->last_inst_flen;
@@ -59,15 +60,20 @@ static void commit_log_print_insn(state_t* state, reg_t pc, insn_t insn)
     fprintf(stderr, " %c%2d ", fp ? 'f' : 'x', rd);
     commit_log_print_value(size, reg.data.v[1], reg.data.v[0]);
   }
-  if (mem.size) {
+  if (load.size) {
     fprintf(stderr, " mem ");
-    commit_log_print_value(xlen, 0, mem.addr);
+    commit_log_print_value(xlen, 0, load.addr);
+  }
+  if (store.size) {
+    fprintf(stderr, " mem ");
+    commit_log_print_value(xlen, 0, store.addr);
     fprintf(stderr, " ");
-    commit_log_print_value(mem.size << 3, 0, mem.value);
+    commit_log_print_value(store.size << 3, 0, store.value);
   }
   fprintf(stderr, "\n");
   reg.addr = 0;
-  mem.size = 0;
+  load.size = 0;
+  store.size = 0;
 #endif
 }
 
diff --git a/riscv/mmu.h b/riscv/mmu.h
index ebacc96..c089ea1 100644
--- a/riscv/mmu.h
+++ b/riscv/mmu.h
@@ -80,14 +80,26 @@ public:
 #endif
   }
 
+#ifndef RISCV_ENABLE_COMMITLOG
+# define READ_MEM(addr, size) ({})
+#else
+# define READ_MEM(addr, size) ({ \
+    proc->state.log_mem_read.addr = addr; \
+    proc->state.log_mem_read.size = size; \
+  })
+#endif
+
   // template for functions that load an aligned value from memory
   #define load_func(type) \
     inline type##_t load_##type(reg_t addr) { \
       if (unlikely(addr & (sizeof(type##_t)-1))) \
         return misaligned_load(addr, sizeof(type##_t)); \
       reg_t vpn = addr >> PGSHIFT; \
-      if (likely(tlb_load_tag[vpn % TLB_ENTRIES] == vpn)) \
+      size_t size = sizeof(type##_t); \
+      if (likely(tlb_load_tag[vpn % TLB_ENTRIES] == vpn)) { \
+        if (proc) READ_MEM(addr, size); \
         return from_le(*(type##_t*)(tlb_data[vpn % TLB_ENTRIES].host_offset + addr)); \
+      } \
       if (unlikely(tlb_load_tag[vpn % TLB_ENTRIES] == (vpn | TLB_CHECK_TRIGGERS))) { \
         type##_t data = from_le(*(type##_t*)(tlb_data[vpn % TLB_ENTRIES].host_offset + addr)); \
         if (!matched_trigger) { \
@@ -95,10 +107,12 @@ public:
           if (matched_trigger) \
             throw *matched_trigger; \
         } \
+        if (proc) READ_MEM(addr, size); \
         return data; \
       } \
       type##_t res; \
       load_slow_path(addr, sizeof(type##_t), (uint8_t*)&res); \
+      if (proc) READ_MEM(addr, size); \
       return from_le(res); \
     }
 
@@ -130,24 +144,25 @@ public:
       if (unlikely(addr & (sizeof(type##_t)-1))) \
         return misaligned_store(addr, val, sizeof(type##_t)); \
       reg_t vpn = addr >> PGSHIFT; \
-      if (likely(tlb_store_tag[vpn % TLB_ENTRIES] == vpn)) \
+      size_t size = sizeof(type##_t); \
+      if (likely(tlb_store_tag[vpn % TLB_ENTRIES] == vpn)) { \
+        if (proc) WRITE_MEM(addr, val, size); \
         *(type##_t*)(tlb_data[vpn % TLB_ENTRIES].host_offset + addr) = to_le(val); \
+      } \
       else if (unlikely(tlb_store_tag[vpn % TLB_ENTRIES] == (vpn | TLB_CHECK_TRIGGERS))) { \
         if (!matched_trigger) { \
           matched_trigger = trigger_exception(OPERATION_STORE, addr, val); \
           if (matched_trigger) \
             throw *matched_trigger; \
         } \
+        if (proc) WRITE_MEM(addr, val, size); \
         *(type##_t*)(tlb_data[vpn % TLB_ENTRIES].host_offset + addr) = to_le(val); \
       } \
       else { \
 	type##_t le_val = to_le(val); \
+        if (proc) WRITE_MEM(addr, val, size); \
         store_slow_path(addr, sizeof(type##_t), (const uint8_t*)&le_val); \
       } \
-      if (proc) { \
-        size_t size = sizeof(type##_t); \
-        WRITE_MEM(addr, val, size); \
-      } \
   }
 
   // template for functions that perform an atomic memory operation
diff --git a/riscv/processor.h b/riscv/processor.h
index bcf36c5..7af9f5f 100644
--- a/riscv/processor.h
+++ b/riscv/processor.h
@@ -271,6 +271,7 @@ struct state_t
 
 #ifdef RISCV_ENABLE_COMMITLOG
   commit_log_reg_t log_reg_write;
+  commit_log_mem_t log_mem_read;
   commit_log_mem_t log_mem_write;
   reg_t last_inst_priv;
   int last_inst_xlen;
-- 
cgit v1.1