mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 08:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf: actually allocate atoms within each section chunk

Browse Source
This commit is contained in:
Jakub Konka 2024-09-02 09:08:37 +02:00
parent 6a50a0f0ed
commit 6b53dc9461
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/link/Elf.zig
View File

@ -3505,8 +3505,12 @@ fn resetShdrIndexes(self: *Elf, backlinks: []const u32) void {
}
for (self.objects.items) |index| {
for (self.file(index).?.object.section_chunks.items) |*chunk| {
const object = self.file(index).?.object;
for (object.section_chunks.items) |*chunk| {
chunk.output_section_index = backlinks[chunk.output_section_index];
for (chunk.atoms.items) |atom_index| {
object.atom(atom_index).?.output_section_index = chunk.output_section_index;
}
}
}

8
src/link/Elf/Object.zig
View File

@ -975,6 +975,12 @@ pub fn allocateAtoms(self: *Object, elf_file: *Elf) !void {
shdr.sh_addralign = @max(shdr.sh_addralign, chunk.alignment.toByteUnits().?);
// TODO create back and forward links
// TODO if we had a link from Atom to parent Chunk we would not need to update Atom's value or osec index
for (chunk.atoms.items) |atom_index| {
const atom_ptr = self.atom(atom_index).?;
atom_ptr.output_section_index = chunk.output_section_index;
atom_ptr.value += chunk.value;
}
}
}
@ -1008,7 +1014,7 @@ pub fn writeAtoms(self: *Object, elf_file: *Elf) !void {
const atom_ptr = self.atom(atom_index).?;
assert(atom_ptr.alive);
const offset = math.cast(usize, atom_ptr.value) orelse return error.Overflow;
const offset = math.cast(usize, atom_ptr.value - chunk.value) orelse return error.Overflow;
const size = math.cast(usize, atom_ptr.size) orelse return error.Overflow;
log.debug(" * atom({d}) at 0x{x}", .{ atom_index, chunk.offset(elf_file) + offset });