From 46cd5e709877e127deafa0b44e397c579ac2ec5b Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 26 Oct 2022 22:21:24 +0800 Subject: [PATCH] tools: elf: allow loading files from &[u8] Instead of assuming everything is a file or a path, allow loading ELF files from u8 slices. This will enable us to create images with `include_bytes!()`. Signed-off-by: Sean Cross --- tools/src/elf.rs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/src/elf.rs b/tools/src/elf.rs index 8c4a88b53..b9dd01320 100644 --- a/tools/src/elf.rs +++ b/tools/src/elf.rs @@ -56,7 +56,11 @@ impl fmt::Display for MiniElfSection { write!( f, "Section {:13} {:6} bytes loading into {:08x}..{:08x} flags: {:?}", - self.name, self.size, self.virt, self.virt + self.size, self.flags + self.name, + self.size, + self.virt, + self.virt + self.size, + self.flags ) } } @@ -133,6 +137,10 @@ pub fn read_program>(filename: P) -> Result Result { let elf = ElfFile::new(&b).map_err(|x| ElfReadError::ParseElfError(x))?; let entry_point = elf.header.pt2.entry_point() as u32; let mut program_data = Cursor::new(Vec::new()); @@ -276,6 +284,10 @@ pub fn read_minielf>(filename: P) -> Result Result { let elf = ElfFile::new(&b).map_err(|x| ElfReadError::ParseElfError(x))?; let entry_point = elf.header.pt2.entry_point() as u32; let mut program_data = Cursor::new(Vec::new());