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
21 changes: 18 additions & 3 deletions src/ifd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@
// Lowercase helpers are provided through implementations.
#![allow(non_snake_case)]

use std::fmt::{Debug, Display};
use std::{
fmt::{Debug, Display},
ops::Range,
};

use bitfield_struct::bitfield;
use serde::{Deserialize, Serialize};
Expand Down Expand Up @@ -307,8 +310,8 @@ impl FlashRegion {
self.limit() as usize * 4096 + 4095
}

pub fn range(self) -> (usize, usize) {
(self.ba(), self.la() + 1)
pub fn range(self) -> Range<usize> {
self.ba()..self.la() + 1
}
}

Expand Down Expand Up @@ -336,6 +339,18 @@ pub struct Regions {
pub flreg9: FlashRegion,
}

impl Regions {
pub fn ifd_range(&self) -> Range<usize> {
self.flreg0.range()
}
pub fn bios_range(&self) -> Range<usize> {
self.flreg1.range()
}
pub fn me_range(&self) -> Range<usize> {
self.flreg2.range()
}
}

// NOTE: Regions have changed over processors generations.
impl Display for Regions {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ impl Firmware {
let ifd = IFD::parse(&data);
let me = match &ifd {
Ok(ifd) => {
let me_region = ifd.regions.flreg2.range();
let (b, l) = me_region;
let me_region = ifd.regions.me_range();
let b = me_region.start;
info!("ME region start @ {b:08x}");
ME::parse(&data[b..l], b, debug)
ME::parse(&data[me_region], b, debug)
}
Err(e) => {
warn!("Not a full image: {e:?}");
Expand Down