Skip to content

Commit

Permalink
Merge pull request #7443 from kubkon/bump-object-dep
Browse files Browse the repository at this point in the history 
Bump object dependency to latest (0.36.7)
  • Loading branch information
@Anton-4
Anton-4 authored Dec 31, 2024
2 parents 275b2af + 19dc28a commit f662f29
Show file tree
Hide file tree
Showing 5 changed files with 173 additions and 119 deletions.
42 changes: 33 additions & 9 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ repository = "https://github.com/roc-lang/roc"
version = "0.0.1"

[workspace.dependencies]
object = { version = "0.32.2", default-features = false, features = [
object = { version = "0.36.7", default-features = false, features = [
"read",
"write",
] }
Expand Down
129 changes: 66 additions & 63 deletions crates/compiler/gen_dev/src/object_builder.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ use bumpalo::collections::Vec;
use object::write::{self, SectionId, SymbolId};
use object::write::{Object, StandardSection, StandardSegment, Symbol, SymbolSection};
use object::{
Architecture, BinaryFormat, Endianness, RelocationEncoding, RelocationKind, SectionKind,
SymbolFlags, SymbolKind, SymbolScope,
Architecture, BinaryFormat, Endianness, RelocationEncoding, RelocationFlags, RelocationKind,
SectionKind, SymbolFlags, SymbolKind, SymbolScope,
};
use roc_collections::all::MutMap;
use roc_error_macros::internal_error;
Expand Down Expand Up @@ -245,11 +245,11 @@ fn generate_roc_panic<'a, B: Backend<'a>>(backend: &mut B, output: &mut Object)
// 0000000000000700: R_AARCH64_ADR_PREL_PG_HI21 .rodata+0x650
let relocation = write::Relocation {
offset: offset + proc_offset,
size: 21,
kind: RelocationKind::Elf(object::elf::R_AARCH64_ADR_PREL_PG_HI21),
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: 0,
flags: write::RelocationFlags::Elf {
r_type: object::elf::R_AARCH64_ADR_PREL_PG_HI21,
},
};

output.add_relocation(text_section, relocation).unwrap();
Expand All @@ -258,25 +258,24 @@ fn generate_roc_panic<'a, B: Backend<'a>>(backend: &mut B, output: &mut Object)
// 0000000000000704: R_AARCH64_ADD_ABS_LO12_NC .rodata+0x650
write::Relocation {
offset: offset + proc_offset + 4,
size: 12,
kind: RelocationKind::Elf(object::elf::R_AARCH64_ADD_ABS_LO12_NC),
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: 0,
flags: write::RelocationFlags::Elf {
r_type: object::elf::R_AARCH64_ADD_ABS_LO12_NC,
},
}
} else if cfg!(all(target_arch = "aarch64", target_os = "macos")) {
// 4dc: 90000001 adrp x1, 0x0 <ltmp0>
// 00000000000004dc: ARM64_RELOC_PAGE21 ___unnamed_6
let relocation = write::Relocation {
offset: offset + proc_offset,
size: 32,
kind: RelocationKind::MachO {
value: object::macho::ARM64_RELOC_PAGE21,
relative: true,
},
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: 0,
flags: write::RelocationFlags::MachO {
r_type: object::macho::ARM64_RELOC_PAGE21,
r_pcrel: true,
r_length: 2,
},
};

output.add_relocation(text_section, relocation).unwrap();
Expand All @@ -285,23 +284,24 @@ fn generate_roc_panic<'a, B: Backend<'a>>(backend: &mut B, output: &mut Object)
// 00000000000004e0: ARM64_RELOC_PAGEOFF12 ___unnamed_6
write::Relocation {
offset: offset + proc_offset + 4,
size: 32,
kind: RelocationKind::MachO {
value: object::macho::ARM64_RELOC_PAGEOFF12,
relative: false,
},
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: 0,
flags: write::RelocationFlags::MachO {
r_type: object::macho::ARM64_RELOC_PAGEOFF12,
r_pcrel: false,
r_length: 2,
},
}
} else {
write::Relocation {
offset: offset + proc_offset,
size: 32,
kind: RelocationKind::GotRelative,
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: -4,
flags: write::RelocationFlags::Generic {
kind: RelocationKind::GotRelative,
encoding: RelocationEncoding::Generic,
size: 32,
},
}
}
} else {
Expand Down Expand Up @@ -383,45 +383,46 @@ fn generate_wrapper<'a, B: Backend<'a>>(
}

fn create_relocation(target: Target, symbol: SymbolId, offset: u64) -> write::Relocation {
let (encoding, size, addend, kind) = match target.architecture() {
let (flags, addend) = match target.architecture() {
roc_target::Architecture::Aarch32 => todo!(),
roc_target::Architecture::Aarch64 => {
if cfg!(target_os = "macos") {
(
RelocationEncoding::Generic,
26,
0,
RelocationKind::MachO {
value: 2,
relative: true,
RelocationFlags::MachO {
r_type: object::macho::ARM64_RELOC_BRANCH26,
r_pcrel: true,
r_length: 2,
},
0,
)
} else {
(
RelocationEncoding::AArch64Call,
26,
RelocationFlags::Generic {
kind: RelocationKind::PltRelative,
encoding: RelocationEncoding::AArch64Call,
size: 26,
},
0,
RelocationKind::PltRelative,
)
}
}
roc_target::Architecture::Wasm32 => todo!(),
roc_target::Architecture::X86_32 => todo!(),
roc_target::Architecture::X86_64 => (
RelocationEncoding::X86Branch,
32,
RelocationFlags::Generic {
kind: RelocationKind::PltRelative,
encoding: RelocationEncoding::X86Branch,
size: 32,
},
-4,
RelocationKind::PltRelative,
),
};

write::Relocation {
offset,
size,
kind,
encoding,
symbol,
addend,
flags,
}
}

Expand Down Expand Up @@ -957,11 +958,13 @@ fn build_proc<'a, B: Backend<'a>>(
output.add_symbol_data(data_id, data_section, data, 4);
write::Relocation {
offset: offset + proc_offset,
size: 32,
kind: RelocationKind::Relative,
encoding: RelocationEncoding::Generic,
symbol: data_id,
addend: -4,
flags: RelocationFlags::Generic {
kind: RelocationKind::Relative,
encoding: RelocationEncoding::Generic,
size: 32,
},
}
}
Relocation::LinkedData { offset, name } => {
Expand All @@ -973,11 +976,11 @@ fn build_proc<'a, B: Backend<'a>>(
// 0000000000000700: R_AARCH64_ADR_PREL_PG_HI21 .rodata+0x650
let r = write::Relocation {
offset: proc_offset + offset,
size: 21,
kind: RelocationKind::Elf(object::elf::R_AARCH64_ADR_PREL_PG_HI21),
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: -4,
flags: RelocationFlags::Elf {
r_type: object::elf::R_AARCH64_ADR_PREL_PG_HI21,
},
};

relocations.push((section_id, r));
Expand All @@ -986,25 +989,24 @@ fn build_proc<'a, B: Backend<'a>>(
// 0000000000000704: R_AARCH64_ADD_ABS_LO12_NC .rodata+0x650
write::Relocation {
offset: proc_offset + offset + 4,
size: 12,
kind: RelocationKind::Elf(object::elf::R_AARCH64_ADD_ABS_LO12_NC),
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: 0,
flags: RelocationFlags::Elf {
r_type: object::elf::R_AARCH64_ADD_ABS_LO12_NC,
},
}
} else if cfg!(all(target_arch = "aarch64", target_os = "macos")) {
// 4ed0: 90000000 adrp x0, 0x4000 <_std.unicode.utf8Decode4+0x16c>
// 0000000000004ed0: ARM64_RELOC_PAGE21 ___unnamed_11
let r = write::Relocation {
offset: proc_offset + offset,
size: 21,
kind: RelocationKind::MachO {
value: object::macho::ARM64_RELOC_PAGE21,
relative: true,
},
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: 0,
flags: RelocationFlags::MachO {
r_type: object::macho::ARM64_RELOC_PAGE21,
r_pcrel: true,
r_length: 2,
},
};

relocations.push((section_id, r));
Expand All @@ -1013,23 +1015,24 @@ fn build_proc<'a, B: Backend<'a>>(
// 0000000000004ed4: ARM64_RELOC_PAGEOFF12 ___unnamed_11
write::Relocation {
offset: proc_offset + offset + 4,
size: 12,
kind: RelocationKind::MachO {
value: object::macho::ARM64_RELOC_PAGEOFF12,
relative: false,
},
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: 0,
flags: RelocationFlags::MachO {
r_type: object::macho::ARM64_RELOC_PAGEOFF12,
r_pcrel: false,
r_length: 2,
},
}
} else {
write::Relocation {
offset: offset + proc_offset,
size: 32,
kind: RelocationKind::GotRelative,
encoding: RelocationEncoding::Generic,
symbol: sym_id,
addend: -4,
flags: RelocationFlags::Generic {
kind: RelocationKind::GotRelative,
encoding: RelocationEncoding::Generic,
size: 32,
},
}
}
} else {
Expand Down
Loading

0 comments on commit f662f29

Please sign in to comment.