finished wrapper to use (comptime) allocators from capstone

1 files changed, 34 insertions, 13 deletions

diff --git a/src/elfo.zig b/src/elfo.zig
index 20f798a..5e0d780 100644
--- a/src/elfo.zig
+++ b/src/elfo.zig
@@ -1,29 +1,50 @@
 const std = @import("std");
 const cs = @import("capstone");
+const hooks = @import("hooks.zig");
 const meta_opts = @import("meta");
 
-pub fn main(init: std.process.Init) !void {
-    var args = try init.minimal.args.iterateAllocator(init.gpa);
+pub fn main(init: std.process.Init.Minimal) !void {
+    var debug_alloc: std.heap.DebugAllocator(.{}) = .init;
+    const alloc = debug_alloc.allocator();
+
+    var threaded: std.Io.Threaded = .init(alloc, .{
+        .argv0 = .init(init.args),
+        .environ = init.environ,
+    });
+    defer threaded.deinit();
+    const io = threaded.io();
+
+    var args = try init.args.iterateAllocator(alloc);
     defer args.deinit();
     _ = args.next(); // skip argv[0]
 
     var buffer: [64]u8 = undefined;
-    const stderr = try init.io.lockStderr(&buffer, .escape_codes);
+    const stderr = try io.lockStderr(&buffer, .escape_codes);
 
-    // TODO: finish passing custom alloc operations here
-    // const mem_config: cs.cs_opt_mem = undefined;
-    // std.debug.assert(cs.cs_option(0, cs.CS_OPT_MEM, @intFromPtr(&mem_config)) == cs.CS_ERR_OK);
+    const hook = hooks.init(
+        if (meta_opts.gdb) .breakpoint else .none,
+        // TODO: this needs to be comptime, it'd be cool to don't need that
+        std.heap.page_allocator,
+        false,
+    );
 
-    if (meta_opts.gdb) @breakpoint();
+    const mem_config: cs.cs_opt_mem = .{
+        .malloc = @ptrCast(&hook.malloc),
+        .free = @ptrCast(&hook.free),
+        .calloc = @ptrCast(&hook.calloc),
+        .realloc = @ptrCast(&hook.realloc),
+        .vsnprintf = @ptrCast(&hook.vsnprintf),
+    };
+    std.debug.assert(cs.cs_option(0, cs.CS_OPT_MEM, @intFromPtr(&mem_config)) == cs.CS_ERR_OK);
 
     try printElf(
-        init.gpa,
-        init.io,
+        alloc,
+        io,
         args.next() orelse "./study-samples/split",
         stderr.terminal(),
         .{
             .show_unaddressable_sections = true,
-            // .skip_sections_content = true,
+            .skip_sections_content = true,
         },
     );
 }
@@ -156,7 +177,7 @@ pub fn printElf(
 
                 // x64: symtab: .{ .sh_name = 1, .sh_type = 2, .sh_flags = 0, .sh_addr = 0, .sh_offset = 4256, .sh_size = 1680, .sh_link = 27, .sh_info = 45, .sh_addralign = 8, .sh_entsize = 24 }
                 // arm32: .{ .sh_name = 1, .sh_type = 2, .sh_flags = 0, .sh_addr = 0, .sh_offset = 4264, .sh_size = 1856, .sh_link = 27, .sh_info = 87, .sh_addralign = 4, .sh_entsize = 16 }
-                try bw.print("symtab: {any}\n", .{s});
+                // try bw.print("symtab: {any}\n", .{s});
                 break :blk s;
             }
         }
@@ -225,7 +246,7 @@ pub fn printElf(
 
     for (symbols_index.items) |sym| {
         if (sym.kind == std.elf.STT_FUNC and sym.name.len > 0)
-            try bw.print("{s} {x}-{x}\n", .{ sym.name, sym.start, sym.end });
+            try bw.print("{x}-{x} {s}\n", .{ sym.start, sym.end, sym.name });
     }
 
     for (sections.items) |section| {
@@ -240,7 +261,7 @@ pub fn printElf(
             try term.setColor(.bright_green);
             if (elf_shstrtab_slice != null)
                 try bw.print("{s}", .{std.mem.sliceTo(elf_shstrtab_slice.?[section.sh_name..], 0)});
-            try bw.print("\n", .{});
+            try bw.print("", .{});
             try term.setColor(.reset);
 
             // --