More progress

Author: tact1m4n3

port/espressif/esp/src/tools/cat.zig

@@ -1,29 +1,23 @@
 const std = @import("std");
 
-pub fn main() !void {
-    var debug_allocator: std.heap.DebugAllocator(.{}) = .init;
-    defer _ = debug_allocator.deinit();
-
-    const allocator = debug_allocator.allocator();
-
-    const args = try std.process.argsAlloc(allocator);
-    defer std.process.argsFree(allocator, args);
-
+pub fn main(init: std.process.Init) !void {
+    const io = init.io;
+    const allocator = init.arena.allocator();
+    const args = try init.minimal.args.toSlice(allocator);
     if (args.len < 2) {
         std.log.err("usage: ./cat [src_file ...] dst_file", .{});
         return error.InvalidArguments;
     }
 
-    const output_file = try std.fs.createFileAbsolute(args[args.len - 1], .{});
-    defer output_file.close();
+    const output_file = try std.Io.Dir.createFileAbsolute(io, args[args.len - 1], .{});
+    defer output_file.close(io);
+    var output_file_buf: [4096]u8 = undefined;
+    var output_file_writer = output_file.writer(io, &output_file_buf);
 
     for (args[1 .. args.len - 1]) |arg| {
-        const file = try std.fs.openFileAbsolute(arg, .{ .mode = .read_only });
-        defer file.close();
-
-        const data = try file.readToEndAlloc(allocator, 1_000_000);
-        defer allocator.free(data);
-
-        try output_file.writeAll(data);
+        const file = try std.Io.Dir.openFileAbsolute(io, arg, .{});
+        defer file.close(io);
+        var file_reader = file.reader(io, &.{});
+        _ = try output_file_writer.interface.sendFileAll(&file_reader, .unlimited);
     }
 }

port/texasinstruments/msp430/build.zig

@@ -58,7 +58,6 @@ pub fn build(b: *std.Build) void {
     generate_exe.root_module.addImport("regz", regz);
 
     const generate_run = b.addRunArtifact(generate_exe);
-    generate_run.max_stdio_size = std.math.maxInt(usize);
     generate_run.addFileArg(targetdb);
 
     const generate_step = b.step("generate", "Generate chips file 'src/Chips.zig'");

tools/esp-image/src/elf2image.zig

@@ -11,10 +11,9 @@ var elf_file_reader_buf: [1024]u8 = undefined;
 var elf_file_hashing_buf: [std.crypto.hash.sha2.Sha256.digest_length]u8 = undefined;
 var output_writer_buf: [1024]u8 = undefined;
 
-pub fn main() !void {
-    var debug_allocator: std.heap.DebugAllocator(.{}) = .init;
-    defer _ = debug_allocator.deinit();
-    const allocator = debug_allocator.allocator();
+pub fn main(init: std.process.Init) !void {
+    const io = init.io;
+    const allocator = init.gpa;
 
     const args = comptime clap.parseParamsComptime(
         \\--help                                     Show this message
@@ -32,8 +31,8 @@ pub fn main() !void {
         \\
     );
 
-    const stderr = std.fs.File.stderr();
-    var stderr_writer = stderr.writer(&.{});
+    const stderr = std.Io.File.stderr();
+    var stderr_writer = stderr.writer(io, &.{});
 
     var diag: clap.Diagnostic = .{};
     var res = clap.parse(clap.Help, &args, .{
@@ -90,9 +89,9 @@ pub fn main() !void {
 
     const use_segments = res.args.@"use-segments" != 0;
 
-    const elf_file = try std.fs.cwd().openFile(elf_path, .{});
+    const elf_file = try std.Io.Dir.openFileAbsolute(elf_path, .{});
     defer elf_file.close();
-    var elf_file_reader = elf_file.reader(&elf_file_reader_buf);
+    var elf_file_reader = elf_file.reader(io, &elf_file_reader_buf);
 
     var elf_file_hash: [std.crypto.hash.sha2.Sha256.digest_length]u8 = undefined;
     {

tools/generate_linker_script.zig

@@ -16,21 +16,20 @@ var writer_buf: [1024]u8 = undefined;
 
 pub fn main(init: std.process.Init) !void {
     const io = init.io;
-    const gpa = init.gpa;
-    const arena = init.arena;
+    const arena = init.arena.allocator();
 
-    const args = try init.minimal.args.toSlice(arena.allocator());
+    const args = try init.minimal.args.toSlice(arena);
     if (args.len < 3 or args.len > 4) {
         return error.UsageError;
     }
 
     const json_args = args[1];
     const output_path = args[2];
 
-    const parsed_args = try std.json.parseFromSliceLeaky(Args, gpa, json_args, .{});
+    const parsed_args = try std.json.parseFromSliceLeaky(Args, arena, json_args, .{});
 
     const maybe_user_linker_script = if (args.len == 4)
-        try std.Io.Dir.cwd().readFileAlloc(io, args[3], gpa, .limited(100 * 1024 * 1024))
+        try std.Io.Dir.cwd().readFileAlloc(io, args[3], arena, .limited(100 * 1024 * 1024))
     else
         null;
 
@@ -51,14 +50,14 @@ pub fn main(init: std.process.Init) !void {
     });
 
     // name all unnamed regions
-    const region_names: [][]const u8 = try gpa.alloc([]const u8, parsed_args.memory_regions.len);
+    const region_names: [][]const u8 = try arena.alloc([]const u8, parsed_args.memory_regions.len);
     {
         var counters: [5]usize = @splat(0);
         for (region_names, parsed_args.memory_regions) |*region_name, region| {
             if (region.name) |name| {
-                region_name.* = try gpa.dupe(u8, name);
+                region_name.* = try arena.dupe(u8, name);
             } else {
-                region_name.* = try std.fmt.allocPrint(gpa, "{s}{}", .{
+                region_name.* = try std.fmt.allocPrint(arena, "{s}{}", .{
                     @tagName(region.tag),
                     counters[@intFromEnum(region.tag)],
                 });
@@ -249,7 +248,7 @@ pub fn main(init: std.process.Init) !void {
             \\
         , .{
             if (!parsed_args.ram_image)
-                try std.fmt.allocPrint(gpa, "{s} AT> {s}", .{ ram_region_name, flash_region_name })
+                try std.fmt.allocPrint(arena, "{s} AT> {s}", .{ ram_region_name, flash_region_name })
             else
                 ram_region_name,
             ram_region_name,