Skip to content

don't add enums in derived fields #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
burrbull merged 1 commit into from
May 25, 2025
Merged

don't add enums in derived fields #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG-rust.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ This changelog tracks the Rust `svdtools` project. See

## [Unreleased]

* Skip adding `enumeratedValues` & `writeConstraint` to derived fields

## [v0.4.6] 2025-04-03

* Fixed compilation with new `rust`
Expand Down
20 changes: 13 additions & 7 deletions src/patch/register.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,13 +888,17 @@ impl RegisterExt for Register {
set_enum(ftag, evs.clone(), orig_usage, true, access)?;
}
} else {
let (fspec, ignore) = fspec.spec();
let (fspec, mut ignore) = fspec.spec();
let mut offsets: Vec<_> = Vec::new();
let mut width_vals = HashSet::new();
for (i, f) in self.fields().enumerate() {
if matchname(&f.name, fspec) {
offsets.push((f.bit_offset(), f.name.to_string(), i));
width_vals.insert(f.bit_width());
if f.derived_from.is_none() {
offsets.push((f.bit_offset(), f.name.to_string(), i));
width_vals.insert(f.bit_width());
} else {
ignore = true;
}
}
}
if offsets.is_empty() {
Expand Down Expand Up @@ -964,10 +968,12 @@ impl RegisterExt for Register {
let mut set_any = false;
let (fspec, ignore) = fspec.spec();
for ftag in self.iter_fields(fspec) {
ftag.write_constraint = Some(WriteConstraint::Range(WriteConstraintRange {
min: fmod[0].i64()? as u64,
max: fmod[1].i64()? as u64,
}));
if ftag.derived_from.is_none() {
ftag.write_constraint = Some(WriteConstraint::Range(WriteConstraintRange {
min: fmod[0].i64()? as u64,
max: fmod[1].i64()? as u64,
}));
}
set_any = true;
}
if !ignore && !set_any {
Expand Down