From bb101c7a2c1bd751a34d65ea441faede408fa3d7 Mon Sep 17 00:00:00 2001
From: Tim Newsome <tim@sifive.com>
Date: Thu, 1 Jun 2023 13:19:37 -0700
Subject: [PATCH] dscr.ebreakh is now dcsr.ebreakv[su]

This change was made ages ago in the spec.

I did not actually test that the new privilege checks in ebreak and
c.ebreak are correct, but all the existing debug tests still pass.
---
 riscv/csrs.cc          |  9 ++++++---
 riscv/csrs.h           |  3 ++-
 riscv/insns/c_ebreak.h | 10 ++++++----
 riscv/insns/ebreak.h   | 10 ++++++----
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/riscv/csrs.cc b/riscv/csrs.cc
index 95b5e223..7ea07d10 100644
--- a/riscv/csrs.cc
+++ b/riscv/csrs.cc
@@ -1232,9 +1232,10 @@ dcsr_csr_t::dcsr_csr_t(processor_t* const proc, const reg_t addr):
   prv(0),
   step(false),
   ebreakm(false),
-  ebreakh(false),
   ebreaks(false),
   ebreaku(false),
+  ebreakvs(false),
+  ebreakvu(false),
   halt(false),
   v(false),
   cause(0) {
@@ -1250,9 +1251,10 @@ reg_t dcsr_csr_t::read() const noexcept {
   reg_t result = 0;
   result = set_field(result, DCSR_XDEBUGVER, 1);
   result = set_field(result, DCSR_EBREAKM, ebreakm);
-  result = set_field(result, DCSR_EBREAKH, ebreakh);
   result = set_field(result, DCSR_EBREAKS, ebreaks);
   result = set_field(result, DCSR_EBREAKU, ebreaku);
+  result = set_field(result, CSR_DCSR_EBREAKVS, ebreakvs);
+  result = set_field(result, CSR_DCSR_EBREAKVU, ebreakvu);
   result = set_field(result, DCSR_STOPCYCLE, 0);
   result = set_field(result, DCSR_STOPTIME, 0);
   result = set_field(result, DCSR_CAUSE, cause);
@@ -1267,9 +1269,10 @@ bool dcsr_csr_t::unlogged_write(const reg_t val) noexcept {
   step = get_field(val, DCSR_STEP);
   // TODO: ndreset and fullreset
   ebreakm = get_field(val, DCSR_EBREAKM);
-  ebreakh = get_field(val, DCSR_EBREAKH);
   ebreaks = get_field(val, DCSR_EBREAKS);
   ebreaku = get_field(val, DCSR_EBREAKU);
+  ebreakvs = get_field(val, CSR_DCSR_EBREAKVS);
+  ebreakvu = get_field(val, CSR_DCSR_EBREAKVU);
   halt = get_field(val, DCSR_HALT);
   v = proc->extension_enabled('H') ? get_field(val, CSR_DCSR_V) : false;
   return true;
diff --git a/riscv/csrs.h b/riscv/csrs.h
index 19aefca1..07d6d82a 100644
--- a/riscv/csrs.h
+++ b/riscv/csrs.h
@@ -663,9 +663,10 @@ class dcsr_csr_t: public csr_t {
   uint8_t prv;
   bool step;
   bool ebreakm;
-  bool ebreakh;
   bool ebreaks;
   bool ebreaku;
+  bool ebreakvs;
+  bool ebreakvu;
   bool halt;
   bool v;
   uint8_t cause;
diff --git a/riscv/insns/c_ebreak.h b/riscv/insns/c_ebreak.h
index 14b51363..4ea27a75 100644
--- a/riscv/insns/c_ebreak.h
+++ b/riscv/insns/c_ebreak.h
@@ -1,8 +1,10 @@
 require_extension(EXT_ZCA);
-if (!STATE.debug_mode &&
-    ((STATE.prv == PRV_M && STATE.dcsr->ebreakm) ||
-     (STATE.prv == PRV_S && STATE.dcsr->ebreaks) ||
-     (STATE.prv == PRV_U && STATE.dcsr->ebreaku))) {
+if (!STATE.debug_mode && (
+        (!STATE.v && STATE.prv == PRV_M && STATE.dcsr->ebreakm) ||
+        (!STATE.v && STATE.prv == PRV_S && STATE.dcsr->ebreaks) ||
+        (!STATE.v && STATE.prv == PRV_U && STATE.dcsr->ebreaku) ||
+        (STATE.v && STATE.prv == PRV_S && STATE.dcsr->ebreakvs) ||
+        (STATE.v && STATE.prv == PRV_U && STATE.dcsr->ebreakvu))) {
 	throw trap_debug_mode();
 } else {
 	throw trap_breakpoint(STATE.v, pc);
diff --git a/riscv/insns/ebreak.h b/riscv/insns/ebreak.h
index 227ab935..0cd2f190 100644
--- a/riscv/insns/ebreak.h
+++ b/riscv/insns/ebreak.h
@@ -1,7 +1,9 @@
-if (!STATE.debug_mode &&
-    ((STATE.prv == PRV_M && STATE.dcsr->ebreakm) ||
-     (STATE.prv == PRV_S && STATE.dcsr->ebreaks) ||
-     (STATE.prv == PRV_U && STATE.dcsr->ebreaku))) {
+if (!STATE.debug_mode && (
+        (!STATE.v && STATE.prv == PRV_M && STATE.dcsr->ebreakm) ||
+        (!STATE.v && STATE.prv == PRV_S && STATE.dcsr->ebreaks) ||
+        (!STATE.v && STATE.prv == PRV_U && STATE.dcsr->ebreaku) ||
+        (STATE.v && STATE.prv == PRV_S && STATE.dcsr->ebreakvs) ||
+        (STATE.v && STATE.prv == PRV_U && STATE.dcsr->ebreakvu))) {
 	throw trap_debug_mode();
 } else {
 	throw trap_breakpoint(STATE.v, pc);