fix(riscv): reject RV32-only counter-high CSRs on RV64 - #235
Closed
carlosqwqqwq wants to merge 2 commits into
Closed
fix(riscv): reject RV32-only counter-high CSRs on RV64#235carlosqwqqwq wants to merge 2 commits into
carlosqwqqwq wants to merge 2 commits into
Conversation
cpu.rs exceeded the AGENTS.md hard split triggers (2000 lines / 150 kB). Move the vector (RVV) element access and data-path execution group, including set_vtype, into cpu/vector.rs with no behavior change.
Member
|
Thank you for reporting and proposing this fix. I independently reimplemented and validated CSR availability checks for RV32-only counters and extension-owned FP, vector, and JVT CSRs in the consolidation PR #231; no commits or code from this branch were taken. The rollup carries @carlosqwqqwq as co-author on its commits and includes direct and native regression coverage. I’m closing this PR as superseded by #231—please review the consolidated implementation there. |
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.
fix(riscv): reject RV32-only counter-high CSRs on RV64
Closes #234
Summary
On RV64, the counter-high CSRs
cycleh,timehandinstreth(0xC80-0xC82) are RV32-only high shadows and must raise an illegal-instruction exception. The affected RAX interpreter instead reads the internal high-half value and continues. The same missing availability check affects CSR families whose declaring extension is disabled, such as JVT without Zcmt and vector CSRs without V, so guest code can probe or use a CSR that is not present in the selected RISC-V profile.The fix adds a shared
csr_available()check and gates both the CSR read and CSR write paths on XLEN and the configured extension set.Validation
csrr x1, cyclehwitness normally with a trap-framex1=0.cause=2(illegal instruction) at the CSR instruction with no frame.cargo test --lib: full library test suite passes with no regressions.No new upstream test files are added; this is a source-only change.