diff --git a/riscv/execute.cc b/riscv/execute.cc
index 9183f687..a623eb60 100644
--- a/riscv/execute.cc
+++ b/riscv/execute.cc
@@ -18,6 +18,9 @@ static void commit_log_stash_privilege(processor_t* p)
 static void commit_log_print_value(int width, uint64_t hi, uint64_t lo)
 {
   switch (width) {
+    case 8:
+      fprintf(stderr, "0x%01" PRIx8, (uint8_t)lo);
+      break;
     case 16:
       fprintf(stderr, "0x%04" PRIx16, (uint16_t)lo);
       break;
@@ -39,6 +42,7 @@ 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;
   int priv = state->last_inst_priv;
   int xlen = state->last_inst_xlen;
   int flen = state->last_inst_flen;
@@ -47,18 +51,23 @@ static void commit_log_print_insn(state_t* state, reg_t pc, insn_t insn)
   commit_log_print_value(xlen, 0, pc);
   fprintf(stderr, " (");
   commit_log_print_value(insn.length() * 8, 0, insn.bits());
-
+  fprintf(stderr, ")");
   if (reg.addr) {
     bool fp = reg.addr & 1;
     int rd = reg.addr >> 1;
     int size = fp ? flen : xlen;
-    fprintf(stderr, ") %c%2d ", fp ? 'f' : 'x', rd);
+    fprintf(stderr, " %c%2d ", fp ? 'f' : 'x', rd);
     commit_log_print_value(size, reg.data.v[1], reg.data.v[0]);
-    fprintf(stderr, "\n");
-  } else {
-    fprintf(stderr, ")\n");
   }
+  if (mem.size) {
+    fprintf(stderr, " mem ");
+    commit_log_print_value(xlen, 0, mem.addr);
+    fprintf(stderr, " ");
+    commit_log_print_value(mem.size << 3, 0, mem.value);
+  }
+  fprintf(stderr, "\n");
   reg.addr = 0;
+  mem.size = 0;
 #endif
 }
 
diff --git a/riscv/mmu.h b/riscv/mmu.h
index 5fa93ffb..9826cf16 100644
--- a/riscv/mmu.h
+++ b/riscv/mmu.h
@@ -112,6 +112,16 @@ public:
   load_func(int32)
   load_func(int64)
 
+#ifndef RISCV_ENABLE_COMMITLOG
+# define WRITE_MEM(addr, value, size) ({})
+#else
+# define WRITE_MEM(addr, val, size) ({ \
+    proc->state.log_mem_write.addr = addr; \
+    proc->state.log_mem_write.value = val; \
+    proc->state.log_mem_write.size = size; \
+  })
+#endif
+
   // template for functions that store an aligned value to memory
   #define store_func(type) \
     void store_##type(reg_t addr, type##_t val) { \
@@ -130,7 +140,11 @@ public:
       } \
       else \
         store_slow_path(addr, sizeof(type##_t), (const uint8_t*)&val); \
-    }
+      if (proc) { \
+        size_t size = sizeof(type##_t); \
+        WRITE_MEM(addr, val, size); \
+      } \
+  }
 
   // template for functions that perform an atomic memory operation
   #define amo_func(type) \
diff --git a/riscv/processor.h b/riscv/processor.h
index 26b83a11..e1c8c9d2 100644
--- a/riscv/processor.h
+++ b/riscv/processor.h
@@ -34,6 +34,13 @@ struct commit_log_reg_t
   freg_t data;
 };
 
+struct commit_log_mem_t
+{
+  reg_t addr;
+  uint64_t value;
+  uint8_t size; // bytes: 1, 2, 4, or 8
+};
+
 typedef struct
 {
   uint8_t prv;
@@ -259,6 +266,7 @@ struct state_t
 
 #ifdef RISCV_ENABLE_COMMITLOG
   commit_log_reg_t log_reg_write;
+  commit_log_mem_t log_mem_write;
   reg_t last_inst_priv;
   int last_inst_xlen;
   int last_inst_flen;