Fix 4-state value support for $readmem (#5070) #5078
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
wsnyder
reviewed
Apr 28, 2024
include/verilated.cpp
Outdated
Comment on lines
2035
to
2061
| const bool c_is_4state_bin | ||
| = c == '0' || c == '1' || c == 'x' || c == 'X' || c == 'z' || c == 'Z'; |
There was a problem hiding this comment.
Please use Verilator mixed cap style.
Suggested change
| const bool c_is_4state_bin | |
| = c == '0' || c == '1' || c == 'x' || c == 'X' || c == 'z' || c == 'Z'; | |
| const bool chIs4StateBin | |
| = c == '0' || c == '1' || c == 'x' || c == 'X' || c == 'z' || c == 'Z'; |
There was a problem hiding this comment.
I can make this change, but I was trying to match the existing naming style in the function. What are your thoughts?
There was a problem hiding this comment.
Ah, probably I let it slide when the function was first introduced. For local variables it's not a big deal, either way.
include/verilated.cpp
Outdated
| = c == '0' || c == '1' || c == 'x' || c == 'X' || c == 'z' || c == 'Z'; | ||
| const bool c_is_2state_hex = std::isxdigit(c); | ||
| const bool c_is_4state_hex | ||
| = std::isxdigit(c) || c == 'x' || c == 'X' || c == 'z' || c == 'Z'; |
There was a problem hiding this comment.
Suggested change
| = std::isxdigit(c) || c == 'x' || c == 'X' || c == 'z' || c == 'Z'; | |
| = std::isxdigit(c) || cIs4StateBin; |
wsnyder
changed the title
|
@wsnyder I think this PR is good to go. I renamed all the local variables to mixed cap and added 2 tests |
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.
Fixes #5070
(I still need to add a couple tests, but I'm posting the PR now in case you have early suggestions).
Changes:
zorxin a data string will be converted to a random bit/nibble according to$readmemb/$readmemhand+verilator+rand+reset