Commit 788a0409af15d5823e0e96652ffb71458f78f820 | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2024-01-31 15:21:59+01:00
committer	GitHub <noreply@github.com> 2024-01-31 15:21:59+01:00
log	788a0409af15d5823e0e96652ffb71458f78f820
tree	4189ac0c5e6c25370729bc2ddc0bfe4733cd833d
parent	d7a27bf803fd29c499090c7bd0460fae9f0cf0f7
parent	d4966517f6d7204bb4c23204025cbd5ff3e06a03
signature	Signed by PGP key B5690EEEBB952194

Merge pull request #18761 from ziglang/macho-fixes

macho: misc fixes and improvements

3 files changed, 38 insertions(+), 19 deletions(-)

src
- arch
  - x86_64
    Emit.zig
- link
  - MachO
    Atom.zig
    ZigObject.zig

src/arch/x86_64/Emit.zig+5-3

...	@@ -62,7 +62,7 @@ pub fn emitMir(emit: *Emit) Error!void {	...	@@ -62,7 +62,7 @@ pub fn emitMir(emit: *Emit) Error!void {
62	.pcrel = true,	62	.pcrel = true,
63	.has_subtractor = false,	63	.has_subtractor = false,
64	.length = 2,	64	.length = 2,
65	.symbolnum = 0,	65	.symbolnum = @intCast(symbol.sym_index),
66	},	66	},
67	});	67	});
68	} else if (emit.lower.bin_file.cast(link.File.Coff)) \|coff_file\| {	68	} else if (emit.lower.bin_file.cast(link.File.Coff)) \|coff_file\| {
...	@@ -165,7 +165,9 @@ pub fn emitMir(emit: *Emit) Error!void {	...	@@ -165,7 +165,9 @@ pub fn emitMir(emit: *Emit) Error!void {
165	const @"type": link.File.MachO.Relocation.Type = if (sym.flags.needs_zig_got and !is_obj_or_static_lib)	165	const @"type": link.File.MachO.Relocation.Type = if (sym.flags.needs_zig_got and !is_obj_or_static_lib)
166	.zig_got_load	166	.zig_got_load
167	else if (sym.flags.needs_got)	167	else if (sym.flags.needs_got)
168	.got_load	168	// TODO: it is possible to emit .got_load here that can potentially be relaxed
		169	// however this requires always to use a MOVQ mnemonic
		170	.got
169	else if (sym.flags.tlv)	171	else if (sym.flags.tlv)
170	.tlv	172	.tlv
171	else	173	else
...	@@ -180,7 +182,7 @@ pub fn emitMir(emit: *Emit) Error!void {	...	@@ -180,7 +182,7 @@ pub fn emitMir(emit: *Emit) Error!void {
180	.pcrel = true,	182	.pcrel = true,
181	.has_subtractor = false,	183	.has_subtractor = false,
182	.length = 2,	184	.length = 2,
183	.symbolnum = 0,	185	.symbolnum = @intCast(data.sym_index),
184	},	186	},
185	});	187	});
186	} else unreachable,	188	} else unreachable,

src/link/MachO/Atom.zig+27-7

 @@ -546,8 +546,8 @@ pub fn resolveRelocs(self: Atom, macho_file: *MachO, buffer: []u8) !void {
     relocs_log.debug("{x}: {s}", .{ self.value, name });
+    var has_error = false;
     var stream = std.io.fixedBufferStream(buffer);
     var i: usize = 0;
     while (i < relocs.len) : (i += 1) {
         const rel = relocs[i];
 @@ -562,25 +562,34 @@ pub fn resolveRelocs(self: Atom, macho_file: *MachO, buffer: []u8) !void {
         self.resolveRelocInner(rel, subtractor, buffer, macho_file, stream.writer()) catch |err| {
             switch (err) {
                 error.RelaxFail => {
+                    const target = switch (rel.tag) {
+                        .@"extern" => rel.getTargetSymbol(macho_file).getName(macho_file),
+                        .local => rel.getTargetAtom(macho_file).getName(macho_file),
+                    };
                     try macho_file.reportParseError2(
                         file.getIndex(),
-                        "{s}: 0x{x}: failed to relax relocation: in {s}",
+                        "{s}: 0x{x}: 0x{x}: failed to relax relocation: type {s}, target {s}",
-                        .{ name, rel.offset, @tagName(rel.type) },
+                        .{ name, self.value, rel.offset, @tagName(rel.type), target },
                     );
-                    return error.ResolveFailed;
+                    has_error = true;
                 },
+                error.RelaxFailUnexpectedInstruction => has_error = true,
                 else => |e| return e,
             }
         };
     }
+    if (has_error) return error.ResolveFailed;
 }
 const ResolveError = error{
     RelaxFail,
+    RelaxFailUnexpectedInstruction,
     NoSpaceLeft,
     DivisionByZero,
     UnexpectedRemainder,
     Overflow,
+    OutOfMemory,
 };
 fn resolveRelocInner(
 @@ -704,7 +713,7 @@ fn resolveRelocInner(
             if (rel.getTargetSymbol(macho_file).flags.has_got) {
                 try writer.writeInt(i32, @intCast(G + A - P), .little);
             } else {
-                try x86_64.relaxGotLoad(code[rel_offset - 3 ..]);
+                try x86_64.relaxGotLoad(self, code[rel_offset - 3 ..], rel, macho_file);
                 try writer.writeInt(i32, @intCast(S + A - P), .little);
             }
         },
 @@ -898,7 +907,7 @@ fn resolveRelocInner(
 }
 const x86_64 = struct {
-    fn relaxGotLoad(code: []u8) error{RelaxFail}!void {
+    fn relaxGotLoad(self: Atom, code: []u8, rel: Relocation, macho_file: *MachO) ResolveError!void {
         const old_inst = disassemble(code) orelse return error.RelaxFail;
         switch (old_inst.encoding.mnemonic) {
             .mov => {
 @@ -906,7 +915,18 @@ const x86_64 = struct {
                 relocs_log.debug("    relaxing {} => {}", .{ old_inst.encoding, inst.encoding });
                 encode(&.{inst}, code) catch return error.RelaxFail;
             },
-            else => return error.RelaxFail,
+            else => |x| {
+                var err = try macho_file.addErrorWithNotes(2);
+                try err.addMsg(macho_file, "{s}: 0x{x}: 0x{x}: failed to relax relocation of type {s}", .{
+                    self.getName(macho_file),
+                    self.value,
+                    rel.offset,
+                    @tagName(rel.type),
+                });
+                try err.addNote(macho_file, "expected .mov instruction but found .{s}", .{@tagName(x)});
+                try err.addNote(macho_file, "while parsing {}", .{self.getFile(macho_file).fmtPath()});
+                return error.RelaxFailUnexpectedInstruction;
+            },
         }
     }

src/link/MachO/ZigObject.zig+6-9

 @@ -390,7 +390,7 @@ pub fn getDeclVAddr(
             .pcrel = false,
             .has_subtractor = false,
             .length = 3,
-            .symbolnum = 0,
+            .symbolnum = @intCast(sym.nlist_idx),
         },
     });
     return vaddr;
 @@ -416,7 +416,7 @@ pub fn getAnonDeclVAddr(
             .pcrel = false,
             .has_subtractor = false,
             .length = 3,
-            .symbolnum = 0,
+            .symbolnum = @intCast(sym.nlist_idx),
         },
     });
     return vaddr;
 @@ -856,21 +856,18 @@ fn createTlvDescriptor(
     atom.alignment = alignment;
     atom.size = size;
-    const tlv_bootstrap_index = blk: {
+    const tlv_bootstrap_index = try self.getGlobalSymbol(macho_file, "_tlv_bootstrap", null);
-        const index = try self.getGlobalSymbol(macho_file, "_tlv_bootstrap", null);
-        break :blk self.symbols.items[index];
-    };
     try atom.addReloc(macho_file, .{
         .tag = .@"extern",
         .offset = 0,
-        .target = tlv_bootstrap_index,
+        .target = self.symbols.items[tlv_bootstrap_index],
         .addend = 0,
         .type = .unsigned,
         .meta = .{
             .pcrel = false,
             .has_subtractor = false,
             .length = 3,
-            .symbolnum = 0,
+            .symbolnum = @intCast(tlv_bootstrap_index),
         },
     });
     try atom.addReloc(macho_file, .{
 @@ -883,7 +880,7 @@ fn createTlvDescriptor(
             .pcrel = false,
             .has_subtractor = false,
             .length = 3,
-            .symbolnum = 0,
+            .symbolnum = @intCast(macho_file.getSymbol(init_sym_index).nlist_idx),
         },
     });