Browse Source
Merge pull request #1839 from ved-rivos/issue_1838
add missing sdt/sie interaction when writing mstatus directly
pull/1843/head
Andrew Waterman
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
2 additions and
3 deletions
-
riscv/csrs.cc
|
|
|
@ -556,9 +556,8 @@ bool mstatus_csr_t::unlogged_write(const reg_t val) noexcept { |
|
|
|
const reg_t requested_mpp = proc->legalize_privilege(get_field(val, MSTATUS_MPP)); |
|
|
|
const reg_t adjusted_val = set_field(val, MSTATUS_MPP, requested_mpp); |
|
|
|
reg_t new_mstatus = (read() & ~mask) | (adjusted_val & mask); |
|
|
|
if (new_mstatus & MSTATUS_MDT) { |
|
|
|
new_mstatus = new_mstatus & ~MSTATUS_MIE; |
|
|
|
} |
|
|
|
new_mstatus = (new_mstatus & MSTATUS_MDT) ? (new_mstatus & ~MSTATUS_MIE) : new_mstatus; |
|
|
|
new_mstatus = (new_mstatus & MSTATUS_SDT) ? (new_mstatus & ~MSTATUS_SIE) : new_mstatus; |
|
|
|
maybe_flush_tlb(new_mstatus); |
|
|
|
this->val = adjust_sd(new_mstatus); |
|
|
|
return true; |
|
|
|
|
