authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-08-19 07:50:11+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-08-19 07:50:11+02:00
log5fe878cd42556648f6dc78d39b078411ab612eef
treea0f339b81e7cb4ccb2553aad94f92c15ba99b838
parent4237f1afc7f38f68adf0877fc9be811f9189544f
parentffdeb6af9171ccf9cb816a142a93991477d9a4ea
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #6085 from kubkon/macho-header

Write out Mach-O header

3 files changed, 83 insertions(+), 4 deletions(-)

lib/std/macho.zig+12
......@@ -703,3 +703,15 @@ pub const cpu_type_t = integer_t;
703703pub const cpu_subtype_t = integer_t;
704704pub const integer_t = c_int;
705705pub const vm_prot_t = c_int;
706
707/// CPU type targeting 64-bit Intel-based Macs
708pub const CPU_TYPE_X86_64: cpu_type_t = 0x01000007;
709
710/// CPU type targeting 64-bit ARM-based Macs
711pub const CPU_TYPE_ARM64: cpu_type_t = 0x0100000C;
712
713/// All Intel-based Macs
714pub const CPU_SUBTYPE_X86_64_ALL: cpu_subtype_t = 0x3;
715
716/// All ARM-based Macs
717pub const CPU_SUBTYPE_ARM_ALL: cpu_subtype_t = 0x0;
src-self-hosted/link.zig-1
......@@ -40,7 +40,6 @@ pub const Options = struct {
4040 program_code_size_hint: u64 = 256 * 1024,
4141};
4242
43
4443pub const File = struct {
4544 pub const LinkBlock = union {
4645 elf: Elf.TextBlock,
src-self-hosted/link/MachO.zig+71-3
......@@ -4,6 +4,8 @@ const std = @import("std");
44const Allocator = std.mem.Allocator;
55const assert = std.debug.assert;
66const fs = std.fs;
7const log = std.log.scoped(.link);
8const macho = std.macho;
79
810const Module = @import("../Module.zig");
911const link = @import("../link.zig");
......@@ -13,6 +15,8 @@ pub const base_tag: Tag = File.Tag.macho;
1315
1416base: File,
1517
18entry_addr: ?u64 = null,
19
1620error_flags: File.ErrorFlags = File.ErrorFlags{},
1721
1822pub const TextBlock = struct {
......@@ -67,13 +71,77 @@ fn openFile(allocator: *Allocator, file: fs.File, options: link.Options) !MachO
6771/// Returns an error if `file` is not already open with +read +write +seek abilities.
6872fn createFile(allocator: *Allocator, file: fs.File, options: link.Options) !MachO {
6973 switch (options.output_mode) {
70 .Exe => return error.TODOImplementWritingMachOExeFiles,
71 .Obj => return error.TODOImplementWritingMachOObjFiles,
74 .Exe => {},
75 .Obj => {},
7276 .Lib => return error.TODOImplementWritingLibFiles,
7377 }
78
79 var self: MachO = .{
80 .base = .{
81 .file = file,
82 .tag = .macho,
83 .options = options,
84 .allocator = allocator,
85 },
86 };
87 errdefer self.deinit();
88
89 return self;
7490}
7591
76pub fn flush(self: *MachO, module: *Module) !void {}
92fn writeMachOHeader(self: *MachO) !void {
93 var hdr: macho.mach_header_64 = undefined;
94 hdr.magic = macho.MH_MAGIC_64;
95
96 const CpuInfo = struct {
97 cpu_type: macho.cpu_type_t,
98 cpu_subtype: macho.cpu_subtype_t,
99 };
100
101 const cpu_info: CpuInfo = switch (self.base.options.target.cpu.arch) {
102 .aarch64 => .{
103 .cpu_type = macho.CPU_TYPE_ARM64,
104 .cpu_subtype = macho.CPU_SUBTYPE_ARM_ALL,
105 },
106 .x86_64 => .{
107 .cpu_type = macho.CPU_TYPE_X86_64,
108 .cpu_subtype = macho.CPU_SUBTYPE_X86_64_ALL,
109 },
110 else => return error.UnsupportedMachOArchitecture,
111 };
112 hdr.cputype = cpu_info.cpu_type;
113 hdr.cpusubtype = cpu_info.cpu_subtype;
114
115 const filetype: u32 = switch (self.base.options.output_mode) {
116 .Exe => macho.MH_EXECUTE,
117 .Obj => macho.MH_OBJECT,
118 .Lib => switch (self.base.options.link_mode) {
119 .Static => return error.TODOStaticLibMachOType,
120 .Dynamic => macho.MH_DYLIB,
121 },
122 };
123 hdr.filetype = filetype;
124
125 // TODO the rest of the header
126 hdr.ncmds = 0;
127 hdr.sizeofcmds = 0;
128 hdr.flags = 0;
129 hdr.reserved = 0;
130
131 try self.base.file.?.pwriteAll(@ptrCast([*]const u8, &hdr)[0..@sizeOf(macho.mach_header_64)], 0);
132}
133
134pub fn flush(self: *MachO, module: *Module) !void {
135 // TODO implement flush
136 if (self.entry_addr == null and self.base.options.output_mode == .Exe) {
137 log.debug("flushing. no_entry_point_found = true\n", .{});
138 self.error_flags.no_entry_point_found = true;
139 } else {
140 log.debug("flushing. no_entry_point_found = false\n", .{});
141 self.error_flags.no_entry_point_found = false;
142 try self.writeMachOHeader();
143 }
144}
77145
78146pub fn deinit(self: *MachO) void {}
79147