pca006132
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dyld: keep exidx p_vaddr as it is contained in LOAD sections already 

should fix Gitea issue #17
core0-buffer
Astro 2020-06-25 02:03:29 +02:00
parent 571ab66114
commit 654d65a6d5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libdyld/src/lib.rs
View File

@ -3,7 +3,7 @@
extern crate alloc; extern crate alloc;
extern crate log; extern crate log;
use core::{fmt, str, convert}; use core::{ops::Range, convert, fmt, str};
use alloc::{borrow::ToOwned, string::String, vec::Vec}; use alloc::{borrow::ToOwned, string::String, vec::Vec};
use log::{debug, trace}; use log::{debug, trace};
use elf::*; use elf::*;
@ -60,7 +60,7 @@ fn elf_hash(name: &[u8]) -> u32 {
pub struct Library { pub struct Library {
pub image: Image, pub image: Image,
dyn_section: DynamicSection, dyn_section: DynamicSection,
pub exidx: Vec<u8>, exidx: Range<usize>,
} }
impl Library { impl Library {
@ -130,6 +130,10 @@ impl Library {
Ok(self.strtab().get(offset..offset + size) Ok(self.strtab().get(offset..offset + size)
.ok_or("cannot read symbol name")?) .ok_or("cannot read symbol name")?)
} }
pub fn exidx(&self) -> &[usize] {
self.image.get_ref_slice_unchecked(&self.exidx)
}
} }
pub fn load( pub fn load(
@ -184,9 +188,8 @@ pub fn load(
dst.copy_from_slice(src); dst.copy_from_slice(src);
} }
PT_ARM_EXIDX => { PT_ARM_EXIDX => {
let src = file.get(file_range) exidx = Some(phdr.p_vaddr as usize..
.ok_or("program header requests an out of bounds load (in file)")?; (phdr.p_vaddr + phdr.p_filesz) as usize);
exidx = Some(src.to_owned());
} }
_ => {} _ => {}
} }