language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 16:44:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

rename MySection -> Section

Browse source
This commit is contained in:
Folkert 2022-08-23 14:05:57 +02:00
parent f4a388ce90
commit 597b4752dc
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 21 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

39
crates/linker/src/generate_dylib.rs
View file

@ -11,6 +11,9 @@ use roc_error_macros::internal_error;
// an empty shared library, that we build on top of // an empty shared library, that we build on top of
const DUMMY: &[u8] = include_bytes!("../dummy-elf64-x86-64.so"); const DUMMY: &[u8] = include_bytes!("../dummy-elf64-x86-64.so");
// index of the dynamic section
const DYMAMIC_SECTION: usize = 4;
pub fn generate(custom_names: &[String]) -> Result<Vec<u8>, Box<dyn Error>> { pub fn generate(custom_names: &[String]) -> Result<Vec<u8>, Box<dyn Error>> {
let kind = match object::FileKind::parse(DUMMY) { let kind = match object::FileKind::parse(DUMMY) {
Ok(file) => file, Ok(file) => file,
@ -51,20 +54,20 @@ struct DynamicSymbol {
} }
#[derive(Debug)] #[derive(Debug)]
struct MySection { struct Section {
in_index: usize, in_index: usize,
section: SectionHeader64<object::Endianness>, section: SectionHeader64<object::Endianness>,
} }
struct Sections { struct Sections {
hash: MySection, hash: Section,
gnu_hash: MySection, gnu_hash: Section,
dynsym: MySection, dynsym: Section,
dynstr: MySection, dynstr: Section,
dynamic: MySection, dynamic: Section,
symtab: MySection, symtab: Section,
strtab: MySection, strtab: Section,
shstrtab: MySection, shstrtab: Section,
} }
struct Addresses { struct Addresses {
@ -76,7 +79,7 @@ struct Addresses {
} }
impl Sections { impl Sections {
fn iter(&self) -> impl Iterator<Item = (usize, &'_ MySection)> + '_ { fn iter(&self) -> impl Iterator<Item = (usize, &'_ Section)> + '_ {
[ [
&self.hash, &self.hash,
&self.gnu_hash, &self.gnu_hash,
@ -186,7 +189,7 @@ impl Sections {
// elf::SHT_DYNAMIC // elf::SHT_DYNAMIC
let in_section = &sections.dynamic.section; let in_section = &sections.dynamic.section;
let offset = in_section.sh_offset(endian) as usize + extra_offset; let offset = in_section.sh_offset(endian) as usize + extra_offset;
offsets[4] = round_up_to_alignment(offset, 8); // seems like this needs to be aligned?! offsets[DYMAMIC_SECTION] = round_up_to_alignment(offset, 8); // seems like this needs to be aligned?!
writer.reserve_until(offset); writer.reserve_until(offset);
let dynamic_addr = in_section.sh_addr(endian); let dynamic_addr = in_section.sh_addr(endian);
@ -232,7 +235,7 @@ fn copy_file(in_data: &[u8], custom_names: &[String]) -> Result<Vec<u8>, Box<dyn
.section_by_name(Endianness::Little, name) .section_by_name(Endianness::Little, name)
.unwrap(); .unwrap();
MySection { Section {
in_index, in_index,
section: *section, section: *section,
} }
@ -257,9 +260,9 @@ fn copy_file(in_data: &[u8], custom_names: &[String]) -> Result<Vec<u8>, Box<dyn
let mut in_hash = None; let mut in_hash = None;
let mut in_gnu_hash = None; let mut in_gnu_hash = None;
let mut out_sections_index = Vec::with_capacity(in_sections.len()); let mut out_sections_index = Vec::with_capacity(in_sections.len());
for (_enum_index, my_section) in sections.iter() { for (_enum_index, section) in sections.iter() {
let i = my_section.in_index; let i = section.in_index;
let in_section = &my_section.section; let in_section = &section.section;
let index; let index;
match in_section.sh_type(endian) { match in_section.sh_type(endian) {
@ -350,7 +353,7 @@ fn copy_file(in_data: &[u8], custom_names: &[String]) -> Result<Vec<u8>, Box<dyn
let gnu_hash = Some(elf::gnu_hash(in_name)); let gnu_hash = Some(elf::gnu_hash(in_name));
// .dynamic // .dynamic
let section = Some(out_sections_index[4]); let section = Some(out_sections_index[DYMAMIC_SECTION]);
out_dynsyms.push(DynamicSymbol { out_dynsyms.push(DynamicSymbol {
in_sym: i, in_sym: i,
@ -474,7 +477,7 @@ fn copy_file(in_data: &[u8], custom_names: &[String]) -> Result<Vec<u8>, Box<dyn
p_type: in_segment.p_type(endian), p_type: in_segment.p_type(endian),
p_flags: in_segment.p_flags(endian), p_flags: in_segment.p_flags(endian),
// dirty hack really. Not sure if this is correct on its own // dirty hack really. Not sure if this is correct on its own
p_offset: offsets[4] as _, p_offset: offsets[DYMAMIC_SECTION] as _,
p_vaddr: in_segment.p_vaddr(endian), p_vaddr: in_segment.p_vaddr(endian),
p_paddr: in_segment.p_paddr(endian), p_paddr: in_segment.p_paddr(endian),
p_filesz: in_segment.p_filesz(endian), p_filesz: in_segment.p_filesz(endian),
@ -487,7 +490,7 @@ fn copy_file(in_data: &[u8], custom_names: &[String]) -> Result<Vec<u8>, Box<dyn
p_flags: in_segment.p_flags(endian), p_flags: in_segment.p_flags(endian),
// dirty hack really. Not sure if this is correct on its own // dirty hack really. Not sure if this is correct on its own
p_offset: if in_segment.p_offset(endian) > 0 { p_offset: if in_segment.p_offset(endian) > 0 {
offsets[4] as _ offsets[DYMAMIC_SECTION] as _
} else { } else {
0 0
}, },