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

dwarf: move growing debug_abbrev section to dsym

Browse Source
This commit is contained in:
Jakub Konka 2022-12-08 10:55:23 +01:00
parent 381abcfb7a
commit ecb341a006
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/link/Dwarf.zig
View File

@ -1745,21 +1745,10 @@ pub fn writeDbgAbbrev(self: *Dwarf) !void {
}, },
.macho => { .macho => {
const d_sym = self.bin_file.cast(File.MachO).?.getDebugSymbols().?; const d_sym = self.bin_file.cast(File.MachO).?.getDebugSymbols().?;
const dwarf_segment = d_sym.segments.items[d_sym.dwarf_segment_cmd_index.?]; const sect_index = d_sym.debug_abbrev_section_index.?;
const debug_abbrev_sect = &d_sym.sections.items[d_sym.debug_abbrev_section_index.?]; try d_sym.growSection(sect_index, needed_size);
const allocated_size = d_sym.allocatedSize(debug_abbrev_sect.offset); const sect = d_sym.getSection(sect_index);
if (needed_size > allocated_size) { const file_pos = sect.offset + abbrev_offset;
debug_abbrev_sect.size = 0; // free the space
const offset = d_sym.findFreeSpace(needed_size, 1);
debug_abbrev_sect.offset = @intCast(u32, offset);
debug_abbrev_sect.addr = dwarf_segment.vmaddr + offset - dwarf_segment.fileoff;
}
debug_abbrev_sect.size = needed_size;
log.debug("__debug_abbrev start=0x{x} end=0x{x}", .{
debug_abbrev_sect.offset,
debug_abbrev_sect.offset + needed_size,
});
const file_pos = debug_abbrev_sect.offset + abbrev_offset;
try d_sym.file.pwriteAll(&abbrev_buf, file_pos); try d_sym.file.pwriteAll(&abbrev_buf, file_pos);
}, },
.wasm => { .wasm => {

11
src/link/MachO/DebugSymbols.zig
View File

@ -137,7 +137,6 @@ fn allocateSection(self: *DebugSymbols, sectname: []const u8, size: u64, alignme
off + size, off + size,
}); });
sect.addr = segment.vmaddr + off - segment.fileoff;
sect.offset = @intCast(u32, off); sect.offset = @intCast(u32, off);
const index = @intCast(u8, self.sections.items.len); const index = @intCast(u8, self.sections.items.len);
@ -152,11 +151,13 @@ pub fn growSection(self: *DebugSymbols, sect_index: u8, needed_size: u32) !void
const sect = self.getSectionPtr(sect_index); const sect = self.getSectionPtr(sect_index);
if (needed_size > self.allocatedSize(sect.offset)) { if (needed_size > self.allocatedSize(sect.offset)) {
const existing_size = sect.size;
sect.size = 0; // free the space
const new_offset = self.findFreeSpace(needed_size, 1); const new_offset = self.findFreeSpace(needed_size, 1);
log.debug("moving {s} section: {} bytes from 0x{x} to 0x{x}", .{ log.debug("moving {s} section: {} bytes from 0x{x} to 0x{x}", .{
sect.sectName(), sect.sectName(),
sect.size, existing_size,
sect.offset, sect.offset,
new_offset, new_offset,
}); });
@ -165,9 +166,9 @@ pub fn growSection(self: *DebugSymbols, sect_index: u8, needed_size: u32) !void
sect.offset, sect.offset,
self.file, self.file,
new_offset, new_offset,
sect.size, existing_size,
); );
if (amt != sect.size) return error.InputOutput; if (amt != existing_size) return error.InputOutput;
sect.offset = @intCast(u32, new_offset); sect.offset = @intCast(u32, new_offset);
} }
sect.size = needed_size; sect.size = needed_size;
@ -275,7 +276,6 @@ pub fn flushModule(self: *DebugSymbols, macho_file: *MachO) !void {
} }
{ {
const dwarf_segment = self.getDwarfSegmentPtr();
const debug_strtab_sect = &self.sections.items[self.debug_str_section_index.?]; const debug_strtab_sect = &self.sections.items[self.debug_str_section_index.?];
if (self.debug_string_table_dirty or self.dwarf.strtab.items.len != debug_strtab_sect.size) { if (self.debug_string_table_dirty or self.dwarf.strtab.items.len != debug_strtab_sect.size) {
const allocated_size = self.allocatedSize(debug_strtab_sect.offset); const allocated_size = self.allocatedSize(debug_strtab_sect.offset);
@ -284,7 +284,6 @@ pub fn flushModule(self: *DebugSymbols, macho_file: *MachO) !void {
if (needed_size > allocated_size) { if (needed_size > allocated_size) {
debug_strtab_sect.size = 0; // free the space debug_strtab_sect.size = 0; // free the space
const new_offset = self.findFreeSpace(needed_size, 1); const new_offset = self.findFreeSpace(needed_size, 1);
debug_strtab_sect.addr = dwarf_segment.vmaddr + new_offset - dwarf_segment.fileoff;
debug_strtab_sect.offset = @intCast(u32, new_offset); debug_strtab_sect.offset = @intCast(u32, new_offset);
} }
debug_strtab_sect.size = @intCast(u32, needed_size); debug_strtab_sect.size = @intCast(u32, needed_size);