fix(d1): make Plic::mask actually do that
#348
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
PR #312 (commit df41dec) inadvertently broke the `Plic` method to mask an interrupt by copy-pasting the code from `Plic::unmask`. Previously, `Plic::unmask` would write `MIE[offset] | irq_en` to `MIE[offset]`, setting the `IRQ_EN` bit for that interrupt; while `Plic::mask` would write `MIE[offset] & !irq_en` to `MIE[offset]`, unsetting the `IRQ_EN `bit. But now they both *set* the `IRQ_EN` bit, so masking an interrupt actually *unmasks* it. Whoopsie. This seems to have occurred because I'm a LOSER FUCKING IDIOT. This commit puts it back the way it was supposed to be. Sorry. Fixes #347
hawkw
force-pushed
the
eliza/fix-plic-mask
branch
from
09e9b38 to
301ee0f
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.
PR #312 (commit df41dec) inadvertently broke the
Plicmethod to mask an interrupt by copy-pasting the code fromPlic::unmask.Previously,
Plic::unmaskwould writeMIE[offset]| irq_entoMIE[offset], setting theIRQ_ENbit for that interrupt; whilePlic::maskwould writeMIE[offset] & !irq_entoMIE[offset], unsetting theIRQ_ENbit. But now they both set theIRQ_ENbit, so masking an interrupt actually unmasks it. Whoopsie. This seems to have occurred because I'm a LOSER FUCKING IDIOT.This commit puts it back the way it was supposed to be. Sorry.
Fixes #347