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+zld: align to 8 and pad out strtab

Browse Source
This commit is contained in:
Jakub Konka 2022-12-27 15:24:25 +01:00
parent d83d39297c
commit 2620146834
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/link/MachO.zig
View File

@ -3606,17 +3606,25 @@ fn writeSymtab(self: *MachO) !SymtabCtx {
}
fn writeStrtab(self: *MachO) !void {
const gpa = self.base.allocator;
const seg = self.getLinkeditSegmentPtr();
const offset = mem.alignForwardGeneric(u64, seg.fileoff + seg.filesize, @alignOf(u64));
const offset = seg.fileoff + seg.filesize;
assert(mem.isAlignedGeneric(u64, offset, @alignOf(u64)));
const needed_size = self.strtab.buffer.items.len;
seg.filesize = offset + needed_size - seg.fileoff;
const needed_size_aligned = mem.alignForwardGeneric(u64, needed_size, @alignOf(u64));
seg.filesize = offset + needed_size_aligned - seg.fileoff;
log.debug("writing string table from 0x{x} to 0x{x}", .{ offset, offset + needed_size });
log.debug("writing string table from 0x{x} to 0x{x}", .{ offset, offset + needed_size_aligned });
try self.base.file.?.pwriteAll(self.strtab.buffer.items, offset);
const buffer = try gpa.alloc(u8, needed_size_aligned);
defer gpa.free(buffer);
mem.set(u8, buffer, 0);
mem.copy(u8, buffer, self.strtab.buffer.items);
try self.base.file.?.pwriteAll(buffer, offset);
self.symtab_cmd.stroff = @intCast(u32, offset);
self.symtab_cmd.strsize = @intCast(u32, needed_size);
self.symtab_cmd.strsize = @intCast(u32, needed_size_aligned);
}
const SymtabCtx = struct {

17
src/link/MachO/zld.zig
View File

@ -2613,16 +2613,23 @@ pub const Zld = struct {
fn writeStrtab(self: *Zld) !void {
const seg = self.getLinkeditSegmentPtr();
const offset = mem.alignForwardGeneric(u64, seg.fileoff + seg.filesize, @alignOf(u64));
const offset = seg.fileoff + seg.filesize;
assert(mem.isAlignedGeneric(u64, offset, @alignOf(u64)));
const needed_size = self.strtab.buffer.items.len;
seg.filesize = offset + needed_size - seg.fileoff;
const needed_size_aligned = mem.alignForwardGeneric(u64, needed_size, @alignOf(u64));
seg.filesize = offset + needed_size_aligned - seg.fileoff;
log.debug("writing string table from 0x{x} to 0x{x}", .{ offset, offset + needed_size });
log.debug("writing string table from 0x{x} to 0x{x}", .{ offset, offset + needed_size_aligned });
try self.file.pwriteAll(self.strtab.buffer.items, offset);
const buffer = try self.gpa.alloc(u8, needed_size_aligned);
defer self.gpa.free(buffer);
mem.set(u8, buffer, 0);
mem.copy(u8, buffer, self.strtab.buffer.items);
try self.file.pwriteAll(buffer, offset);
self.symtab_cmd.stroff = @intCast(u32, offset);
self.symtab_cmd.strsize = @intCast(u32, needed_size);
self.symtab_cmd.strsize = @intCast(u32, needed_size_aligned);
}
const SymtabCtx = struct {