ElicMagus
/
microzig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove indenting, just let the ast parser format the code (#11)

Browse Source
wch-ch32v003
Matt Knight 3 years ago committed by Matt Knight
parent 2de91f6ca5
commit d6d34e21b0
1 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File

72
tools/regz/src/Database.zig
Unescape Escape View File

@ -642,7 +642,6 @@ fn writeDescription(
allocator: Allocator, allocator: Allocator,
writer: anytype, writer: anytype,
description: []const u8, description: []const u8,
indent: usize,
) !void { ) !void {
const max_line_width = 80; const max_line_width = 80;
@ -656,13 +655,11 @@ fn writeDescription(
while (it.next()) |token| { while (it.next()) |token| {
if (line.items.len + token.len > max_line_width) { if (line.items.len + token.len > max_line_width) {
if (line.items.len > 0) { if (line.items.len > 0) {
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("///{s}\n", .{line.items}); try writer.print("///{s}\n", .{line.items});
line.clearRetainingCapacity(); line.clearRetainingCapacity();
try line.append(' '); try line.append(' ');
try line.appendSlice(token); try line.appendSlice(token);
} else { } else {
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("/// {s}\n", .{token}); try writer.print("/// {s}\n", .{token});
} }
} else { } else {
@ -672,22 +669,25 @@ fn writeDescription(
} }
if (line.items.len > 0) { if (line.items.len > 0) {
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("///{s}\n", .{line.items}); try writer.print("///{s}\n", .{line.items});
} }
} }
} }
pub fn toZig(self: *Self, writer: anytype) !void { pub fn toZig(self: *Self, out_writer: anytype) !void {
if (self.device == null) { if (self.device == null) {
std.log.err("failed to find device info", .{}); std.log.err("failed to find device info", .{});
return error.Explained; return error.Explained;
} }
var fifo = std.fifo.LinearFifo(u8, .Dynamic).init(self.allocator);
defer fifo.deinit();
const writer = fifo.writer();
try writer.print( try writer.print(
\\// this file was generated by regz: https://github.com/ZigEmbeddedGroup/regz \\// this file was generated by regz: https://github.com/ZigEmbeddedGroup/regz
\\// commit: {s} \\// commit: {s}
\\
, .{build_options.commit}); , .{build_options.commit});
try writer.writeAll("//\n"); try writer.writeAll("//\n");
if (self.device.?.vendor) |vendor_name| if (self.device.?.vendor) |vendor_name|
@ -759,7 +759,7 @@ pub fn toZig(self: *Self, writer: anytype) !void {
} }
if (interrupt.description) |description| if (!useless_descriptions.has(description)) if (interrupt.description) |description| if (!useless_descriptions.has(description))
try writeDescription(self.arena.child_allocator, writer, description, 1); try writeDescription(self.arena.child_allocator, writer, description);
try writer.print(" {s}: InterruptVector = unhandled,\n", .{std.zig.fmtId(interrupt.name)}); try writer.print(" {s}: InterruptVector = unhandled,\n", .{std.zig.fmtId(interrupt.name)});
expected += 1; expected += 1;
@ -792,7 +792,7 @@ pub fn toZig(self: *Self, writer: anytype) !void {
if (registers.len != 0 or has_clusters) { if (registers.len != 0 or has_clusters) {
if (peripheral.description) |description| if (!useless_descriptions.has(description)) { if (peripheral.description) |description| if (!useless_descriptions.has(description)) {
try writer.writeByte('\n'); try writer.writeByte('\n');
try writeDescription(self.arena.child_allocator, writer, description, 1); try writeDescription(self.arena.child_allocator, writer, description);
}; };
try writer.print(" pub const {s} = struct {{\n", .{std.zig.fmtId(peripheral.name)}); try writer.print(" pub const {s} = struct {{\n", .{std.zig.fmtId(peripheral.name)});
@ -804,13 +804,13 @@ pub fn toZig(self: *Self, writer: anytype) !void {
for (registers) |_, range_offset| { for (registers) |_, range_offset| {
const reg_idx = @intCast(u32, reg_range.begin + range_offset); const reg_idx = @intCast(u32, reg_range.begin + range_offset);
try self.genZigRegister(writer, peripheral.base_addr, reg_idx, 2, .namespaced); try self.genZigRegister(writer, peripheral.base_addr, reg_idx, .namespaced);
} }
if (has_clusters) { if (has_clusters) {
for (self.clusters_in_peripherals.items) |cip| { for (self.clusters_in_peripherals.items) |cip| {
if (cip.peripheral_idx == peripheral_idx) { if (cip.peripheral_idx == peripheral_idx) {
try self.genZigCluster(writer, peripheral.base_addr, cip.cluster_idx, 2, .namespaced); try self.genZigCluster(writer, peripheral.base_addr, cip.cluster_idx, .namespaced);
} }
} }
@ -828,6 +828,17 @@ pub fn toZig(self: *Self, writer: anytype) !void {
} }
try writer.writeAll("\n" ++ @embedFile("mmio.zig")); try writer.writeAll("\n" ++ @embedFile("mmio.zig"));
// write zero to fifo so that it's null terminated
try writer.writeByte(0);
const text = fifo.readableSlice(0);
var ast = try std.zig.parse(self.allocator, @bitCast([:0]const u8, text[0 .. text.len - 1]));
defer ast.deinit(self.allocator);
const formatted_text = try ast.render(self.allocator);
defer self.allocator.free(formatted_text);
try out_writer.writeAll(formatted_text);
} }
fn genZigCluster( fn genZigCluster(
@ -835,7 +846,6 @@ fn genZigCluster(
writer: anytype, writer: anytype,
base_addr: ?usize, base_addr: ?usize,
cluster_idx: u32, cluster_idx: u32,
indent: usize,
nesting: Nesting, nesting: Nesting,
) !void { ) !void {
const cluster = db.clusters.items[cluster_idx]; const cluster = db.clusters.items[cluster_idx];
@ -854,19 +864,18 @@ fn genZigCluster(
try writer.writeByte('\n'); try writer.writeByte('\n');
if (cluster.description) |description| if (cluster.description) |description|
if (!useless_descriptions.has(description)) if (!useless_descriptions.has(description))
try writeDescription(db.arena.child_allocator, writer, description, indent); try writeDescription(db.arena.child_allocator, writer, description);
if (dimension_opt) |dimension| { if (dimension_opt) |dimension| {
const name = try std.mem.replaceOwned(u8, db.arena.allocator(), cluster.name, "[%s]", ""); const name = try std.mem.replaceOwned(u8, db.arena.allocator(), cluster.name, "[%s]", "");
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("pub const {s} = @ptrCast(*volatile [{}]packed struct {{", .{ name, dimension.dim }); try writer.print("pub const {s} = @ptrCast(*volatile [{}]packed struct {{", .{ name, dimension.dim });
// TODO: check address offset of register wrt the cluster // TODO: check address offset of register wrt the cluster
var bits: usize = 0; var bits: usize = 0;
for (registers) |register, offset| { for (registers) |register, offset| {
const reg_idx = @intCast(u32, range.begin + offset); const reg_idx = @intCast(u32, range.begin + offset);
try db.genZigRegister(writer, base_addr, reg_idx, indent + 1, .contained); try db.genZigRegister(writer, base_addr, reg_idx, .contained);
bits += register.size; bits += register.size;
} }
@ -881,21 +890,17 @@ fn genZigCluster(
const num_padding_words = (dimension.increment - bytes) / bytes_per_word; const num_padding_words = (dimension.increment - bytes) / bytes_per_word;
var i: usize = 0; var i: usize = 0;
while (i < num_padding_words) : (i += 1) { while (i < num_padding_words) : (i += 1) {
try writer.writeByteNTimes(' ', (indent + 1) * 4);
try writer.print("padding{}: u{},\n", .{ i, db.device.?.width }); try writer.print("padding{}: u{},\n", .{ i, db.device.?.width });
} }
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("}}, base_address + 0x{x});\n", .{cluster.addr_offset}); try writer.print("}}, base_address + 0x{x});\n", .{cluster.addr_offset});
} else { } else {
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("pub const {s} = struct {{\n", .{std.zig.fmtId(cluster.name)}); try writer.print("pub const {s} = struct {{\n", .{std.zig.fmtId(cluster.name)});
for (registers) |_, offset| { for (registers) |_, offset| {
const reg_idx = @intCast(u32, range.begin + offset); const reg_idx = @intCast(u32, range.begin + offset);
try db.genZigRegister(writer, base_addr, reg_idx, indent + 1, .namespaced); try db.genZigRegister(writer, base_addr, reg_idx, .namespaced);
} }
try writer.writeByteNTimes(' ', indent * 4);
try writer.writeAll("};\n"); try writer.writeAll("};\n");
} }
}, },
@ -912,7 +917,6 @@ fn genZigSingleRegister(
addr_offset: usize, addr_offset: usize,
field_range_opt: ?Range, field_range_opt: ?Range,
array_prefix: []const u8, array_prefix: []const u8,
indent: usize,
nesting: Nesting, nesting: Nesting,
) !void { ) !void {
if (field_range_opt) |field_range| { if (field_range_opt) |field_range| {
@ -923,7 +927,6 @@ fn genZigSingleRegister(
if (fields[0].width > width) if (fields[0].width > width)
return error.BadWidth; return error.BadWidth;
try writer.writeByteNTimes(' ', indent * 4);
if (fields[0].width == width) if (fields[0].width == width)
// TODO: oof please refactor this // TODO: oof please refactor this
switch (nesting) { switch (nesting) {
@ -972,7 +975,6 @@ fn genZigSingleRegister(
}), }),
} }
} else { } else {
try writer.writeByteNTimes(' ', indent * 4);
switch (nesting) { switch (nesting) {
.namespaced => try writer.print("pub const {s} = @intToPtr(*volatile {s}Mmio({}, packed struct {{\n", .{ .namespaced => try writer.print("pub const {s} = @intToPtr(*volatile {s}Mmio({}, packed struct {{\n", .{
std.zig.fmtId(name), std.zig.fmtId(name),
@ -991,10 +993,8 @@ fn genZigSingleRegister(
width, width,
fields, fields,
field_range.begin, field_range.begin,
indent + 1,
); );
try writer.writeByteNTimes(' ', indent * 4);
switch (nesting) { switch (nesting) {
.namespaced => if (has_base_addr) .namespaced => if (has_base_addr)
try writer.print("}}), base_address + 0x{x});\n", .{addr_offset}) try writer.print("}}), base_address + 0x{x});\n", .{addr_offset})
@ -1004,7 +1004,6 @@ fn genZigSingleRegister(
} }
} }
} else { } else {
try writer.writeByteNTimes(' ', indent * 4);
switch (nesting) { switch (nesting) {
.namespaced => if (has_base_addr) .namespaced => if (has_base_addr)
try writer.print("pub const {s} = @intToPtr(*volatile {s}u{}, base_address + 0x{x});\n", .{ try writer.print("pub const {s} = @intToPtr(*volatile {s}u{}, base_address + 0x{x});\n", .{
@ -1035,7 +1034,6 @@ fn genZigFields(
reg_width: usize, reg_width: usize,
fields: []Field, fields: []Field,
first_field_idx: u32, first_field_idx: u32,
indent: usize,
) !void { ) !void {
var expected_bit: usize = 0; var expected_bit: usize = 0;
var reserved_num: usize = 0; var reserved_num: usize = 0;
@ -1049,7 +1047,6 @@ fn genZigFields(
if (dimension.index) |dim_index| switch (dim_index) { if (dimension.index) |dim_index| switch (dim_index) {
.list => |list| for (list.items) |entry| { .list => |list| for (list.items) |entry| {
const name = try std.mem.replaceOwned(u8, self.arena.allocator(), field.name, "%s", entry); const name = try std.mem.replaceOwned(u8, self.arena.allocator(), field.name, "%s", entry);
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("{s}: u{},\n", .{ std.zig.fmtId(name), field.width }); try writer.print("{s}: u{},\n", .{ std.zig.fmtId(name), field.width });
expected_bit += field.width; expected_bit += field.width;
}, },
@ -1062,7 +1059,6 @@ fn genZigFields(
while (i < dimension.dim) : (i += 1) { while (i < dimension.dim) : (i += 1) {
const num_str = try std.fmt.allocPrint(self.arena.allocator(), "{}", .{i}); const num_str = try std.fmt.allocPrint(self.arena.allocator(), "{}", .{i});
const name = try std.mem.replaceOwned(u8, self.arena.allocator(), field.name, "%s", num_str); const name = try std.mem.replaceOwned(u8, self.arena.allocator(), field.name, "%s", num_str);
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("{s}: u{},\n", .{ std.zig.fmtId(name), field.width }); try writer.print("{s}: u{},\n", .{ std.zig.fmtId(name), field.width });
expected_bit += field.width; expected_bit += field.width;
} }
@ -1086,7 +1082,6 @@ fn genZigFields(
expected_bit += 1; expected_bit += 1;
reserved_num += 1; reserved_num += 1;
}) { }) {
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("reserved{}: u1,\n", .{reserved_num}); try writer.print("reserved{}: u1,\n", .{reserved_num});
} }
@ -1110,15 +1105,13 @@ fn genZigFields(
// TODO: default values? // TODO: default values?
if (field.description) |description| if (field.description) |description|
if (!useless_descriptions.has(description)) { if (!useless_descriptions.has(description)) {
try writeDescription(self.arena.child_allocator, writer, description, indent); try writeDescription(self.arena.child_allocator, writer, description);
if (enumerations_opt != null) { if (enumerations_opt != null) {
try writer.writeByteNTimes(' ', indent * 4);
try writer.writeAll("///\n"); try writer.writeAll("///\n");
} }
}; };
if (enumerations_opt) |enumerations| for (enumerations) |enumeration| { if (enumerations_opt) |enumerations| for (enumerations) |enumeration| {
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("/// 0x{x}: ", .{enumeration.value}); try writer.print("/// 0x{x}: ", .{enumeration.value});
if (enumeration.description) |description| if (enumeration.description) |description|
try writer.print("{s}\n", .{description}) try writer.print("{s}\n", .{description})
@ -1126,7 +1119,6 @@ fn genZigFields(
try writer.writeAll("undocumented\n"); try writer.writeAll("undocumented\n");
}; };
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("{s}: u{},\n", .{ std.zig.fmtId(field.name), field.width }); try writer.print("{s}: u{},\n", .{ std.zig.fmtId(field.name), field.width });
expected_bit += field.width; expected_bit += field.width;
@ -1138,7 +1130,6 @@ fn genZigFields(
expected_bit += 1; expected_bit += 1;
padding_num += 1; padding_num += 1;
}) { }) {
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("padding{}: u1,\n", .{padding_num}); try writer.print("padding{}: u1,\n", .{padding_num});
} }
} }
@ -1148,7 +1139,6 @@ fn genZigRegister(
writer: anytype, writer: anytype,
base_addr: ?usize, base_addr: ?usize,
reg_idx: u32, reg_idx: u32,
indent: usize,
nesting: Nesting, nesting: Nesting,
) !void { ) !void {
const register = self.registers.items[reg_idx]; const register = self.registers.items[reg_idx];
@ -1179,12 +1169,11 @@ fn genZigRegister(
try writer.writeByte('\n'); try writer.writeByte('\n');
if (nesting == .namespaced) { if (nesting == .namespaced) {
const addr = if (base_addr) |base| base + addr_offset else addr_offset; const addr = if (base_addr) |base| base + addr_offset else addr_offset;
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("/// address: 0x{x}\n", .{addr}); try writer.print("/// address: 0x{x}\n", .{addr});
} }
if (register.description) |description| if (register.description) |description|
try writeDescription(self.arena.child_allocator, writer, description, indent); try writeDescription(self.arena.child_allocator, writer, description);
try self.genZigSingleRegister( try self.genZigSingleRegister(
writer, writer,
@ -1194,7 +1183,6 @@ fn genZigRegister(
addr_offset, addr_offset,
field_range, field_range,
"", "",
indent,
nesting, nesting,
); );
} }
@ -1215,12 +1203,11 @@ fn genZigRegister(
try writer.writeByte('\n'); try writer.writeByte('\n');
if (nesting == .namespaced) { if (nesting == .namespaced) {
const addr = if (base_addr) |base| base + addr_offset else addr_offset; const addr = if (base_addr) |base| base + addr_offset else addr_offset;
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("/// address: 0x{x}\n", .{addr}); try writer.print("/// address: 0x{x}\n", .{addr});
} }
if (register.description) |description| if (register.description) |description|
try writeDescription(self.arena.child_allocator, writer, description, indent); try writeDescription(self.arena.child_allocator, writer, description);
try self.genZigSingleRegister( try self.genZigSingleRegister(
writer, writer,
@ -1230,7 +1217,6 @@ fn genZigRegister(
addr_offset, addr_offset,
field_range, field_range,
"", "",
indent,
nesting, nesting,
); );
} }
@ -1272,12 +1258,11 @@ fn genZigRegister(
try writer.writeByte('\n'); try writer.writeByte('\n');
if (nesting == .namespaced) { if (nesting == .namespaced) {
const addr = if (base_addr) |base| base + register.addr_offset else register.addr_offset; const addr = if (base_addr) |base| base + register.addr_offset else register.addr_offset;
try writer.writeByteNTimes(' ', indent * 4);
try writer.print("/// address: 0x{x}\n", .{addr}); try writer.print("/// address: 0x{x}\n", .{addr});
} }
if (register.description) |description| if (register.description) |description|
try writeDescription(self.arena.child_allocator, writer, description, indent); try writeDescription(self.arena.child_allocator, writer, description);
try self.genZigSingleRegister( try self.genZigSingleRegister(
writer, writer,
@ -1287,7 +1272,6 @@ fn genZigRegister(
register.addr_offset, register.addr_offset,
field_range, field_range,
array_prefix, array_prefix,
indent,
nesting, nesting,
); );

Write Preview
Loading…
Cancel
Save