From bc39bddd5fd66037bc524bb7c824230fbb249e01 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Thu, 29 Aug 2024 22:08:36 +0200 Subject: [PATCH] elf: remove isDebugSection helper --- src/link/Elf.zig | 97 +++++++++++++++--------------------- src/link/Elf/ZigObject.zig | 4 +- src/link/Elf/relocatable.zig | 24 ++++----- 3 files changed, 54 insertions(+), 71 deletions(-) diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 180314918f..d44892836c 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -3572,8 +3572,10 @@ fn updateSectionSizes(self: *Elf) !void { if (self.requiresThunks() and shdr.sh_flags & elf.SHF_EXECINSTR != 0) continue; if (self.zigObjectPtr()) |zo| blk: { const sym_index = for ([_]?Symbol.Index{ - zo.data_index, + zo.text_index, + zo.rodata_index, zo.data_relro_index, + zo.data_index, zo.bss_index, }) |maybe_idx| { if (maybe_idx) |idx| break idx; @@ -3913,8 +3915,10 @@ pub fn allocateAllocSections(self: *Elf) !void { if (self.zigObjectPtr()) |zo| blk: { const existing_size = for ([_]?Symbol.Index{ - zo.data_index, + zo.text_index, + zo.rodata_index, zo.data_relro_index, + zo.data_index, zo.eh_frame_index, }) |maybe_sym_index| { const sect_sym_index = maybe_sym_index orelse continue; @@ -3954,27 +3958,27 @@ pub fn allocateNonAllocSections(self: *Elf) !void { shdr.sh_size = 0; const new_offset = try self.findFreeSpace(needed_size, shdr.sh_addralign); - if (self.isDebugSection(@intCast(shndx))) { + if (self.zigObjectPtr()) |zo| blk: { + const existing_size = for ([_]?Symbol.Index{ + zo.debug_info_index, + zo.debug_abbrev_index, + zo.debug_aranges_index, + zo.debug_str_index, + zo.debug_line_index, + zo.debug_line_str_index, + zo.debug_loclists_index, + zo.debug_rnglists_index, + }) |maybe_sym_index| { + const sym_index = maybe_sym_index orelse continue; + const sym = zo.symbol(sym_index); + const atom_ptr = sym.atom(self).?; + if (atom_ptr.output_section_index == shndx) break atom_ptr.size; + } else break :blk; log.debug("moving {s} from 0x{x} to 0x{x}", .{ self.getShString(shdr.sh_name), shdr.sh_offset, new_offset, }); - const zo = self.zigObjectPtr().?; - const existing_size = for ([_]Symbol.Index{ - zo.debug_info_index.?, - zo.debug_abbrev_index.?, - zo.debug_aranges_index.?, - zo.debug_str_index.?, - zo.debug_line_index.?, - zo.debug_line_str_index.?, - zo.debug_loclists_index.?, - zo.debug_rnglists_index.?, - }) |sym_index| { - const sym = zo.symbol(sym_index); - const atom_ptr = sym.atom(self).?; - if (atom_ptr.output_section_index == shndx) break atom_ptr.size; - } else 0; const amt = try self.base.file.?.copyRangeAll( shdr.sh_offset, self.base.file.?, @@ -4068,35 +4072,28 @@ fn writeAtoms(self: *Elf) !void { log.debug("writing atoms in '{s}' section", .{self.getShString(shdr.sh_name)}); // TODO really, really handle debug section separately - const base_offset = if (self.isDebugSection(@intCast(shndx))) base_offset: { - const zo = self.zigObjectPtr().?; - for ([_]Symbol.Index{ - zo.debug_info_index.?, - zo.debug_abbrev_index.?, - zo.debug_aranges_index.?, - zo.debug_str_index.?, - zo.debug_line_index.?, - zo.debug_line_str_index.?, - zo.debug_loclists_index.?, - zo.debug_rnglists_index.?, - }) |sym_index| { + const base_offset = if (self.zigObjectPtr()) |zo| base_offset: { + for ([_]?Symbol.Index{ + zo.text_index, + zo.rodata_index, + zo.data_relro_index, + zo.data_index, + zo.eh_frame_index, + zo.debug_info_index, + zo.debug_abbrev_index, + zo.debug_aranges_index, + zo.debug_str_index, + zo.debug_line_index, + zo.debug_line_str_index, + zo.debug_loclists_index, + zo.debug_rnglists_index, + }) |maybe_sym_index| { + const sym_index = maybe_sym_index orelse continue; const sym = zo.symbol(sym_index); const atom_ptr = sym.atom(self).?; if (atom_ptr.output_section_index == shndx) break :base_offset atom_ptr.size; } break :base_offset 0; - } else if (self.zigObjectPtr()) |zo| base_offset: { - const sym_index = for ([_]?Symbol.Index{ - zo.data_index, - zo.data_relro_index, - zo.eh_frame_index, - }) |maybe_idx| { - if (maybe_idx) |idx| break idx; - } else break :base_offset 0; - const sym = zo.symbol(sym_index); - const atom_ptr = sym.atom(self).?; - if (atom_ptr.output_section_index == @as(u32, @intCast(shndx))) break :base_offset atom_ptr.size; - break :base_offset 0; } else 0; const sh_offset = shdr.sh_offset + base_offset; const sh_size = math.cast(usize, shdr.sh_size - base_offset) orelse return error.Overflow; @@ -4799,22 +4796,6 @@ pub fn isEffectivelyDynLib(self: Elf) bool { }; } -pub fn isDebugSection(self: Elf, shndx: u32) bool { - inline for (&[_]?u32{ - self.debug_info_section_index, - self.debug_abbrev_section_index, - self.debug_str_section_index, - self.debug_aranges_section_index, - self.debug_line_section_index, - self.debug_line_str_section_index, - self.debug_loclists_section_index, - self.debug_rnglists_section_index, - }) |index| { - if (index == shndx) return true; - } - return false; -} - pub fn addPhdr(self: *Elf, opts: struct { type: u32 = 0, flags: u32 = 0, diff --git a/src/link/Elf/ZigObject.zig b/src/link/Elf/ZigObject.zig index 39df4b78cc..0173ffb40b 100644 --- a/src/link/Elf/ZigObject.zig +++ b/src/link/Elf/ZigObject.zig @@ -52,8 +52,8 @@ debug_rnglists_section_dirty: bool = false, eh_frame_section_dirty: bool = false, text_index: ?Symbol.Index = null, -data_relro_index: ?Symbol.Index = null, rodata_index: ?Symbol.Index = null, +data_relro_index: ?Symbol.Index = null, data_index: ?Symbol.Index = null, bss_index: ?Symbol.Index = null, eh_frame_index: ?Symbol.Index = null, @@ -2003,6 +2003,8 @@ fn allocateAtom(self: *ZigObject, atom_ptr: *Atom, elf_file: *Elf) !void { shdr.sh_addralign = @max(shdr.sh_addralign, atom_ptr.alignment.toByteUnits().?); const sect_atom_ptr = for ([_]?Symbol.Index{ + self.text_index, + self.rodata_index, self.data_index, self.data_relro_index, }) |maybe_sym_index| { diff --git a/src/link/Elf/relocatable.zig b/src/link/Elf/relocatable.zig index 8f5ea8e25b..4397bc2ca3 100644 --- a/src/link/Elf/relocatable.zig +++ b/src/link/Elf/relocatable.zig @@ -436,18 +436,18 @@ fn writeAtoms(elf_file: *Elf) !void { log.debug("writing atoms in '{s}' section", .{elf_file.getShString(shdr.sh_name)}); // TODO really, really handle debug section separately - const base_offset = if (elf_file.isDebugSection(@intCast(shndx))) blk: { - const zo = elf_file.zigObjectPtr().?; - break :blk for ([_]Symbol.Index{ - zo.debug_info_index.?, - zo.debug_abbrev_index.?, - zo.debug_aranges_index.?, - zo.debug_str_index.?, - zo.debug_line_index.?, - zo.debug_line_str_index.?, - zo.debug_loclists_index.?, - zo.debug_rnglists_index.?, - }) |sym_index| { + const base_offset = if (elf_file.zigObjectPtr()) |zo| blk: { + break :blk for ([_]?Symbol.Index{ + zo.debug_info_index, + zo.debug_abbrev_index, + zo.debug_aranges_index, + zo.debug_str_index, + zo.debug_line_index, + zo.debug_line_str_index, + zo.debug_loclists_index, + zo.debug_rnglists_index, + }) |maybe_sym_index| { + const sym_index = maybe_sym_index orelse continue; const sym = zo.symbol(sym_index); const atom_ptr = sym.atom(elf_file).?; if (atom_ptr.output_section_index == shndx) break atom_ptr.size;