diff options
| author | Tim Newsome <tim@sifive.com> | 2023-06-01 13:19:37 -0700 |
|---|---|---|
| committer | Tim Newsome <tim@sifive.com> | 2023-06-01 13:19:37 -0700 |
| commit | bb101c7a2c1bd751a34d65ea441faede408fa3d7 (patch) | |
| tree | 0f1cd6cb2b69f2ac5fec443cff1518a330f4f0ca /riscv/csrs.cc | |
| parent | 740e6353a166ec3ba936b200482d6fc381b8082b (diff) | |
| download | riscv-isa-sim-bb101c7a2c1bd751a34d65ea441faede408fa3d7.zip riscv-isa-sim-bb101c7a2c1bd751a34d65ea441faede408fa3d7.tar.gz riscv-isa-sim-bb101c7a2c1bd751a34d65ea441faede408fa3d7.tar.bz2 | |
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.
Diffstat (limited to 'riscv/csrs.cc')
| -rw-r--r-- | riscv/csrs.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/riscv/csrs.cc b/riscv/csrs.cc index 95b5e22..7ea07d1 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; |