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

macho: write matching UUID to dSym bundle

Browse Source
This commit is contained in:
Jakub Konka 2020-12-27 10:23:44 +01:00
parent cf94341910
commit a7bae1b857
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/link/MachO.zig
View File

@ -355,7 +355,7 @@ pub fn flushModule(self: *MachO, comp: *Compilation) !void {
if (self.d_sym) |*ds| {
// Flush debug symbols bundle.
try ds.flush();
try ds.flush(self.base.allocator);
}
if (target.cpu.arch == .aarch64) {

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

@ -58,18 +58,51 @@ pub fn populateMissingMetadata(self: *DebugSymbols, allocator: *Allocator) !void
self.header = header;
self.header_dirty = true;
}
if (self.uuid_cmd_index == null) {
const base_cmd = self.base.load_commands.items[self.base.uuid_cmd_index.?];
self.uuid_cmd_index = @intCast(u16, self.load_commands.items.len);
try self.load_commands.append(allocator, base_cmd);
self.header_dirty = true;
self.load_commands_dirty = true;
}
}
pub fn flush(self: *DebugSymbols) !void {
pub fn flush(self: *DebugSymbols, allocator: *Allocator) !void {
try self.writeLoadCommands(allocator);
try self.writeHeader();
assert(!self.header_dirty);
assert(!self.load_commands_dirty);
}
pub fn deinit(self: *DebugSymbols, allocator: *Allocator) void {
for (self.load_commands.items) |*lc| {
lc.deinit(allocator);
}
self.file.close();
}
/// Writes all load commands and section headers.
fn writeLoadCommands(self: *DebugSymbols, allocator: *Allocator) !void {
if (!self.load_commands_dirty) return;
var sizeofcmds: usize = 0;
for (self.load_commands.items) |lc| {
sizeofcmds += lc.cmdsize();
}
var buffer = try allocator.alloc(u8, sizeofcmds);
defer allocator.free(buffer);
var writer = std.io.fixedBufferStream(buffer).writer();
for (self.load_commands.items) |lc| {
try lc.write(writer);
}
const off = @sizeOf(macho.mach_header_64);
log.debug("writing {} dSym load commands from 0x{x} to 0x{x}", .{ self.load_commands.items.len, off, off + sizeofcmds });
try self.file.pwriteAll(buffer, off);
self.load_commands_dirty = false;
}
fn writeHeader(self: *DebugSymbols) !void {
if (!self.header_dirty) return;