Skip to content

Commit ec292be

Browse files
committed
Update encoding.h for pointer masking
Rename DCSR_STOPCYCLE to DCSR_STOPCOUNT Rename DCSR_HALT to DCSR_NMIP
1 parent 1b1a333 commit ec292be

File tree

2 files changed

+114
-155
lines changed

2 files changed

+114
-155
lines changed

riscv/csrs.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ reg_t dcsr_csr_t::read() const noexcept {
13121312
result = set_field(result, DCSR_EBREAKU, ebreaku);
13131313
result = set_field(result, CSR_DCSR_EBREAKVS, ebreakvs);
13141314
result = set_field(result, CSR_DCSR_EBREAKVU, ebreakvu);
1315-
result = set_field(result, DCSR_STOPCYCLE, 0);
1315+
result = set_field(result, DCSR_STOPCOUNT, 0);
13161316
result = set_field(result, DCSR_STOPTIME, 0);
13171317
result = set_field(result, DCSR_CAUSE, cause);
13181318
result = set_field(result, DCSR_STEP, step);
@@ -1331,7 +1331,7 @@ bool dcsr_csr_t::unlogged_write(const reg_t val) noexcept {
13311331
ebreaku = proc->extension_enabled('U') ? get_field(val, DCSR_EBREAKU) : false;
13321332
ebreakvs = proc->extension_enabled('H') ? get_field(val, CSR_DCSR_EBREAKVS) : false;
13331333
ebreakvu = proc->extension_enabled('H') ? get_field(val, CSR_DCSR_EBREAKVU) : false;
1334-
halt = get_field(val, DCSR_HALT);
1334+
halt = get_field(val, DCSR_NMIP);
13351335
v = proc->extension_enabled('H') ? get_field(val, CSR_DCSR_V) : false;
13361336
pelp = proc->extension_enabled(EXT_ZICFILP) ?
13371337
static_cast<elp_t>(get_field(val, DCSR_PELP)) : elp_t::NO_LP_EXPECTED;

0 commit comments

Comments
 (0)