Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
- Some fixes for the `svd2rust-regress` tool and update of its documentation
- Other internal clippy fixes for `clippy::manual_div_ceil`, `clippy::nonminimal_bool` and
`clippy::needless_lifetimes`
- Update `svd-rs` to 0.14.11

## [v0.35.0] - 2024-11-12

Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ url = { version = "2.5", features = ["serde"] }

[dependencies.svd-parser]
features = ["expand"]
version = "0.14.7"
version = "0.14.8"

[dependencies.svd-rs]
features = ["serde"]
version = "0.14.9"
version = "0.14.11"

[dependencies.syn]
version = "2.0"
Expand Down
27 changes: 9 additions & 18 deletions src/generate/register.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1341,24 +1341,15 @@ pub fn fields(
});
}

// Update register modify bit masks
let offsets = match f {
MaybeArray::Array(info, dim) => (0..dim.dim)
.map(|i| i * dim.dim_increment + info.bit_offset())
.collect(),
MaybeArray::Single(info) => vec![info.bit_offset()],
};
for o in offsets {
let bitmask = (u64::MAX >> (64 - width)) << o;
use ModifiedWriteValues::*;
match mwv {
Modify | Set | Clear => {}
OneToSet | OneToClear | OneToToggle => {
one_to_modify_fields_bitmap |= bitmask;
}
ZeroToClear | ZeroToSet | ZeroToToggle => {
zero_to_modify_fields_bitmap |= bitmask;
}
let bitmask = f.bitmask();
use ModifiedWriteValues::*;
match mwv {
Modify | Set | Clear => {}
OneToSet | OneToClear | OneToToggle => {
one_to_modify_fields_bitmap |= bitmask;
}
ZeroToClear | ZeroToSet | ZeroToToggle => {
zero_to_modify_fields_bitmap |= bitmask;
}
}
}
Expand Down