motiejus/zig
1
Fork 0
Code Releases Activity

elf: drastically simplify extracting section size logic

Browse Source
This commit is contained in:
Jakub Konka
2024-10-03 17:04:15 +02:00
committed by Andrew Kelley
parent 0e5cd112ef
commit 3d315f45d8
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/link/Elf.zig
View File

@@ -3868,22 +3868,7 @@ pub fn allocateAllocSections(self: *Elf) !void {
if (shdr.sh_offset > 0) {
// Get size actually commited to the output file.
const existing_size = if (self.zigObjectPtr()) |zo| for ([_]?Symbol.Index{
zo.text_index,
zo.rodata_index,
zo.data_relro_index,
zo.data_index,
zo.tdata_index,
zo.eh_frame_index,
}) |maybe_sym_index| {
const sect_sym_index = maybe_sym_index orelse continue;
const sect_atom_ptr = zo.symbol(sect_sym_index).atom(self).?;
if (sect_atom_ptr.output_section_index != shndx) continue;
break sect_atom_ptr.size;
} else 0 else 0 + if (!slice.items(.atom_list_2)[shndx].dirty)
slice.items(.atom_list_2)[shndx].size
else
0;
const existing_size = self.sectionSize(shndx);
const amt = try self.base.file.?.copyRangeAll(
shdr.sh_offset,
self.base.file.?,
@@ -5682,6 +5667,12 @@ const Section = struct {
free_list: std.ArrayListUnmanaged(Ref) = .empty,
};
pub fn sectionSize(self: *Elf, shndx: u32) u64 {
const last_atom_ref = self.sections.items(.last_atom)[shndx];
const atom_ptr = self.atom(last_atom_ref) orelse return 0;
return @as(u64, @intCast(atom_ptr.value)) + atom_ptr.size;
}
fn defaultEntrySymbolName(cpu_arch: std.Target.Cpu.Arch) []const u8 {
return switch (cpu_arch) {
.mips, .mipsel, .mips64, .mips64el => "__start",