print out current privilege level (if commit log enabled)
authorScott Beamer <sbeamer@eecs.berkeley.edu>
Sat, 12 Sep 2015 01:04:37 +0000 (18:04 -0700)
committerScott Beamer <sbeamer@eecs.berkeley.edu>
Sat, 12 Sep 2015 01:04:37 +0000 (18:04 -0700)
riscv/execute.cc

index f64cbaa268113a6d8f986a3ed24fb5d7fc70bd06..42d59cb4ce5295fe3248efda2562e322298b3c0a 100644 (file)
@@ -7,16 +7,18 @@
 static void commit_log(state_t* state, reg_t pc, insn_t insn)
 {
 #ifdef RISCV_ENABLE_COMMITLOG
+  int32_t priv = get_field(state->mstatus, MSTATUS_PRV);
   uint64_t mask = (insn.length() == 8 ? uint64_t(0) : (uint64_t(1) << (insn.length() * 8))) - 1;
   if (state->log_reg_write.addr) {
-    fprintf(stderr, "0x%016" PRIx64 " (0x%08" PRIx64 ") %c%2" PRIu64 " 0x%016" PRIx64 "\n",
+    fprintf(stderr, "%1d 0x%016" PRIx64 " (0x%08" PRIx64 ") %c%2" PRIu64 " 0x%016" PRIx64 "\n",
+            priv,
             pc,
             insn.bits() & mask,
             state->log_reg_write.addr & 1 ? 'f' : 'x',
             state->log_reg_write.addr >> 1,
             state->log_reg_write.data);
   } else {
-    fprintf(stderr, "0x%016" PRIx64 " (0x%08" PRIx64 ")\n", pc, insn.bits() & mask);
+    fprintf(stderr, "%1d 0x%016" PRIx64 " (0x%08" PRIx64 ")\n", priv, pc, insn.bits() & mask);
   }
   state->log_reg_write.addr = 0;
 #endif