Allow optional 'dim_index' if register name contains [%s] #153
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
…the 'dim_index' field isn't required to exist
lucasbrendel
changed the title
|
☔ The latest upstream changes (presumably #158) made this pull request unmergeable. Please resolve the merge conflicts. |
bors bot
added a commit
that referenced
this pull request
Feb 24, 2018
168: Handle missing dimIndex on registers r=japaric a=kevinmehall This supersedes @lucasbrendel's similar PR #153 and fixes #150. Per the [SVD spec](http://arm-software.github.io/CMSIS_5/SVD/html/elem_special.html#dimElementGroup_gr), dimIndex is not required: > By default, \<dimIndex\> is a value starting with 0. > Remark: Do not define \<dimIndex\> when using the placeholder [%s] in \<name\> or \<displayName\>. I interpret this as the element being optional with "%s" and not allowed with "[%s]" (this change does not reject the latter). Atmel SAMD21 SVDs use "%s" with no dimIndex for 0-indexed arrays. This also tests that dimIndex is sequential and numeric in a single pass without allocating temporary vectors, and fixes the typo adresses -> addresses.
bors bot
added a commit
that referenced
this pull request
Feb 24, 2018
168: Handle missing dimIndex on registers r=japaric a=kevinmehall This supersedes @lucasbrendel's similar PR #153 and fixes #150. Per the [SVD spec](http://arm-software.github.io/CMSIS_5/SVD/html/elem_special.html#dimElementGroup_gr), dimIndex is not required: > By default, \<dimIndex\> is a value starting with 0. > Remark: Do not define \<dimIndex\> when using the placeholder [%s] in \<name\> or \<displayName\>. I interpret this as the element being optional with "%s" and not allowed with "[%s]" (this change does not reject the latter). Atmel SAMD21 SVDs use "%s" with no dimIndex for 0-indexed arrays. This also tests that dimIndex is sequential and numeric in a single pass without allocating temporary vectors, and fixes the typo adresses -> addresses.
|
Closing in favor of #168 |
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.
Based on SVD spec if the register name contains '[%s]' in its name then the dim_index field is not required.
I think this is a fix for that situation.
This fixes #150 and should then be able to close #146 as i am able to successfully generate after applying these changes.