itsscb/espflash
1
0
Fork 0
mirror of https://github.com/esp-rs/espflash.git synced 2026-04-17 20:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix segment merging (#839)

Browse Source
This commit is contained in:
Dániel Buga
2025-04-09 14:36:11 +02:00
committed by GitHub
parent 79bbd67fa1
commit 37f28f6ba0
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
espflash/src/image_format/esp_idf.rs
View File

@@ -572,14 +572,25 @@ fn merge_adjacent_segments(mut segments: Vec<Segment<'_>>) -> Vec<Segment<'_>> {
let mut merged: Vec<Segment<'_>> = Vec::with_capacity(segments.len());
for segment in segments {
match merged.last_mut() {
Some(last) if last.addr + last.size() == segment.addr => {
if let Some(last) = merged.last_mut() {
let last_end = last.addr + last.size();
if last_end == segment.addr {
*last += segment.data();
continue;
}
_ => {
merged.push(segment);
// There is some space between the segments. We can merge them if they would
// either be contiguous, or overlap, if the first segment was 4-byte
// aligned.
let max_padding = (4 - last_end % 4) % 4;
if last_end + max_padding >= segment.addr {
*last += &[0u8; 4][..(segment.addr - last_end) as usize];
*last += segment.data();
continue;
}
}
merged.push(segment)
}
merged
@@ -681,4 +692,18 @@ mod tests {
assert_eq!(encode_hex(&[222u8, 202, 251, 173]), "decafbad");
}
#[test]
fn merge_adjacent_segments_pads() {
let segments = vec![
Segment::new(0x1000, &[0u8; 0x100]),
Segment::new(0x1100, &[0u8; 0xFF]),
Segment::new(0x1200, &[0u8; 0x100]),
];
let merged = merge_adjacent_segments(segments);
assert_eq!(merged.len(), 1);
assert_eq!(merged[0].addr, 0x1000);
assert_eq!(merged[0].size(), 0x300);
}
}