diff --git a/build.zig b/build.zig index e576c51..dd1b4a6 100644 --- a/build.zig +++ b/build.zig @@ -1,91 +1,53 @@ const std = @import("std"); -// Although this function looks imperative, note that its job is to -// declaratively construct a build graph that will be executed by an external -// runner. pub fn build(b: *std.Build) void { - // Standard target options allows the person running `zig build` to choose - // what target to build for. Here we do not override the defaults, which - // means any target is allowed, and the default is native. Other options - // for restricting supported target set are available. const target = b.standardTargetOptions(.{}); - - // Standard optimization options allow the person running `zig build` to select - // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not - // set a preferred release mode, allowing the user to decide how to optimize. const optimize = b.standardOptimizeOption(.{}); - const lib = b.addStaticLibrary(.{ - .name = "master", - // In this case the main source file is merely a path, however, in more - // complicated build scripts, this could be a generated file. - .root_source_file = b.path("src/root.zig"), + const silkdot = b.dependency("silkdot", .{ .target = target, .optimize = optimize, }); - // This declares intent for the library to be installed into the standard - // location when the user invokes the "install" step (the default step when - // running `zig build`). - b.installArtifact(lib); + // const lib = b.addStaticLibrary(.{ + // .name = "uzn", + // .root_source_file = b.path("src/root.zig"), + // .target = target, + // .optimize = optimize, + // }); + + // b.installArtifact(lib); const exe = b.addExecutable(.{ - .name = "master", + .name = "uzn", .root_source_file = b.path("src/main.zig"), .target = target, .optimize = optimize, }); - - // This declares intent for the executable to be installed into the - // standard location when the user invokes the "install" step (the default - // step when running `zig build`). + exe.root_module.addImport("silkdot", silkdot.module("silkdot")); b.installArtifact(exe); - // This *creates* a Run step in the build graph, to be executed when another - // step is evaluated that depends on it. The next line below will establish - // such a dependency. const run_cmd = b.addRunArtifact(exe); - - // By making the run step depend on the install step, it will be run from the - // installation directory rather than directly from within the cache directory. - // This is not necessary, however, if the application depends on other installed - // files, this ensures they will be present and in the expected location. run_cmd.step.dependOn(b.getInstallStep()); - - // This allows the user to pass arguments to the application in the build - // command itself, like this: `zig build run -- arg1 arg2 etc` if (b.args) |args| { run_cmd.addArgs(args); } - - // This creates a build step. It will be visible in the `zig build --help` menu, - // and can be selected like this: `zig build run` - // This will evaluate the `run` step rather than the default, which is "install". const run_step = b.step("run", "Run the app"); run_step.dependOn(&run_cmd.step); - // Creates a step for unit testing. This only builds the test executable - // but does not run it. - const lib_unit_tests = b.addTest(.{ - .root_source_file = b.path("src/root.zig"), - .target = target, - .optimize = optimize, - }); - - const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests); - + // const lib_unit_tests = b.addTest(.{ + // .root_source_file = b.path("src/root.zig"), + // .target = target, + // .optimize = optimize, + // }); + // const run_lib_unit_tests = b.addRunArtifact(lib_unit_tests); const exe_unit_tests = b.addTest(.{ .root_source_file = b.path("src/main.zig"), .target = target, .optimize = optimize, }); - const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests); - - // Similar to creating the run step earlier, this exposes a `test` step to - // the `zig build --help` menu, providing a way for the user to request - // running the unit tests. const test_step = b.step("test", "Run unit tests"); - test_step.dependOn(&run_lib_unit_tests.step); + // test_step.dependOn(&run_lib_unit_tests.step); test_step.dependOn(&run_exe_unit_tests.step); } diff --git a/build.zig.zon b/build.zig.zon index 1dfa496..fcb7c22 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,5 +1,5 @@ .{ - .name = "master", + .name = "uzn", // This is a [Semantic Version](https://semver.org/). // In a future version of Zig it will be used for package deduplication. .version = "0.0.0", @@ -43,6 +43,9 @@ // // actually used. // .lazy = false, //}, + .silkdot = .{ + .path = "../silkdot/", + }, }, // Specifies the set of files and directories that are included in this package. diff --git a/src/main.zig b/src/main.zig index 96b0187..47ac9a2 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,4 +1,5 @@ const std = @import("std"); +const silkdot = @import("silkdot"); pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{}){}; @@ -16,9 +17,9 @@ pub fn main() !void { const rom = try file.readToEndAlloc(allocator, 0xFFFF); defer allocator.free(rom); - const mem: [0xFFFF]u8 = undefined; - const ws: [0xFF]u8 = undefined; - const rs: [0xFF]u8 = undefined; + const mem: [0x10000]u8 = undefined; + const ws: [0x100]u8 = undefined; + const rs: [0x100]u8 = undefined; var uxn = Uxn{ .mem = .{ .m = mem }, .ws = .{ .s = ws }, @@ -27,7 +28,22 @@ pub fn main() !void { }; @memcpy(uxn.mem.m[0x100 .. 0x100 + rom.len], rom); - while (true) uxn.loop(); + var term = try silkdot.Terminal.init(allocator); + defer term.deinit(); + + var running = true; + while (running) { + const events = try term.getEvents(); + defer allocator.free(events); + for (events) |ev| switch (ev) { + .keyboard => { + if (ev.keyboard.code == 'q') running = false; + }, + else => {}, + }; + uxn.loop(); + try term.draw(); + } } else return error.NoRom; } @@ -38,7 +54,7 @@ pub const Uxn = struct { pc: u16, const Memory = struct { - m: [0xFFFF]u8, + m: [0x10000]u8, pub fn peek(self: *Memory, comptime T: type, idx: u16) T { return switch (T) { @@ -58,7 +74,7 @@ pub const Uxn = struct { }; const Stack = struct { - s: [0xFF]u8, + s: [0x100]u8, sp: u8 = 0, pub fn peek(self: *Stack, comptime T: type) T { @@ -372,6 +388,8 @@ pub const Uxn = struct { 0xFE => eor(&self.rs, u16, true), // EOR2kr 0xFF => sft(&self.rs, u16, true), // SFT2kr } + + self.pc +%= 1; } fn brk() void {}