fix(riscv): implement sret/uret supervisor restore semantics - #294
Closed
carlosqwqqwq wants to merge 1 commit into
Closed
fix(riscv): implement sret/uret supervisor restore semantics#294carlosqwqqwq wants to merge 1 commit into
carlosqwqqwq wants to merge 1 commit into
Conversation
Member
|
Thanks for the report and patch. I independently checked this against the current privileged architecture. #296 implements SRET restoration and privilege transitions, but deliberately rejects URET because the obsolete N-extension instruction is no longer defined by the current specification. The rollup includes your co-author credit and asks for your review. I’m closing this PR as superseded by #296. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Route
sret/uretto a dedicated supervisor restore path instead of themachine-mode
mret()implementation. CurrentlyOp::Sret | Op::Uret => self.mret()restores privilege fromMPP, takes thereturn PC from
mepc, and rewrites the machine-mode stack bits(
MPP/MPIE/MIE), while never applying the supervisor semantics(
priv <- SPP,SIE <- SPIE,SPIE <- 1,SPP <- 0). Add asepcCSR andimplement
sret()accordingly.Validation
fail, i.e. the defect is fixed.
restored from SPP, SIE set from SPIE, SPIE set to 1, SPP cleared, PC from
sepc, and MPP/MPIE/MIE untouched.
(R-010/R-011/R-012 for this fix, R-023 for the segment-ff decode fix,
R-017 obsolete, V-012 already adopted upstream).
cargo test --libpasses.Closes #289