Skip to content

WIP: Update sorcerer to zig 0.17 #1019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
piotrfila wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

WIP: Update sorcerer to zig 0.17 #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9295345
sorcerer: remove unused serial dependency
piotrfila Aug 27, 2026
33f2d3f
sorcerer: revert to zig 0.15 for now
piotrfila Aug 27, 2026
ea8d3da
sorcerer: use .empty instead of .{} for container default value
piotrfila Aug 27, 2026
2ad5032
sorcerer: rename window handles to wnd
piotrfila Aug 27, 2026
c346d28
sorcerer: Use Writer.Allocating instead of ArrayList for printing to …
piotrfila Aug 27, 2026
0215618
sorcerer: redo cli io
piotrfila Aug 27, 2026
500508d
regz: export types used in patches
piotrfila Aug 27, 2026
663a0bd
sorcerer: cleanup build script
piotrfila Aug 28, 2026
fc434df
virtual-io: implement saving to another io instance
piotrfila Aug 28, 2026
e96ef0e
sorcerer: update cli and diff tests to 0.17
piotrfila Aug 28, 2026
9536cd9
sorcerer: update build system and deps for gui
piotrfila Aug 28, 2026
1a2cbff
regz: remove pointless conversions to zon and back
piotrfila Aug 28, 2026
4115cd5
sorcerer: remove lagacy build script code
piotrfila Aug 28, 2026
77323c5
sorcerer: update gui app
piotrfila Aug 28, 2026
e3e5b04
regz: add minimum zig version and fix typo
piotrfila Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions modules/virtual-io/src/root.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,37 @@ pub const VirtualIo = struct {
vio.nodes.deinit(vio.gpa);
}

/// Copies all files and directories from `src` directory into `dst` (which must belong to `io_other`).
pub fn save_dir_recursive(vio: *const VirtualIo, src: Dir.ID, io_other: Io, dst: Io.Dir) !usize {
return save_dir_recursive_helper(vio, try src.get(vio), io_other, dst);
}

fn save_dir_recursive_helper(vio: *const VirtualIo, src: *const Dir, io_other: Io, dst: Io.Dir) !usize {
var it = src.inner.iterator();
var files_written: usize = 0;

while (it.next()) |entry| {
const sub_path = entry.key_ptr.*;
const node = vio.nodes.getPtr(entry.value_ptr.*) orelse return error.Invalid;
switch (node.*) {
.dir => |*dir| {
const new_tgt = try dst.createDirPathOpen(io_other, sub_path, .{});
defer new_tgt.close(io_other);
files_written += try save_dir_recursive_helper(vio, dir, io_other, new_tgt);
},
.file => |file| {
var writer = (try dst.createFile(io_other, sub_path, .{}))
.writer(io_other, "");
defer writer.file.close(io_other);
try writer.interface.writeAll(file.inner.items);
try writer.interface.flush();
files_written += 1;
},
}
}
return files_written;
}

pub fn total_file_count(vio: *const VirtualIo) usize {
var ret: usize = 0;
var it = vio.nodes.iterator();
Expand Down
1 change: 1 addition & 0 deletions tools/regz/build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.name = .mz_tools_regz,
.fingerprint = 0x7886602f9b3c8b94,
.version = "0.0.0",
.minimum_zig_version = "0.17.0-dev.1471+ff10b90bc",
.paths = .{
"README.md",
"build.zig",
Expand Down
314 changes: 141 additions & 173 deletions tools/regz/src/Database.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2098,108 +2098,103 @@ fn cleanup_unused_enums(db: *Database) !void {
, .{});
}

pub fn apply_patch(db: *Database, zon_text: [:0]const u8, diags: *std.zon.parse.Diagnostics) !void {
const patches = try std.zon.parse.fromSliceAlloc([]const Patch, db.gpa, zon_text, diags, .{});
defer std.zon.parse.free(db.gpa, patches);

for (patches) |patch| {
switch (patch) {
.override_arch => |override_arch| {
const device_id = try db.get_device_id_by_name(override_arch.device_name) orelse {
return error.DeviceNotFound;
};

try db.conn.exec(
\\UPDATE devices
\\SET arch = ?
\\WHERE id = ?;
, .{
override_arch.arch.to_string(),
@backingInt(device_id),
});
},
.set_device_property => |set_prop| {
const device_id = try db.get_device_id_by_name(set_prop.device_name) orelse {
return error.DeviceNotFound;
};

try db.conn.exec(
\\INSERT INTO device_properties
\\ (device_id, key, value, description)
\\VALUES
\\ (?, ?, ?, ?)
\\ON CONFLICT(device_id, key)
\\DO UPDATE SET
\\ value = excluded.value,
\\ description = excluded.description;
, .{
@backingInt(device_id),
set_prop.key,
set_prop.value,
set_prop.description,
pub fn apply_patch(db: *Database, patch: Patch) !void {
switch (patch) {
.override_arch => |override_arch| {
const device_id = try db.get_device_id_by_name(override_arch.device_name) orelse {
return error.DeviceNotFound;
};

try db.conn.exec(
\\UPDATE devices
\\SET arch = ?
\\WHERE id = ?;
, .{
override_arch.arch.to_string(),
@backingInt(device_id),
});
},
.set_device_property => |set_prop| {
const device_id = try db.get_device_id_by_name(set_prop.device_name) orelse {
return error.DeviceNotFound;
};

try db.conn.exec(
\\INSERT INTO device_properties
\\ (device_id, key, value, description)
\\VALUES
\\ (?, ?, ?, ?)
\\ON CONFLICT(device_id, key)
\\DO UPDATE SET
\\ value = excluded.value,
\\ description = excluded.description;
, .{
@backingInt(device_id),
set_prop.key,
set_prop.value,
set_prop.description,
});
},
.add_enum => |add_enum| {
const struct_id = try db.get_struct_ref(add_enum.parent);

const enum_id = try db.create_enum(struct_id, .{
.name = add_enum.@"enum".name,
.description = add_enum.@"enum".description,
.size_bits = add_enum.@"enum".bitsize,
});

for (add_enum.@"enum".fields) |enum_field| {
try db.add_enum_field(enum_id, .{
.name = enum_field.name,
.description = enum_field.description,
.value = enum_field.value,
});
},
.add_enum => |add_enum| {
const struct_id = try db.get_struct_ref(add_enum.parent);

const enum_id = try db.create_enum(struct_id, .{
.name = add_enum.@"enum".name,
.description = add_enum.@"enum".description,
.size_bits = add_enum.@"enum".bitsize,
}
},
.set_enum_type => |set_enum_type| {
const enum_id = if (set_enum_type.to) |to| try db.get_enum_ref(to) else null;
const field_name, const register_ref = try get_ref_last_component(set_enum_type.of);
const register_id = try db.get_register_ref(register_ref orelse return error.InvalidRef);
try db.set_register_field_enum_id(register_id, field_name, enum_id);
try db.cleanup_unused_enums();
},
.add_interrupt => |add_interrupt| {
const device_id = try db.get_device_id_by_name(add_interrupt.device_name) orelse {
return error.DeviceNotFound;
};

_ = try db.create_interrupt(device_id, .{
.name = add_interrupt.name,
.description = add_interrupt.description,
.idx = add_interrupt.idx,
});
},
.add_enum_and_apply => |add_enum_patch| {
// First, create the enum (same as add_enum)
const struct_id = try db.get_struct_ref(add_enum_patch.parent);

const enum_id = try db.create_enum(struct_id, .{
.name = add_enum_patch.@"enum".name,
.description = add_enum_patch.@"enum".description,
.size_bits = add_enum_patch.@"enum".bitsize,
});

for (add_enum_patch.@"enum".fields) |enum_field| {
try db.add_enum_field(enum_id, .{
.name = enum_field.name,
.description = enum_field.description,
.value = enum_field.value,
});
}

for (add_enum.@"enum".fields) |enum_field| {
try db.add_enum_field(enum_id, .{
.name = enum_field.name,
.description = enum_field.description,
.value = enum_field.value,
});
}
},
.set_enum_type => |set_enum_type| {
const enum_id = if (set_enum_type.to) |to| try db.get_enum_ref(to) else null;
const field_name, const register_ref = try get_ref_last_component(set_enum_type.of);
// Then, apply to all specified fields (same as set_enum_type)
for (add_enum_patch.apply_to) |field_ref| {
const field_name, const register_ref = try get_ref_last_component(field_ref);
const register_id = try db.get_register_ref(register_ref orelse return error.InvalidRef);
try db.set_register_field_enum_id(register_id, field_name, enum_id);
try db.cleanup_unused_enums();
},
.add_interrupt => |add_interrupt| {
const device_id = try db.get_device_id_by_name(add_interrupt.device_name) orelse {
return error.DeviceNotFound;
};

_ = try db.create_interrupt(device_id, .{
.name = add_interrupt.name,
.description = add_interrupt.description,
.idx = add_interrupt.idx,
});
},
.add_enum_and_apply => |add_enum_patch| {
// First, create the enum (same as add_enum)
const struct_id = try db.get_struct_ref(add_enum_patch.parent);

const enum_id = try db.create_enum(struct_id, .{
.name = add_enum_patch.@"enum".name,
.description = add_enum_patch.@"enum".description,
.size_bits = add_enum_patch.@"enum".bitsize,
});

for (add_enum_patch.@"enum".fields) |enum_field| {
try db.add_enum_field(enum_id, .{
.name = enum_field.name,
.description = enum_field.description,
.value = enum_field.value,
});
}

// Then, apply to all specified fields (same as set_enum_type)
for (add_enum_patch.apply_to) |field_ref| {
const field_name, const register_ref = try get_ref_last_component(field_ref);
const register_id = try db.get_register_ref(register_ref orelse return error.InvalidRef);
try db.set_register_field_enum_id(register_id, field_name, enum_id);
}
},
}
}
},
}
}

Expand Down Expand Up @@ -2264,35 +2259,26 @@ test "add_enum_and_apply patch creates enum and applies to fields" {
});

// Apply the add_enum_and_apply patch
const patch_zon: [:0]const u8 =
\\.{
\\ .{
\\ .add_enum_and_apply = .{
\\ .parent = "types.peripherals.TEST_PERIPHERAL",
\\ .@"enum" = .{
\\ .name = "TestMode",
\\ .bitsize = 2,
\\ .fields = .{
\\ .{ .value = 0x0, .name = "mode_a" },
\\ .{ .value = 0x1, .name = "mode_b" },
\\ .{ .value = 0x2, .name = "mode_c" },
\\ .{ .value = 0x3, .name = "mode_d" },
\\ },
\\ },
\\ .apply_to = .{
\\ "types.peripherals.TEST_PERIPHERAL.REG0.MODE",
\\ "types.peripherals.TEST_PERIPHERAL.REG1.MODE",
\\ "types.peripherals.TEST_PERIPHERAL.REG2.MODE",
\\ },
\\ },
\\ },
\\}
;

var diags: std.zon.parse.Diagnostics = .{};
defer diags.deinit(allocator);

try db.apply_patch(patch_zon, &diags);
try db.apply_patch(.{
.add_enum_and_apply = .{
.parent = "types.peripherals.TEST_PERIPHERAL",
.@"enum" = .{
.name = "TestMode",
.bitsize = 2,
.fields = &.{
.{ .value = 0x0, .name = "mode_a" },
.{ .value = 0x1, .name = "mode_b" },
.{ .value = 0x2, .name = "mode_c" },
.{ .value = 0x3, .name = "mode_d" },
},
},
.apply_to = &.{
"types.peripherals.TEST_PERIPHERAL.REG0.MODE",
"types.peripherals.TEST_PERIPHERAL.REG1.MODE",
"types.peripherals.TEST_PERIPHERAL.REG2.MODE",
},
},
});

// Verify the enum was created
var arena = std.heap.ArenaAllocator.init(allocator);
Expand Down Expand Up @@ -2330,29 +2316,20 @@ test "add_enum_and_apply patch with empty apply_to list" {
const struct_id = try db.get_peripheral_struct(peripheral_id);

// Apply patch with empty apply_to list (just creates the enum)
const patch_zon: [:0]const u8 =
\\.{
\\ .{
\\ .add_enum_and_apply = .{
\\ .parent = "types.peripherals.TEST_PERIPHERAL",
\\ .@"enum" = .{
\\ .name = "UnusedEnum",
\\ .bitsize = 4,
\\ .fields = .{
\\ .{ .value = 0, .name = "value0" },
\\ .{ .value = 1, .name = "value1" },
\\ },
\\ },
\\ .apply_to = .{},
\\ },
\\ },
\\}
;

var diags: std.zon.parse.Diagnostics = .{};
defer diags.deinit(allocator);

try db.apply_patch(patch_zon, &diags);
try db.apply_patch(.{
.add_enum_and_apply = .{
.parent = "types.peripherals.TEST_PERIPHERAL",
.@"enum" = .{
.name = "UnusedEnum",
.bitsize = 4,
.fields = &.{
.{ .value = 0, .name = "value0" },
.{ .value = 1, .name = "value1" },
},
},
.apply_to = &.{},
},
});

// Verify the enum was created
var arena = std.heap.ArenaAllocator.init(allocator);
Expand All @@ -2373,29 +2350,20 @@ test "add_enum_and_apply patch with invalid field reference" {
});

// Apply patch with invalid field reference
const patch_zon: [:0]const u8 =
\\.{
\\ .{
\\ .add_enum_and_apply = .{
\\ .parent = "types.peripherals.TEST_PERIPHERAL",
\\ .@"enum" = .{
\\ .name = "TestEnum",
\\ .bitsize = 2,
\\ .fields = .{
\\ .{ .value = 0, .name = "value0" },
\\ },
\\ },
\\ .apply_to = .{
\\ "types.peripherals.TEST_PERIPHERAL.NONEXISTENT.FIELD",
\\ },
\\ },
\\ },
\\}
;

var diags: std.zon.parse.Diagnostics = .{};
defer diags.deinit(allocator);

const result = db.apply_patch(patch_zon, &diags);
const result = db.apply_patch(.{
.add_enum_and_apply = .{
.parent = "types.peripherals.TEST_PERIPHERAL",
.@"enum" = .{
.name = "TestEnum",
.bitsize = 2,
.fields = &.{
.{ .value = 0, .name = "value0" },
},
},
.apply_to = &.{
"types.peripherals.TEST_PERIPHERAL.NONEXISTENT.FIELD",
},
},
});
try std.testing.expectError(error.MissingEntity, result);
}
Loading
Loading