Noratrieb/rustv32i
1
0
Fork 0
mirror of https://github.com/Noratrieb/rustv32i.git synced 2026-01-14 21:35:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

make it work

Browse source
This commit is contained in:
nora 2025-03-08 23:24:17 +01:00
parent 29bb73425b
commit ab8e4ebc13
10 changed files with 608 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/elf.rs
View file

@ -4,6 +4,7 @@ pub struct Elf {
pub content: Vec<u8>,
}
#[expect(dead_code)]
#[derive(Debug)]
pub struct Header {
pub e_entry: u32,
@ -18,6 +19,7 @@ pub struct Header {
pub e_shstrndx: u16,
}
#[expect(dead_code)]
#[derive(Debug)]
pub struct Phdr {
pub p_type: u32,
@ -42,9 +44,9 @@ impl Elf {
}
let (e_type, rest) = rest.split_u16()?;
// ET_EXEC
if e_type != 2 {
bail!("not a static executable: {e_type}");
// ET_EXEC|ET_DYN
if e_type != 2 && e_type != 3 {
bail!("not an executable: {e_type}");
}
let (e_machine, rest) = rest.split_u16()?;
@ -121,7 +123,6 @@ pub trait SplitAtCheckedErr {
fn split_bytes(&self, split: usize) -> Result<(&[u8], &[u8])>;
fn split_u16(&self) -> Result<(u16, &[u8])>;
fn split_u32(&self) -> Result<(u32, &[u8])>;
fn split_u64(&self) -> Result<(u64, &[u8])>;
}
impl SplitAtCheckedErr for [u8] {
fn split_bytes(&self, mid: usize) -> Result<(&[u8], &[u8])> {
@ -138,8 +139,4 @@ impl SplitAtCheckedErr for [u8] {
let (bytes, rest) = self.split_bytes(4)?;
Ok((u32::from_le_bytes(bytes.try_into().unwrap()), rest))
}
fn split_u64(&self) -> Result<(u64, &[u8])> {
let (bytes, rest) = self.split_bytes(8)?;
Ok((u64::from_le_bytes(bytes.try_into().unwrap()), rest))
}
}