authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-08-26 07:03:58+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2020-08-26 07:03:58+02:00
log982ab7df6cd61a874e98ef99e923a98e02cf7487
treef3ce7f09f3284ad88183e7edfddbfd5870ac0556
parent3e24e958922806379f9f609e36954a489eb20831
parent55dc81ba2a86519a2fd5bfd985d2d6465ccf4966
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #6161 from kubkon/macho-text

Add (empty) __TEXT segment load command

2 files changed, 117 insertions(+), 77 deletions(-)

lib/std/macho.zig+13
......@@ -797,3 +797,16 @@ pub const CPU_SUBTYPE_X86_64_ALL: cpu_subtype_t = 0x3;
797797
798798/// All ARM-based Macs
799799pub const CPU_SUBTYPE_ARM_ALL: cpu_subtype_t = 0x0;
800
801// Protection values defined as bits within the vm_prot_t type
802/// No VM protection
803pub const VM_PROT_NONE: vm_prot_t = 0x0;
804
805/// VM read permission
806pub const VM_PROT_READ: vm_prot_t = 0x1;
807
808/// VM write permission
809pub const VM_PROT_WRITE: vm_prot_t = 0x2;
810
811/// VM execute permission
812pub const VM_PROT_EXECUTE: vm_prot_t = 0x4;
src-self-hosted/link/MachO.zig+104-77
......@@ -16,8 +16,6 @@ const Module = @import("../Module.zig");
1616const link = @import("../link.zig");
1717const File = link.File;
1818
19const is_darwin = std.Target.current.os.tag.isDarwin();
20
2119pub const base_tag: File.Tag = File.Tag.macho;
2220
2321base: File,
......@@ -30,24 +28,26 @@ command_file_offset: ?u64 = null,
3028/// Stored in native-endian format, depending on target endianness needs to be bswapped on read/write.
3129/// Same order as in the file.
3230segments: std.ArrayListUnmanaged(macho.segment_command_64) = std.ArrayListUnmanaged(macho.segment_command_64){},
31/// Section (headers) *always* follow segment (load commands) directly!
3332sections: std.ArrayListUnmanaged(macho.section_64) = std.ArrayListUnmanaged(macho.section_64){},
34segment_table_offset: ?u64 = null,
33
34/// Offset (index) into __TEXT segment load command.
35text_segment_offset: ?u64 = null,
36/// Offset (index) into __LINKEDIT segment load command.
37linkedit_segment_offset: ?u664 = null,
3538
3639/// Entry point load command
3740entry_point_cmd: ?macho.entry_point_command = null,
3841entry_addr: ?u64 = null,
3942
40/// Default VM start address set at 4GB
43/// The first 4GB of process' memory is reserved for the null (__PAGEZERO) segment.
44/// This is also the start address for our binary.
4145vm_start_address: u64 = 0x100000000,
4246
4347seg_table_dirty: bool = false,
4448
4549error_flags: File.ErrorFlags = File.ErrorFlags{},
4650
47/// TODO ultimately this will be propagated down from main() and set (in this form or another)
48/// when user links against system lib.
49link_against_system: bool = false,
50
5151/// `alloc_num / alloc_den` is the factor of padding when allocating.
5252const alloc_num = 4;
5353const alloc_den = 3;
......@@ -138,8 +138,8 @@ fn createFile(allocator: *Allocator, file: fs.File, options: link.Options) !Mach
138138 .vmsize = self.vm_start_address,
139139 .fileoff = 0,
140140 .filesize = 0,
141 .maxprot = 0,
142 .initprot = 0,
141 .maxprot = macho.VM_PROT_NONE,
142 .initprot = macho.VM_PROT_NONE,
143143 .nsects = 0,
144144 .flags = 0,
145145 };
......@@ -225,67 +225,61 @@ pub fn flush(self: *MachO, module: *Module) !void {
225225
226226 switch (self.base.options.output_mode) {
227227 .Exe => {
228 if (self.link_against_system) {
229 if (is_darwin) {
230 {
231 // Specify path to dynamic linker dyld
232 const cmdsize = commandSize(@intCast(u32, @sizeOf(macho.dylinker_command) + mem.lenZ(DEFAULT_DYLD_PATH)));
233 const load_dylinker = [1]macho.dylinker_command{
234 .{
235 .cmd = macho.LC_LOAD_DYLINKER,
236 .cmdsize = cmdsize,
237 .name = @sizeOf(macho.dylinker_command),
238 },
239 };
240 try self.commands.append(self.base.allocator, .{
241 .cmd = macho.LC_LOAD_DYLINKER,
242 .cmdsize = cmdsize,
243 });
244
245 try self.base.file.?.pwriteAll(mem.sliceAsBytes(load_dylinker[0..1]), self.command_file_offset.?);
246
247 const file_offset = self.command_file_offset.? + @sizeOf(macho.dylinker_command);
248 try self.addPadding(cmdsize - @sizeOf(macho.dylinker_command), file_offset);
249
250 try self.base.file.?.pwriteAll(mem.spanZ(DEFAULT_DYLD_PATH), file_offset);
251 self.command_file_offset.? += cmdsize;
252 }
253
254 {
255 // Link against libSystem
256 const cmdsize = commandSize(@intCast(u32, @sizeOf(macho.dylib_command) + mem.lenZ(LIB_SYSTEM_PATH)));
257 // According to Apple's manual, we should obtain current libSystem version using libc call
258 // NSVersionOfRunTimeLibrary.
259 const version = std.c.NSVersionOfRunTimeLibrary(LIB_SYSTEM_NAME);
260 const dylib = .{
261 .name = @sizeOf(macho.dylib_command),
262 .timestamp = 2, // not sure why not simply 0; this is reverse engineered from Mach-O files
263 .current_version = version,
264 .compatibility_version = 0x10000, // not sure why this either; value from reverse engineering
265 };
266 const load_dylib = [1]macho.dylib_command{
267 .{
268 .cmd = macho.LC_LOAD_DYLIB,
269 .cmdsize = cmdsize,
270 .dylib = dylib,
271 },
272 };
273 try self.commands.append(self.base.allocator, .{
274 .cmd = macho.LC_LOAD_DYLIB,
275 .cmdsize = cmdsize,
276 });
277
278 try self.base.file.?.pwriteAll(mem.sliceAsBytes(load_dylib[0..1]), self.command_file_offset.?);
279
280 const file_offset = self.command_file_offset.? + @sizeOf(macho.dylib_command);
281 try self.addPadding(cmdsize - @sizeOf(macho.dylib_command), file_offset);
282
283 try self.base.file.?.pwriteAll(mem.spanZ(LIB_SYSTEM_PATH), file_offset);
284 self.command_file_offset.? += cmdsize;
285 }
286 } else {
287 @panic("linking against libSystem on non-native target is unsupported");
288 }
228 {
229 // Specify path to dynamic linker dyld
230 const cmdsize = commandSize(@sizeOf(macho.dylinker_command) + mem.lenZ(DEFAULT_DYLD_PATH));
231 const load_dylinker = [1]macho.dylinker_command{
232 .{
233 .cmd = macho.LC_LOAD_DYLINKER,
234 .cmdsize = cmdsize,
235 .name = @sizeOf(macho.dylinker_command),
236 },
237 };
238 try self.commands.append(self.base.allocator, .{
239 .cmd = macho.LC_LOAD_DYLINKER,
240 .cmdsize = cmdsize,
241 });
242
243 try self.base.file.?.pwriteAll(mem.sliceAsBytes(load_dylinker[0..1]), self.command_file_offset.?);
244
245 const file_offset = self.command_file_offset.? + @sizeOf(macho.dylinker_command);
246 try self.addPadding(cmdsize - @sizeOf(macho.dylinker_command), file_offset);
247
248 try self.base.file.?.pwriteAll(mem.spanZ(DEFAULT_DYLD_PATH), file_offset);
249 self.command_file_offset.? += cmdsize;
250 }
251
252 {
253 // Link against libSystem
254 const cmdsize = commandSize(@sizeOf(macho.dylib_command) + mem.lenZ(LIB_SYSTEM_PATH));
255 // TODO Find a way to work out runtime version from the OS version triple stored in std.Target.
256 // In the meantime, we're gonna hardcode to the minimum compatibility version of 1.0.0.
257 const min_version = 0x10000;
258 const dylib = .{
259 .name = @sizeOf(macho.dylib_command),
260 .timestamp = 2, // not sure why not simply 0; this is reverse engineered from Mach-O files
261 .current_version = min_version,
262 .compatibility_version = min_version,
263 };
264 const load_dylib = [1]macho.dylib_command{
265 .{
266 .cmd = macho.LC_LOAD_DYLIB,
267 .cmdsize = cmdsize,
268 .dylib = dylib,
269 },
270 };
271 try self.commands.append(self.base.allocator, .{
272 .cmd = macho.LC_LOAD_DYLIB,
273 .cmdsize = cmdsize,
274 });
275
276 try self.base.file.?.pwriteAll(mem.sliceAsBytes(load_dylib[0..1]), self.command_file_offset.?);
277
278 const file_offset = self.command_file_offset.? + @sizeOf(macho.dylib_command);
279 try self.addPadding(cmdsize - @sizeOf(macho.dylib_command), file_offset);
280
281 try self.base.file.?.pwriteAll(mem.spanZ(LIB_SYSTEM_PATH), file_offset);
282 self.command_file_offset.? += cmdsize;
289283 }
290284 },
291285 .Obj => return error.TODOImplementWritingObjFiles,
......@@ -327,20 +321,53 @@ pub fn getDeclVAddr(self: *MachO, decl: *const Module.Decl) u64 {
327321 @panic("TODO implement getDeclVAddr for MachO");
328322}
329323
330pub fn populateMissingMetadata(self: *MachO) !void {}
324pub fn populateMissingMetadata(self: *MachO) !void {
325 if (self.text_segment_offset == null) {
326 self.text_segment_offset = @intCast(u64, self.segments.items.len);
327 const file_size = alignSize(u64, self.base.options.program_code_size_hint, 0x1000);
328 log.debug("vmsize/filesize = {}", .{file_size});
329 const file_offset = 0;
330 const vm_address = self.vm_start_address; // the end of __PAGEZERO segment in VM
331 const protection = macho.VM_PROT_READ | macho.VM_PROT_EXECUTE;
332 const cmdsize = commandSize(@sizeOf(macho.segment_command_64));
333 const text_segment = .{
334 .cmd = macho.LC_SEGMENT_64,
335 .cmdsize = cmdsize,
336 .segname = makeString("__TEXT"),
337 .vmaddr = vm_address,
338 .vmsize = file_size,
339 .fileoff = 0, // __TEXT segment *always* starts at 0 file offset
340 .filesize = 0, //file_size,
341 .maxprot = protection,
342 .initprot = protection,
343 .nsects = 0,
344 .flags = 0,
345 };
346 try self.commands.append(self.base.allocator, .{
347 .cmd = macho.LC_SEGMENT_64,
348 .cmdsize = cmdsize,
349 });
350 try self.segments.append(self.base.allocator, text_segment);
351 }
352}
331353
332354fn makeString(comptime bytes: []const u8) [16]u8 {
333 var buf: [16]u8 = undefined;
355 var buf = [_]u8{0} ** 16;
334356 if (bytes.len > buf.len) @compileError("MachO segment/section name too long");
335357 mem.copy(u8, buf[0..], bytes);
336358 return buf;
337359}
338360
339fn commandSize(min_size: u32) u32 {
340 if (min_size % @sizeOf(u64) == 0) return min_size;
361fn alignSize(comptime Int: type, min_size: anytype, alignment: Int) Int {
362 const size = @intCast(Int, min_size);
363 if (size % alignment == 0) return size;
364
365 const div = size / alignment;
366 return (div + 1) * alignment;
367}
341368
342 const div = min_size / @sizeOf(u64);
343 return (div + 1) * @sizeOf(u64);
369fn commandSize(min_size: anytype) u32 {
370 return alignSize(u32, min_size, @sizeOf(u64));
344371}
345372
346373fn addPadding(self: *MachO, size: u32, file_offset: u64) !void {