Skip to content

Commit ad86a5f

Browse files
committed
Deprecate dcsr.halt
The debug spec 1.0.0-rc3 deprecates the dcsr.halt and lets the bit become dcsr.nmip. This commit separates the halt variable from the dcsr.nmip and designates it as an internal variable for halt_on_reset (-H). Additionally, this commit removes the notifying comment about the deprecated dcsr.halt in the main loop.
1 parent f7d0dba commit ad86a5f

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

riscv/csrs.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,6 @@ bool dcsr_csr_t::unlogged_write(const reg_t val) noexcept {
13541354
ebreaku = proc->extension_enabled('U') ? get_field(val, DCSR_EBREAKU) : false;
13551355
ebreakvs = proc->extension_enabled('H') ? get_field(val, CSR_DCSR_EBREAKVS) : false;
13561356
ebreakvu = proc->extension_enabled('H') ? get_field(val, CSR_DCSR_EBREAKVU) : false;
1357-
halt = get_field(val, DCSR_NMIP);
13581357
v = proc->extension_enabled('H') ? get_field(val, CSR_DCSR_V) : false;
13591358
pelp = proc->extension_enabled(EXT_ZICFILP) ?
13601359
static_cast<elp_t>(get_field(val, DCSR_PELP)) : elp_t::NO_LP_EXPECTED;

riscv/execute.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ void processor_t::step(size_t n)
216216
enter_debug_mode(DCSR_CAUSE_DEBUGINT);
217217
} else if (halt_request == HR_GROUP) {
218218
enter_debug_mode(DCSR_CAUSE_GROUP);
219-
} // !!!The halt bit in DCSR is deprecated.
219+
}
220220
else if (state.dcsr->halt) {
221221
enter_debug_mode(DCSR_CAUSE_HALT);
222222
}

0 commit comments

Comments
 (0)