Generate standalone files for Regz by default

build.zig

@@ -387,6 +387,7 @@ pub fn MicroBuild(port_select: PortSelect) type {
                 .atdf, .svd => |file| blk: {
                     const regz_run = b.addRunArtifact(regz_exe);
 
+                    regz_run.addArg("--microzig");
                     regz_run.addArg("--format");
                     regz_run.addArg(@tagName(target.chip.register_definition));
 

tools/regz/src/Database.zig

@@ -2031,8 +2031,8 @@ pub fn apply_patch(db: *Database, ndjson: []const u8) !void {
     }
 }
 
-pub fn to_zig(db: *Database, out_writer: anytype) !void {
-    try gen.to_zig(db, out_writer);
+pub fn to_zig(db: *Database, for_microzig: bool, out_writer: anytype) !void {
+    try gen.to_zig(db, for_microzig, out_writer);
 }
 
 test "all" {

tools/regz/src/gen.zig

@@ -19,7 +19,7 @@ const riscv = @import("arch/riscv.zig");
 
 const log = std.log.scoped(.gen);
 
-pub fn to_zig(db: *Database, out_writer: anytype) !void {
+pub fn to_zig(db: *Database, for_microzig: bool, out_writer: anytype) !void {
     var arena = std.heap.ArenaAllocator.init(db.gpa);
     defer arena.deinit();
 
@@ -29,11 +29,18 @@ pub fn to_zig(db: *Database, out_writer: anytype) !void {
     defer buffer.deinit();
 
     const writer = buffer.writer();
-    try writer.writeAll(
-        \\const micro = @import("microzig");
-        \\const mmio = micro.mmio;
-        \\
-    );
+    if (for_microzig) {
+        try writer.writeAll(
+            \\const micro = @import("microzig");
+            \\const mmio = micro.mmio;
+            \\
+        );
+    } else {
+        try writer.writeAll(
+            \\const mmio = @import("mmio");
+            \\
+        );
+    }
     try write_devices(db, allocator, writer);
     try write_types(db, allocator, writer);
     try writer.writeByte(0);

tools/regz/src/main.zig

@@ -26,6 +26,7 @@ const Arguments = struct {
     output_path: ?[:0]const u8 = null,
     patch_path: ?[]const u8 = null,
     dump: bool = false,
+    microzig: bool = false,
     help: bool = false,
 
     fn deinit(args: *Arguments) void {
@@ -40,6 +41,7 @@ fn print_usage(writer: anytype) !void {
         \\regz
         \\  --help                Display this help and exit
         \\  --dump                Dump SQLite file instead of generate code
+        \\  --microzig            Generate for microzig instead of a standalone file
         \\  --format <str>        Explicitly set format type, one of: svd, atdf, json
         \\  --output_path <str>   Write to a file
         \\  --patch_path <str>    After reading format, apply NDJSON based patch file
@@ -63,6 +65,8 @@ fn parse_args(allocator: Allocator) !Arguments {
             ret.help = true;
         } else if (std.mem.eql(u8, args[i], "--dump")) {
             ret.dump = true;
+        } else if (std.mem.eql(u8, args[i], "--microzig")) {
+            ret.microzig = true;
         } else if (std.mem.eql(u8, args[i], "--format")) {
             i += 1;
             if (i >= args.len)
@@ -177,6 +181,6 @@ fn main_impl() anyerror!void {
         std.io.getStdOut().writer();
 
     var buffered = std.io.bufferedWriter(raw_writer);
-    try db.to_zig(buffered.writer());
+    try db.to_zig(args.microzig, buffered.writer());
     try buffered.flush();
 }