Make CSR definitions scattered #543
Merged
Conversation
This file contains 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
arichardson
reviewed
Sep 9, 2024
arichardson
approved these changes
Sep 10, 2024
|
Minstret and timers are overkill.
…On Fri, Sep 13, 2024, 8:50 AM Alexander Richardson ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In model/riscv_insts_zicsr.sail
<#543 (comment)>:
> if isWrite then {
let new_val : xlenbits = match op {
CSRRW => rs1_val,
CSRRS => csr_val | rs1_val,
CSRRC => csr_val & ~(rs1_val)
};
- writeCSR(csr, new_val)
+ let final_val = write_CSR(csr, new_val);
I meant I am not sure if we want every implicit read/write of a CSR to be
emitted in the logfile since that could end up being really verbose.
—
Reply to this email directly, view it on GitHub
<#543 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AXROLOHWPUKOWYII3TLDRS3ZWMCVLAVCNFSM6AAAAABN4B2SIKVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDGMBTGQ4DGNBYHA>
.
You are receiving this because you are subscribed to this thread.Message
ID: ***@***.***>
|
|
I'll merge this in a few days if nobody objects. I think it's uncontroversial. |
Alasdair
approved these changes
Sep 24, 2024
Resolve the strange split between `read_CSR` (which is not `scattered`) and `ext_read_CSR` (which is). Same for `write_CSR` and `is_CSR_defined`. I changed the return type of `read_CSR` from `option(xlenbits)` to `xlenbits` since the code must already check `is_CSR_defined` before calling `read_CSR`. The only function that returned `None()` was the `seed` CSR in `write_seed_csr`, which actually meant you would get a weird "Unhandled write to CSR" if you wrote to `seed`. I renamed & reordered the files slightly to make the scattered mapping work, but I haven't moved any of the actual definitions yet. In future we should actually scatter them. Fixes riscv#410
Timmmm
force-pushed
the
user/timh/scattered_csrs
branch
from
21bd564
to
73f7467
Compare
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.
Resolve the strange split between
read_CSR(which is notscattered) andext_read_CSR(which is). Same forwrite_CSRandis_CSR_defined.I changed the return type of
read_CSRfromoption(xlenbits)toxlenbitssince the code must already checkis_CSR_definedbefore callingread_CSR. The only function that returnedNone()was theseedCSR inwrite_seed_csr, which actually meant you would get a weird "Unhandled write to CSR" if you wrote toseed.I renamed & reordered the files slightly to make the scattered mapping work, but I haven't moved any of the actual definitions yet. In future we should actually scatter them.
Fixes #410