simplify loading interpreter

build.zig

@@ -42,17 +42,20 @@ pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    try compileTestApplications(b, target, optimize, false, false);
-    try compileTestApplications(b, target, optimize, false, true);
-    try compileTestApplications(b, target, optimize, true, true);
+    const faller = b.dependency("faller", .{
+        .target = target,
+        .optimize = optimize,
+    });
 
-    const mod = b.addModule("loader", .{
+    const mod = b.createModule(.{
         .root_source_file = b.path("src/main.zig"),
         .optimize = optimize,
         .target = target,
         .link_libc = false,
         .link_libcpp = false,
     });
+    mod.addImport("faller", faller.module("faller"));
+
     const exe = b.addExecutable(.{
         .name = "loader",
         .root_module = mod,
@@ -68,6 +71,10 @@ pub fn build(b: *std.Build) !void {
         run_cmd.addArgs(args);
     }
 
+    try compileTestApplications(b, target, optimize, false, false);
+    try compileTestApplications(b, target, optimize, false, true);
+    try compileTestApplications(b, target, optimize, true, true);
+
     const exe_tests = b.addTest(.{ .root_module = mod });
     const run_exe_tests = b.addRunArtifact(exe_tests);
     const test_step = b.step("test", "Run tests");

build.zig.zon

@@ -1,6 +1,12 @@
 .{
     .name = .loader,
     .version = "0.0.1",
+    .dependencies = .{
+        .faller = .{
+            .url = "git+https://git.pascalzittlau.de/pzittlau/faller.git#2dea92dcd9184c3a37f07761009944bc8fd4d352",
+            .hash = "faller-0.1.0-nNGNDT07AADmPJe_o0ERuMpZJGgXbdb_5B7VAMs2SmEt",
+        },
+    },
     .minimum_zig_version = "0.15.1",
     .paths = .{""},
     .fingerprint = 0xbf53f276a39b2af9,

src/main.zig

@@ -1,3 +1,4 @@
+const faller = @import("faller");
 const std = @import("std");
 
 const elf = std.elf;
@@ -5,10 +6,11 @@ const mem = std.mem;
 const posix = std.posix;
 const testing = std.testing;
 
-const assert = std.debug.assert;
+pub const faller_options: faller.Options = .{ .tags_disabled = &.{.debug} };
+const Logger = faller.Logger(&.{.loader});
 
-const log = std.log.scoped(.loader);
-pub const std_options = std.Options{ .log_level = .info };
+const assert = std.debug.assert;
+const log = Logger.log;
 
 const page_size = std.heap.pageSize();
 const max_interp_path_length = 128;
@@ -41,51 +43,41 @@ pub fn main() !void {
 
     // Map file into memory
     const file = try lookupFile(mem.sliceTo(std.os.argv[arg_index], 0));
-    var buffer: [128]u8 = undefined;
-    var file_reader = file.reader(&buffer);
-    log.info("--- Loading executable: {s} ---", .{std.os.argv[arg_index]});
+    var file_buffer: [128]u8 = undefined;
+    var file_reader = file.reader(&file_buffer);
+    log(.info, "--- Loading executable: {s} ---", .{std.os.argv[arg_index]});
     const ehdr = try elf.Header.read(&file_reader.interface);
     const base = try loadStaticElf(ehdr, &file_reader);
     const entry = ehdr.entry + if (ehdr.type == .DYN) base else 0;
-    log.info("Executable loaded: base=0x{x}, entry=0x{x}", .{ base, entry });
+    log(.info, "Executable loaded: base=0x{x}, entry=0x{x}", .{ base, entry });
 
     // Check for dynamic linker
-    const maybe_interp: ?std.fs.File = interp: {
-        var phdrs = ehdr.iterateProgramHeaders(&file_reader);
-        while (try phdrs.next()) |phdr| {
-            if (phdr.p_type != elf.PT_INTERP) continue;
-            var interp_path: [max_interp_path_length]u8 = undefined;
-            try file_reader.seekTo(phdr.p_offset);
-            if (try file_reader.read(interp_path[0..phdr.p_filesz]) != phdr.p_filesz)
-                return UnfinishedReadError.UnfinishedRead;
-            assert(interp_path[phdr.p_filesz - 1] == 0); // Must be zero terminated
-            log.info("Found interpreter path: {s}", .{interp_path[0 .. phdr.p_filesz - 1]});
-            break :interp try std.fs.cwd().openFile(
-                interp_path[0 .. phdr.p_filesz - 1],
-                .{ .mode = .read_only },
-            );
-        }
-        break :interp null;
-    };
-
-    // We don't need the file anymore. But we reuse the buffer if we need to load the interpreter.
-    // Therefore deinit everything to make sure we don't use it anymore.
-    file_reader = undefined;
-    file.close();
-
     var maybe_interp_base: ?usize = null;
     var maybe_interp_entry: ?usize = null;
-    if (maybe_interp) |interp| {
-        // TODO: If we have an interpreter we could/should unload the elf file because it will be
-        // loaded by the dynamic linker anyway.
-        log.info("--- Loading interpreter ---", .{});
-        var interp_reader = interp.reader(&buffer);
+    var phdrs = ehdr.iterateProgramHeaders(&file_reader);
+    while (try phdrs.next()) |phdr| {
+        if (phdr.p_type != elf.PT_INTERP) continue;
+
+        var interp_path: [max_interp_path_length]u8 = undefined;
+        try file_reader.seekTo(phdr.p_offset);
+        if (try file_reader.read(interp_path[0..phdr.p_filesz]) != phdr.p_filesz)
+            return UnfinishedReadError.UnfinishedRead;
+        assert(interp_path[phdr.p_filesz - 1] == 0); // Must be zero terminated
+        log(.info, "Found interpreter path: {s}", .{interp_path[0 .. phdr.p_filesz - 1]});
+        const interp = try std.fs.cwd().openFile(
+            interp_path[0 .. phdr.p_filesz - 1],
+            .{ .mode = .read_only },
+        );
+
+        log(.info, "--- Loading interpreter ---", .{});
+        var interp_buffer: [128]u8 = undefined;
+        var interp_reader = interp.reader(&interp_buffer);
         const interp_ehdr = try elf.Header.read(&interp_reader.interface);
         assert(interp_ehdr.type == elf.ET.DYN);
         const interp_base = try loadStaticElf(interp_ehdr, &interp_reader);
         maybe_interp_base = interp_base;
         maybe_interp_entry = interp_ehdr.entry + if (interp_ehdr.type == .DYN) interp_base else 0;
-        log.info("Interpreter loaded: base=0x{x}, entry=0x{x}", .{ interp_base, maybe_interp_entry.? });
+        log(.info, "Interpreter loaded: base=0x{x}, entry=0x{x}", .{ interp_base, maybe_interp_entry.? });
         interp.close();
     }
 
@@ -113,7 +105,8 @@ pub fn main() !void {
     const dest_ptr = @as([*]u8, @ptrCast(std.os.argv.ptr));
     const src_ptr = @as([*]u8, @ptrCast(&std.os.argv[arg_index]));
     const len = @intFromPtr(end_of_auxv) - @intFromPtr(src_ptr);
-    log.debug(
+    log(
+        .debug,
         "Copying stack from {*} to {*} with length 0x{x}",
         .{ src_ptr, dest_ptr, len },
     );
@@ -124,10 +117,10 @@ pub fn main() !void {
     // start of the stack.
     const argc: [*]usize = @as([*]usize, @ptrCast(@alignCast(&std.os.argv.ptr[0]))) - 1;
     argc[0] = std.os.argv.len - arg_index;
-    log.debug("new argc: {x}", .{argc[0]});
+    log(.debug, "new argc: {x}", .{argc[0]});
 
     const final_entry = maybe_interp_entry orelse entry;
-    log.info("Trampolining to final entry: 0x{x} with sp: {*}", .{ final_entry, argc });
+    log(.info, "Trampolining to final entry: 0x{x} with sp: {*}", .{ final_entry, argc });
     trampoline(final_entry, argc);
 }
 
@@ -153,15 +146,15 @@ fn loadStaticElf(ehdr: elf.Header, file_reader: *std.fs.File.Reader) !usize {
         }
         minva = mem.alignBackward(usize, minva, page_size);
         maxva = mem.alignForward(usize, maxva, page_size);
-        log.debug("Calculated bounds: minva=0x{x}, maxva=0x{x}", .{ minva, maxva });
+        log(.debug, "Calculated bounds: minva=0x{x}, maxva=0x{x}", .{ minva, maxva });
         break :bounds .{ minva, maxva };
     };
 
     // Check, that the needed memory region can be allocated as a whole. We do this
     const dynamic = ehdr.type == elf.ET.DYN;
-    log.debug("ELF type is {s}", .{if (dynamic) "DYN" else "EXEC (static)"});
+    log(.debug, "ELF type is {s}", .{if (dynamic) "DYN" else "EXEC (static)"});
     const hint = if (dynamic) null else @as(?[*]align(page_size) u8, @ptrFromInt(minva));
-    log.debug("mmap pre-flight hint: {*}", .{hint});
+    log(.debug, "mmap pre-flight hint: {*}", .{hint});
     const base = try posix.mmap(
         hint,
         maxva - minva,
@@ -170,7 +163,7 @@ fn loadStaticElf(ehdr: elf.Header, file_reader: *std.fs.File.Reader) !usize {
         -1,
         0,
     );
-    log.debug("Pre-flight reservation successful at: {*}, size: 0x{x}", .{ base.ptr, base.len });
+    log(.debug, "Pre-flight reservation successful at: {*}, size: 0x{x}", .{ base.ptr, base.len });
     posix.munmap(base);
 
     const flags = posix.MAP{ .TYPE = .PRIVATE, .ANONYMOUS = true, .FIXED = true };
@@ -186,7 +179,8 @@ fn loadStaticElf(ehdr: elf.Header, file_reader: *std.fs.File.Reader) !usize {
         var start = mem.alignBackward(usize, phdr.p_vaddr, page_size);
         const base_for_dyn = if (dynamic) @intFromPtr(base.ptr) else 0;
         start += base_for_dyn;
-        log.debug(
+        log(
+            .debug,
             "  - phdr[{}]: mapping 0x{x} bytes at 0x{x} (vaddr=0x{x}, dyn_base=0x{x})",
             .{ phdr_idx, size, start, phdr.p_vaddr, base_for_dyn },
         );
@@ -206,7 +200,7 @@ fn loadStaticElf(ehdr: elf.Header, file_reader: *std.fs.File.Reader) !usize {
             return UnfinishedReadError.UnfinishedRead;
         try posix.mprotect(ptr, elfToMmapProt(phdr.p_flags));
     }
-    log.debug("loadElf returning base: 0x{x}", .{@intFromPtr(base.ptr)});
+    log(.debug, "loadElf returning base: 0x{x}", .{@intFromPtr(base.ptr)});
     return @intFromPtr(base.ptr);
 }
 
@@ -260,98 +254,68 @@ fn trampoline(entry: usize, sp: [*]usize) noreturn {
 
 // TODO: make this be passed in from the build system
 const bin_path = "zig-out/bin/";
-fn getExePath(comptime name: []const u8) []const u8 {
-    return bin_path ++ name;
+fn getTestExePath(comptime name: []const u8) []const u8 {
+    return bin_path ++ "test_" ++ name;
 }
-const loader_path = getExePath("loader");
+const loader_path = bin_path ++ "loader";
 
-test "test_nolibc_nopie_exit" {
-    try testExit("test_nolibc_nopie_exit");
+test "nolibc_nopie_exit" {
+    try testHelper(&.{ loader_path, getTestExePath("nolibc_nopie_exit") }, "");
 }
-test "test_nolibc_pie_exit" {
-    try testExit("test_nolibc_pie_exit");
+test "nolibc_pie_exit" {
+    try testHelper(&.{ loader_path, getTestExePath("nolibc_pie_exit") }, "");
 }
-test "test_libc_pie_exit" {
-    try testExit("test_libc_pie_exit");
+test "libc_pie_exit" {
+    try testHelper(&.{ loader_path, getTestExePath("libc_pie_exit") }, "");
 }
 
-test "test_nolibc_nopie_helloWorld" {
-    try testHelloWorld("test_nolibc_nopie_helloWorld");
+test "nolibc_nopie_helloWorld" {
+    try testHelper(&.{ loader_path, getTestExePath("nolibc_nopie_helloWorld") }, "Hello World!\n");
 }
-test "test_nolibc_pie_helloWorld" {
-    try testHelloWorld("test_nolibc_pie_helloWorld");
+test "nolibc_pie_helloWorld" {
+    try testHelper(&.{ loader_path, getTestExePath("nolibc_pie_helloWorld") }, "Hello World!\n");
 }
-test "test_libc_pie_helloWorld" {
-    try testHelloWorld("test_libc_pie_helloWorld");
+test "libc_pie_helloWorld" {
+    try testHelper(&.{ loader_path, getTestExePath("libc_pie_helloWorld") }, "Hello World!\n");
 }
 
-test "test_nolibc_nopie_printArgs" {
-    try testPrintArgs("test_nolibc_nopie_printArgs");
+test "nolibc_nopie_printArgs" {
+    try testPrintArgs("nolibc_nopie_printArgs");
 }
-test "test_nolibc_pie_printArgs" {
-    try testPrintArgs("test_nolibc_pie_printArgs");
+test "nolibc_pie_printArgs" {
+    try testPrintArgs("nolibc_pie_printArgs");
 }
-test "test_libc_pie_printArgs" {
-    try testPrintArgs("test_libc_pie_printArgs");
+test "libc_pie_printArgs" {
+    try testPrintArgs("libc_pie_printArgs");
 }
 
-fn testExit(comptime name: []const u8) !void {
-    const exe_path = comptime getExePath(name);
-    const argv = &.{ loader_path, exe_path };
-    log.info("Running test: {s}", .{name});
-
-    const result = try std.process.Child.run(.{
-        .allocator = testing.allocator,
-        .argv = argv,
-    });
-    defer testing.allocator.free(result.stdout);
-    defer testing.allocator.free(result.stderr);
-    errdefer std.log.err("term: {}", .{result.term});
-    errdefer std.log.err("stdout: {s}", .{result.stdout});
-
-    try testing.expectEqualStrings("", result.stdout);
-    try testing.expect(result.term == .Exited);
-    try testing.expectEqual(0, result.term.Exited);
-}
-
-fn testHelloWorld(comptime name: []const u8) !void {
-    const exe_path = comptime getExePath(name);
-    const argv = &.{ loader_path, exe_path };
-    log.info("Running test: {s}", .{name});
-
-    const result = try std.process.Child.run(.{
-        .allocator = testing.allocator,
-        .argv = argv,
-    });
-    defer testing.allocator.free(result.stdout);
-    defer testing.allocator.free(result.stderr);
-    errdefer std.log.err("term: {}", .{result.term});
-    errdefer std.log.err("stdout: {s}", .{result.stdout});
-
-    try testing.expectEqualStrings("Hello World!\n", result.stdout);
-    try testing.expect(result.term == .Exited);
-    try testing.expectEqual(0, result.term.Exited);
+test "echo" {
+    try testHelper(&.{ "echo", "Hello", "There" }, "Hello There\n");
 }
 
 fn testPrintArgs(comptime name: []const u8) !void {
-    const exe_path = comptime getExePath(name);
-    const loader_argv: []const []const u8 = &.{ loader_path, exe_path, "foo", "bar", "baz", "hi" };
+    const exe_path = getTestExePath(name);
+    const loader_argv: []const []const u8 = &.{ loader_path, exe_path, "foo", "bar", "baz hi" };
     const target_argv = loader_argv[1..];
-    log.info("Running test: {s}", .{name});
+    const expected_stout = try mem.join(testing.allocator, " ", target_argv);
+    defer testing.allocator.free(expected_stout);
+    try testHelper(loader_argv, expected_stout);
+}
 
+fn testHelper(
+    argv: []const []const u8,
+    expected_stdout: []const u8,
+) !void {
     const result = try std.process.Child.run(.{
         .allocator = testing.allocator,
-        .argv = loader_argv,
+        .argv = argv,
     });
     defer testing.allocator.free(result.stdout);
     defer testing.allocator.free(result.stderr);
-    errdefer std.log.err("term: {}", .{result.term});
-    errdefer std.log.err("stdout: {s}", .{result.stdout});
+    errdefer log(.err, "term: {}", .{result.term});
+    errdefer log(.err, "stdout: {s}", .{result.stdout});
 
-    const expected_stout = try mem.join(testing.allocator, " ", target_argv);
-    defer testing.allocator.free(expected_stout);
-
-    try testing.expectEqualStrings(expected_stout, result.stdout);
+    try testing.expectEqualStrings(expected_stdout, result.stdout);
     try testing.expect(result.term == .Exited);
     try testing.expectEqual(0, result.term.Exited);
 }