Add MRET and WFI; fix bug in compressed branch/jump instruction emission#27
Merged
theandrew168 merged 2 commits intotheandrew168:masterfrom Apr 11, 2026
Merged
Add MRET and WFI; fix bug in compressed branch/jump instruction emission#27theandrew168 merged 2 commits intotheandrew168:masterfrom
theandrew168 merged 2 commits intotheandrew168:masterfrom
Conversation
Owner
|
Thanks for giving Bronzebeard a try and for opening this PR! I originally only implemented the unprivileged instructions but see value in also adding the privileged ones. I'm going to add a few more tests and then I'll get this merged. EDIT: Actually, I'd like to add the rest of the privileged instructions so I'm going to merge this and add the rest (plus more tests) as a follow-up. |
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.
This PR adds MRET and WFI instructions, which I believe should be implemented for any base ISA, since it's expected that all M-mode instructions are implemented. objdump disassembles both correctly when assembling with the new code.
Additionally, it fixes a bug where instructions like
c.jal fn,c.bnez a0, labelemit incorrect offsets, since the PC-relative handling that's done for the base branch/jump instructions wasn't done for the compressed ones. This wasn't caught by the C extension tests since they only test on constant immediates rather than labels in the context of a program. Full integration tests (i.e. assemble a more complex program that uses multiple extensions and check it matches a binary exactly) might be good.P.S. It's a good assembler and I'm having fun using it.