fix: add backward compatibility for new instruction schema format #1051
Conversation
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
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #1051 +/- ##
=======================================
Coverage 46.05% 46.05%
=======================================
Files 11 11
Lines 4942 4942
Branches 1345 1345
=======================================
Hits 2276 2276
Misses 2666 2666
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
Fixes #893 |
AFOliveira
force-pushed
the
AFOliveira/generatorfix
branch
from
106d324 to
aab7d0f
Compare
ThinkOpenly
reviewed
Sep 2, 2025
AFOliveira
force-pushed
the
AFOliveira/generatorfix
branch
from
aab7d0f to
ce2adef
Compare
UDB generators were failing when processing instructions using the new schema format. Some instructions now use a 'format' field with 'opcodes' instead of the traditional 'encoding' field with 'match' patterns. Changes: - Added build_match_from_format() function to convert format.opcodes to match strings compatible with existing generator logic - Added support for variable instruction widths (16-bit, 32-bit, 48-bit) based on maximum bit position in opcode fields - Enhanced encoding detection to handle both old and new schema formats - Maintains full backward compatibility with existing instructions Tested with both Go and C header generators - no changes to output format. Signed-off-by: Afonso Oliveira <[email protected]>
AFOliveira
force-pushed
the
AFOliveira/generatorfix
branch
from
ce2adef to
b5f9815
Compare
ThinkOpenly
reviewed
Sep 4, 2025
ThinkOpenly
requested changes
Sep 15, 2025
| if ( | ||
| isinstance(field_data, dict) | ||
| and "location" in field_data | ||
| and isinstance(field_data["location"], str) |
There was a problem hiding this comment.
I think the schema (for "possibly_split_field_location" allows strings ("31-24", "31") or integers (31). I presume we need to handle the latter case here, too?
| if ( | ||
| isinstance(var_data, dict) | ||
| and "location" in var_data | ||
| and isinstance(var_data["location"], str) |
| max_bit = max(valid_locations) | ||
|
|
||
| # Set instruction width based on maximum bit position | ||
| width = max(valid_locations) + 1 |
There was a problem hiding this comment.
I'm guessing you meant to use max_bit here? (Otherwise, it is never used.) So, either remove the assignment above, or:
Suggested change
| width = max(valid_locations) + 1 | |
| width = max_bit + 1 |
This was referenced Sep 17, 2025
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.
UDB currently allows for 2 schemas for instructions with the on-going sub-type development. Some instructions now use a 'format' field with 'opcodes' instead of the traditional 'encoding' field with 'match' and 'variables'. This caused generators to fail when processing these instructions as they couldn't extract the bit pattern matching information.
Changes:
The fix ensures generators can process the complete UDB instruction set regardless of which schema format individual instructions use.