Make signals_to_port_fields patch work for newer PORT registerblocks
#10
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
Rahix
reviewed
Nov 14, 2020
Rahix
changed the title
signals_to_port_fields patch work for newer PORT registerblocks
Co-authored-by: Rahix <rahix@rahix.de>
|
After this change still getting warnings. Description probably can be fixed with info. from |
|
Warnings are normal, the ATDF files are riddled with these minor issues ... What stands out to me is the We need to investigate where that comes from. Edit: This change should give you more information about what is happening: diff --git a/src/atdf/mod.rs b/src/atdf/mod.rs
index 85b959255cef..f8fb797f387d 100644
--- a/src/atdf/mod.rs
+++ b/src/atdf/mod.rs
@@ -13,7 +13,7 @@ pub fn parse<R: std::io::Read>(r: R) -> crate::Result<crate::chip::Chip> {
let mut chip = chip::parse(&tree)?;
patch::signals_to_port_fields(&mut chip, &tree)
- .unwrap_or_else(|_| log::warn!("Could not apply 'signals_to_port_fields' patch!"));
+ .unwrap_or_else(|e| crate::cli::exit_with_error(e));
patch::remove_unsafe_cpu_regs(&mut chip, &tree)?;
Ok(chip) |
Rahix
reviewed
Nov 14, 2020
Co-authored-by: Rahix <rahix@rahix.de>
- dead code removal
|
Looks like this lines are problematic
Then we have definition per selected mode eg. |
|
What document is this picture from? AFAIK, we currently do not support nested register groups (#4). But this should not hinder the remaining peripherals from working at least ... |
Rahix
approved these changes
Nov 14, 2020
|
Ok, got it. Error: I can see only |
|
Okay, I think I got it: This line: Line 17 in 52fd47b also matches So it needs to be changed to something like e.g. .filter(|p| p.name.starts_with("PORT") && p.name.len() == 5) This is a bit dirty but I think it'll do the trick for now ... |
|
Maybe we can do same as prev. : list names explicite? |
Rahix
approved these changes
Nov 17, 2020
|
Sorry for the delay, wanted to do some regression tests before merging. All done now, though :) |
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.
Not sure if it's correct way. For visibility. Will be good if anyone from #6 can advice.