authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-01-28 00:49:59+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-01-28 00:49:59+01:00
log8cdaaa7b4fcf10f1cb5603dc3bb2340ef17c9fc9
treeb1bcb6ec12f1fe1473c3970a6bb69696c0ded407
parent6337ce16ae76977b2444b5c07f3c436db4d5ece7

macho: move getAtomData switch into Atom

2 files changed, 12 insertions(+), 7 deletions(-)

src/link/MachO.zig+2-7
......@@ -613,7 +613,7 @@ pub fn flushModule(self: *MachO, arena: Allocator, prog_node: *std.Progress.Node
613613 const atom_size = math.cast(usize, atom.size) orelse return error.Overflow;
614614 const code = try gpa.alloc(u8, atom_size);
615615 defer gpa.free(code);
616 zo.getAtomData(self, atom.*, code) catch |err| switch (err) {
616 atom.getData(self, code) catch |err| switch (err) {
617617 error.InputOutput => {
618618 try self.reportUnexpectedError("fetching code for '{s}' failed", .{
619619 atom.getName(self),
......@@ -2591,12 +2591,7 @@ fn writeAtoms(self: *MachO) !void {
25912591 assert(atom.flags.alive);
25922592 const off = math.cast(usize, atom.value - header.addr) orelse return error.Overflow;
25932593 const atom_size = math.cast(usize, atom.size) orelse return error.Overflow;
2594 switch (atom.getFile(self)) {
2595 .internal => |x| try x.getAtomData(atom.*, buffer[off..][0..atom_size]),
2596 .object => |x| try x.getAtomData(atom.*, buffer[off..][0..atom_size]),
2597 .zig_object => |x| try x.getAtomData(self, atom.*, buffer[off..][0..atom_size]),
2598 else => unreachable,
2599 }
2594 try atom.getData(self, buffer[off..][0..atom_size]);
26002595 atom.resolveRelocs(self, buffer[off..][0..atom_size]) catch |err| switch (err) {
26012596 error.ResolveFailed => has_resolve_error = true,
26022597 else => |e| return e,
src/link/MachO/Atom.zig+10
......@@ -54,6 +54,16 @@ pub fn getFile(self: Atom, macho_file: *MachO) File {
5454 return macho_file.getFile(self.file).?;
5555}
5656
57pub fn getData(self: Atom, macho_file: *MachO, buffer: []u8) !void {
58 assert(buffer.len == self.size);
59 switch (self.getFile(macho_file)) {
60 .internal => |x| try x.getAtomData(self, buffer),
61 .object => |x| try x.getAtomData(self, buffer),
62 .zig_object => |x| try x.getAtomData(macho_file, self, buffer),
63 else => unreachable,
64 }
65}
66
5767pub fn getRelocs(self: Atom, macho_file: *MachO) []const Relocation {
5868 return switch (self.getFile(macho_file)) {
5969 .dylib => unreachable,