authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-06-28 10:23:25+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2022-06-28 10:23:25+02:00
log5834a608fc629319772b1623a31b62dd49ac6d63
treeef3b895c679671c72a2d18e6cc5750e2b4d05fb3
parent075f5bc5ffdbe0a458a733d596a1fc4a74b8e1ab

link-tests: do not save global extracted var unless a match

Improve testing MachO binaries by verbose printing of the symtab which includes segment,section names for defined symbols, and import (dylib) name for imports.

3 files changed, 87 insertions(+), 7 deletions(-)

lib/std/build/CheckObjectStep.zig+81-6
......@@ -65,6 +65,7 @@ const Action = struct {
6565 fn match(act: Action, haystack: []const u8, global_vars: anytype) !bool {
6666 assert(act.tag == .match);
6767
68 var candidate_var: ?struct { name: []const u8, value: u64 } = null;
6869 var hay_it = mem.tokenize(u8, mem.trim(u8, haystack, " "), " ");
6970 var needle_it = mem.tokenize(u8, mem.trim(u8, act.phrase, " "), " ");
7071
......@@ -92,12 +93,19 @@ const Action = struct {
9293 const name = needle_tok[1..closing_brace];
9394 if (name.len == 0) return error.MissingBraceValue;
9495 const value = try std.fmt.parseInt(u64, hay_tok, 16);
95 try global_vars.putNoClobber(name, value);
96 candidate_var = .{
97 .name = name,
98 .value = value,
99 };
96100 } else {
97101 if (!mem.eql(u8, hay_tok, needle_tok)) return false;
98102 }
99103 }
100104
105 if (candidate_var) |v| {
106 try global_vars.putNoClobber(v.name, v.value);
107 }
108
101109 return true;
102110 }
103111
......@@ -332,20 +340,43 @@ const MachODumper = struct {
332340 var output = std.ArrayList(u8).init(gpa);
333341 const writer = output.writer();
334342
335 var symtab_cmd: ?macho.symtab_command = null;
343 var load_commands = std.ArrayList(macho.LoadCommand).init(gpa);
344 try load_commands.ensureTotalCapacity(hdr.ncmds);
345
346 var sections = std.ArrayList(struct { seg: u16, sect: u16 }).init(gpa);
347 var imports = std.ArrayList(u16).init(gpa);
348
349 var symtab_cmd: ?u16 = null;
336350 var i: u16 = 0;
337351 while (i < hdr.ncmds) : (i += 1) {
338352 var cmd = try macho.LoadCommand.read(gpa, reader);
353 load_commands.appendAssumeCapacity(cmd);
339354
340 if (opts.dump_symtab and cmd.cmd() == .SYMTAB) {
341 symtab_cmd = cmd.symtab;
355 switch (cmd.cmd()) {
356 .SEGMENT_64 => {
357 const seg = cmd.segment;
358 for (seg.sections.items) |_, j| {
359 try sections.append(.{ .seg = i, .sect = @intCast(u16, j) });
360 }
361 },
362 .SYMTAB => {
363 symtab_cmd = i;
364 },
365 .LOAD_DYLIB,
366 .LOAD_WEAK_DYLIB,
367 .REEXPORT_DYLIB,
368 => {
369 try imports.append(i);
370 },
371 else => {},
342372 }
343373
344374 try dumpLoadCommand(cmd, i, writer);
345375 try writer.writeByte('\n');
346376 }
347377
348 if (symtab_cmd) |cmd| {
378 if (opts.dump_symtab) {
379 const cmd = load_commands.items[symtab_cmd.?].symtab;
349380 try writer.writeAll(symtab_label ++ "\n");
350381 const strtab = bytes[cmd.stroff..][0..cmd.strsize];
351382 const raw_symtab = bytes[cmd.symoff..][0 .. cmd.nsyms * @sizeOf(macho.nlist_64)];
......@@ -354,7 +385,51 @@ const MachODumper = struct {
354385 for (symtab) |sym| {
355386 if (sym.stab()) continue;
356387 const sym_name = mem.sliceTo(@ptrCast([*:0]const u8, strtab.ptr + sym.n_strx), 0);
357 try writer.print("{s} {x}\n", .{ sym_name, sym.n_value });
388 if (sym.sect()) {
389 const map = sections.items[sym.n_sect - 1];
390 const seg = load_commands.items[map.seg].segment;
391 const sect = seg.sections.items[map.sect];
392 try writer.print("{x} ({s},{s})", .{
393 sym.n_value,
394 sect.segName(),
395 sect.sectName(),
396 });
397 if (sym.ext()) {
398 try writer.writeAll(" external");
399 }
400 try writer.print(" {s}\n", .{sym_name});
401 } else if (sym.undf()) {
402 const ordinal = @divTrunc(@bitCast(i16, sym.n_desc), macho.N_SYMBOL_RESOLVER);
403 const import_name = blk: {
404 if (ordinal <= 0) {
405 if (ordinal == macho.BIND_SPECIAL_DYLIB_SELF)
406 break :blk "self import";
407 if (ordinal == macho.BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE)
408 break :blk "main executable";
409 if (ordinal == macho.BIND_SPECIAL_DYLIB_FLAT_LOOKUP)
410 break :blk "flat lookup";
411 unreachable;
412 }
413 const import_id = imports.items[@bitCast(u16, ordinal) - 1];
414 const import = load_commands.items[import_id].dylib;
415 const full_path = mem.sliceTo(import.data, 0);
416 const basename = fs.path.basename(full_path);
417 assert(basename.len > 0);
418 const ext = mem.lastIndexOfScalar(u8, basename, '.') orelse basename.len;
419 break :blk basename[0..ext];
420 };
421 try writer.writeAll("(undefined)");
422 if (sym.weakRef()) {
423 try writer.writeAll(" weak");
424 }
425 if (sym.ext()) {
426 try writer.writeAll(" external");
427 }
428 try writer.print(" {s} (from {s})\n", .{
429 sym_name,
430 import_name,
431 });
432 } else unreachable;
358433 }
359434 }
360435
test/link/macho/entry/build.zig+1-1
......@@ -22,7 +22,7 @@ pub fn build(b: *Builder) void {
2222 check_exe.checkNext("entryoff {entryoff}");
2323
2424 check_exe.checkInSymtab();
25 check_exe.checkNext("_non_main {n_value}");
25 check_exe.checkNext("{n_value} (__TEXT,__text) external _non_main");
2626
2727 check_exe.checkComputeCompare("vmaddr entryoff +", .{ .op = .eq, .value = .{ .variable = "n_value" } });
2828
test/link/macho/weak_library/build.zig+5
......@@ -25,6 +25,11 @@ pub fn build(b: *Builder) void {
2525 const check = exe.checkObject(.macho);
2626 check.checkStart("cmd LOAD_WEAK_DYLIB");
2727 check.checkNext("name @rpath/liba.dylib");
28
29 check.checkInSymtab();
30 check.checkNext("(undefined) weak external _a (from liba)");
31 check.checkNext("(undefined) weak external _asStr (from liba)");
32
2833 test_step.dependOn(&check.step);
2934
3035 const run_cmd = exe.run();