Skip to content

Simplify riscv::interrupt::machine::nested #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 1, 2025
Merged

Simplify riscv::interrupt::machine::nested #283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions riscv/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- CSR helper macro `write_composite_csr` for writing 64-bit CSRs on 32-bit targets.
- Write utilities for `mcycle`, `minstret`

### Changed

- Simplify `riscv::interrupt::machine::nested`

## [v0.13.0] - 2025-02-18

### Added
Expand Down
6 changes: 2 additions & 4 deletions riscv/src/interrupt/machine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,10 @@ where
}

// Restore MSTATUS.PIE, MSTATUS.MPP, and SEPC
let mut after_mstatus = mstatus::read();
if mstatus.mpie() {
after_mstatus.set_mpie(mstatus.mpie());
mstatus::set_mpie();
}
after_mstatus.set_mpp(mstatus.mpp());
mstatus::write(after_mstatus);
mstatus::set_mpp(mstatus.mpp());
mepc::write(mepc);

r
Expand Down