Fix mcontrol6 mask low/high operations. #1771
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
|
@YenHaoChen, can you review this? |
|
The old code was from the 0.13 version, and the patch provides the behavior of the ratified version. After the patch, the code makes more sense to me. Reference: |
|
@aswaterman I think this change is good to go. |
YenHaoChen
reviewed
Aug 16, 2024
riscv/triggers.cc
Outdated
Comment on lines
199
to
200
| reg_t tdata2_low = tdata2 & ((1 << (xlen/2)) - 1); | ||
| reg_t value_low = value & ((1 << (xlen/2)) - 1); |
There was a problem hiding this comment.
I think we need reg_t(1).
reg_t tdata2_low = tdata2 & ((reg_t(1) << (xlen/2)) - 1);
reg_t value_low = value & ((reg_t(1) << (xlen/2)) - 1);
riscv/triggers.cc
Outdated
| reg_t mask = tdata2 >> (xlen/2); | ||
| return ((value >> (xlen/2)) & mask) == (tdata2 & mask); | ||
| reg_t tdata2_high = tdata2 >> (xlen/2); | ||
| reg_t tdata2_low = tdata2 & ((1 << (xlen/2)) - 1); |
There was a problem hiding this comment.
I think we need reg_t(1).
reg_t tdata2_low = tdata2 & ((reg_t(1) << (xlen/2)) - 1);
|
I think @YenHaoChen is right about the out-of-bounds shifts by 32 when |
I doubt this code was ever tested, and this change isn't tested either, because OpenOCD doesn't use this trigger type. This problem was reported in riscv/riscv-debug-spec#1057
|
I've added reg_t() where necessary. Thanks. |
aswaterman
approved these changes
Aug 19, 2024
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.
I doubt this code was ever tested, and this change isn't tested either, because OpenOCD doesn't use this trigger type.
This problem was reported in
riscv/riscv-debug-spec#1057