Skip to content

Commit 1cacf25

Browse files
committed
update to svd-rs 0.14.11
1 parent dac8766 commit 1cacf25

File tree

4 files changed

+16
-24
lines changed

4 files changed

+16
-24
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
1515
- Some fixes for the `svd2rust-regress` tool and update of its documentation
1616
- Other internal clippy fixes for `clippy::manual_div_ceil`, `clippy::nonminimal_bool` and
1717
`clippy::needless_lifetimes`
18+
- Update `svd-rs` to 0.14.11
1819

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

Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ url = { version = "2.5", features = ["serde"] }
5858

5959
[dependencies.svd-parser]
6060
features = ["expand"]
61-
version = "0.14.7"
61+
version = "0.14.8"
6262

6363
[dependencies.svd-rs]
6464
features = ["serde"]
65-
version = "0.14.9"
65+
version = "0.14.11"
6666

6767
[dependencies.syn]
6868
version = "2.0"

src/generate/register.rs

+9-18
Original file line numberDiff line numberDiff line change
@@ -1341,24 +1341,15 @@ pub fn fields(
13411341
});
13421342
}
13431343

1344-
// Update register modify bit masks
1345-
let offsets = match f {
1346-
MaybeArray::Array(info, dim) => (0..dim.dim)
1347-
.map(|i| i * dim.dim_increment + info.bit_offset())
1348-
.collect(),
1349-
MaybeArray::Single(info) => vec![info.bit_offset()],
1350-
};
1351-
for o in offsets {
1352-
let bitmask = (u64::MAX >> (64 - width)) << o;
1353-
use ModifiedWriteValues::*;
1354-
match mwv {
1355-
Modify | Set | Clear => {}
1356-
OneToSet | OneToClear | OneToToggle => {
1357-
one_to_modify_fields_bitmap |= bitmask;
1358-
}
1359-
ZeroToClear | ZeroToSet | ZeroToToggle => {
1360-
zero_to_modify_fields_bitmap |= bitmask;
1361-
}
1344+
let bitmask = f.bitmask();
1345+
use ModifiedWriteValues::*;
1346+
match mwv {
1347+
Modify | Set | Clear => {}
1348+
OneToSet | OneToClear | OneToToggle => {
1349+
one_to_modify_fields_bitmap |= bitmask;
1350+
}
1351+
ZeroToClear | ZeroToSet | ZeroToToggle => {
1352+
zero_to_modify_fields_bitmap |= bitmask;
13621353
}
13631354
}
13641355
}

0 commit comments

Comments
 (0)