Skip to content
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

Add utils for search fdt and find a node in fdt & Refactor to merge cursor type #8

Merged
merged 10 commits into from
Nov 14, 2024
Merged

Add utils for search fdt and find a node in fdt & Refactor to merge cursor type #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5f39afe
fix: write StructDeserializer.cursor
woshiluo Oct 29, 2024
2865dd1
feat: add utils for search fdt and find a node in fdt
woshiluo Oct 29, 2024
a76362d
fix: clippy
woshiluo Oct 29, 2024
c88622a
fix: remove redundant trait
woshiluo Oct 29, 2024
833ef96
refactor: merge BorrowedValueDeserializer and StructDeserializer as V…
woshiluo Oct 29, 2024
55143de
feat: add StructAcessType to ensure access type
woshiluo Oct 31, 2024
6b98e91
refactor: rewrite NodeSeq
woshiluo Oct 31, 2024
b7b58c2
feat: add test from qemu-virt
woshiluo Oct 31, 2024
57e84b1
refactor: split StructAccess
woshiluo Oct 31, 2024
720a12b
fix: wrong at item of NodeSeqItem
woshiluo Nov 5, 2024
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
655 changes: 655 additions & 0 deletions examples/hifive-unmatched-a00.dts
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ where

let total_size = u32::from_be(header.total_size);
let raw_data_len = (total_size - HEADER_LEN) as usize;
let ans_ptr = core::ptr::from_raw_parts(ptr as *const u8, raw_data_len);
let ans_ptr = core::ptr::from_raw_parts(ptr, raw_data_len);
let device_tree: &DeviceTree = &*ans_ptr;
let tags = device_tree.tags();
let mut d = Deserializer {
Expand Down
61 changes: 3 additions & 58 deletions src/de_mut/cursor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ pub(super) struct AnyCursor<T: Type = Body>(usize, PhantomData<T>);

pub(super) type BodyCursor = AnyCursor<Body>;
pub(super) type TitleCursor = AnyCursor<Title>;
pub(super) type GroupCursor = AnyCursor<Group>;
pub(super) type PropCursor = AnyCursor<Prop>;

pub(super) trait Type {}
Expand All @@ -17,13 +16,10 @@ pub(super) struct Body {}
#[derive(Clone, Copy, Debug)]
pub(super) struct Title {}
#[derive(Clone, Copy, Debug)]
pub(super) struct Group {}
#[derive(Clone, Copy, Debug)]
pub(super) struct Prop {}

impl Type for Body {}
impl Type for Title {}
impl Type for Group {}
impl Type for Prop {}

pub enum MoveResult {
Expand Down Expand Up @@ -107,7 +103,7 @@ impl BodyCursor {
self.0 += 1;
MoveResult::Others
}
_ => todo!(),
_ => todo!("unknown block {}", structure[self.0]),
}
}

Expand Down Expand Up @@ -149,10 +145,10 @@ impl TitleCursor {
}

/// 生成组光标。
pub fn take_group_on(&self, dtb: RefDtb, name: &str) -> (GroupCursor, usize, BodyCursor) {
pub fn take_group_on(&self, dtb: RefDtb, name: &str) -> (BodyCursor, usize, BodyCursor) {
let name_bytes = name.as_bytes();
let name_skip = align(name_bytes.len() + 1, BLOCK_LEN);
let group = AnyCursor::<Group>(self.0, PhantomData);
let group = AnyCursor::<Body>(self.0, PhantomData);

let mut body = AnyCursor::<Body>(self.0 + 1 + name_skip, PhantomData);
let mut len = 1;
Expand Down Expand Up @@ -194,57 +190,6 @@ impl TitleCursor {
}
}

impl GroupCursor {
/// 读取缓存的下一项偏移。
pub fn offset_on(&self, dtb: RefDtb) -> usize {
(dtb.borrow().structure[self.0].0 >> 8) as _
}

/// 利用缓存的名字长度取出名字。
pub fn name_on<'a>(&self, dtb: RefDtb<'a>) -> (&'a [u8], BodyCursor) {
let structure = &dtb.borrow().structure;
let len_name = (structure[self.0].0 & 0xff) as usize;
let bytes = structure[self.0 + 1].lead_slice(len_name);
(
bytes,
AnyCursor(self.0 + 1 + align(len_name + 1, BLOCK_LEN), PhantomData),
)
}

/// 初始化组反序列化。
pub fn init_on(&self, dtb: RefDtb, len_item: usize, len_name: usize) {
let mut body = AnyCursor::<Body>(self.0, PhantomData);
for _ in 0..len_item {
let current = body.0;
let len_total = dtb.borrow().structure[current + 1]
.lead_slice(u16::MAX as _)
.iter()
.enumerate()
.skip(len_name + 1)
.find(|(_, b)| **b == b'\0')
.map(|(i, _)| i)
.unwrap();
body.step_n(align(len_total, BLOCK_LEN));
body.skip_str_on(dtb);
body.escape_from(dtb);
let off_next = body.0 - current;
dtb.borrow_mut().structure[current].0 = (off_next << 8 | len_total) as _;
}
}

/// 组结构恢复原状。
pub fn drop_on(&self, dtb: RefDtb, len_item: usize) {
use StructureBlock as B;
let structure = &mut *dtb.borrow_mut().structure;
let mut i = self.0;
for _ in 0..len_item {
let offset = (structure[i].0 >> 8) as usize;
structure[i] = B::NODE_BEGIN;
i += offset;
}
}
}

impl PropCursor {
pub fn name_on<'a>(&self, dtb: RefDtb<'a>) -> (&'a str, BodyCursor) {
let dtb = dtb.borrow();
Expand Down
Loading