From c0711213ae815da59823495f025ea9a3c8f23889 Mon Sep 17 00:00:00 2001 From: Toby Jaffey Date: Sun, 7 Dec 2025 21:02:22 +0000 Subject: [PATCH] Add console tetris demo --- README.md | 2 + apps/Makefile | 2 + apps/zigtris/Makefile | 12 ++++++ apps/zigtris/build.zig | 66 +++++++++++++++++++++++++++++++ apps/zigtris/build.zig.zon | 16 ++++++++ apps/zigtris/src/console.zig | 49 +++++++++++++++++++++++ apps/zigtris/src/main.zig | 41 ++++++++++++++++++++ apps/zigtris/src/uvm.zig | 73 +++++++++++++++++++++++++++++++++++ precompiled/zigtris.bin | Bin 0 -> 16284 bytes 9 files changed, 261 insertions(+) create mode 100644 apps/zigtris/Makefile create mode 100644 apps/zigtris/build.zig create mode 100644 apps/zigtris/build.zig.zon create mode 100644 apps/zigtris/src/console.zig create mode 100644 apps/zigtris/src/main.zig create mode 100644 apps/zigtris/src/uvm.zig create mode 100755 precompiled/zigtris.bin diff --git a/README.md b/README.md index 2dbf093..a317b95 100644 --- a/README.md +++ b/README.md @@ -25,11 +25,13 @@ Although based on a fully fledged CPU emulator, uvm32 is intended for executing * [apps/sketch](apps/sketch) C Arduino/Wiring/Processing type program in `setup()` and `loop()` style * [apps/rust-hello](apps/rust-hello) Rust hello world program (note, the version of rust installed by brew on mac has issues, use the official rust installer from https://rust-lang.org/learn/get-started/) * [apps/zig-mandel](apps/zig-mandel) Zig ASCII mandelbrot generator program + * [apps/zigtris](apps/zigtris) Zig Tetris (https://github.com/ringtailsoftware/zigtris) WASD+space to play ## Quickstart make host/host precompiled/mandel.bin + host/host precompiled/zigtris.bin Build one of the sample apps (requires docker for C, or Zig, or Rust) diff --git a/apps/Makefile b/apps/Makefile index 0ba8f46..82fd82a 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -5,6 +5,7 @@ all: (cd sketch && make) (cd helloworld && make) (cd zig-mandel && make) + (cd zigtris && make) (cd rust-hello && make) (cd hello-asm && make) @@ -12,6 +13,7 @@ clean: (cd sketch && make clean) (cd helloworld && make clean) (cd zig-mandel && make clean) + (cd zigtris && make clean) (cd rust-hello && make clean) (cd hello-asm && make clean) diff --git a/apps/zigtris/Makefile b/apps/zigtris/Makefile new file mode 100644 index 0000000..88fee2e --- /dev/null +++ b/apps/zigtris/Makefile @@ -0,0 +1,12 @@ +all: + # zig's objcopy is broken, so use external tool + # https://ziggit.dev/t/addobjcopy-producing-zero-padding-at-start-of-binary/13384 + zig build && docker run -v `pwd`:/data -w /data --rm riscv-dev riscv64-unknown-elf-objcopy zig-out/bin/zigtris -O binary zigtris.bin + +clean: + rm -rf zigtris.bin zig-out .zig-cache + +test: all + ../../host/host zigtris.bin + + diff --git a/apps/zigtris/build.zig b/apps/zigtris/build.zig new file mode 100644 index 0000000..2d70ddc --- /dev/null +++ b/apps/zigtris/build.zig @@ -0,0 +1,66 @@ +const std = @import("std"); +const CrossTarget = @import("std").zig.CrossTarget; +const Target = @import("std").Target; +const Feature = @import("std").Target.Cpu.Feature; + +pub fn build(b: *std.Build) void { + const features = Target.riscv.Feature; + var disabled_features = Feature.Set.empty; + var enabled_features = Feature.Set.empty; + + // disable all CPU extensions + disabled_features.addFeature(@intFromEnum(features.a)); + disabled_features.addFeature(@intFromEnum(features.c)); + disabled_features.addFeature(@intFromEnum(features.d)); + disabled_features.addFeature(@intFromEnum(features.e)); + disabled_features.addFeature(@intFromEnum(features.f)); + // except multiply + enabled_features.addFeature(@intFromEnum(features.m)); + + const target = b.resolveTargetQuery(.{ + .cpu_arch = Target.Cpu.Arch.riscv32, + .os_tag = Target.Os.Tag.freestanding, + .abi = Target.Abi.none, + .cpu_model = .{ .explicit = &std.Target.riscv.cpu.generic_rv32}, + .cpu_features_sub = disabled_features, + .cpu_features_add = enabled_features + }); + + const exe = b.addExecutable(.{ + .name = "zigtris", + .root_module = b.createModule(.{ + .root_source_file = b.path("src/main.zig"), + .target = target, + .optimize = .ReleaseSmall, + }), + }); + + // add mibu for zigtris event generation + const mibu = b.dependency("mibu", .{ + .target = target, + .optimize = .ReleaseSmall, + }); + exe.root_module.addImport("mibu", mibu.module("mibu")); + + const zigtris_dep = b.dependency("zigtris", .{ + .target = target, + .optimize = .ReleaseSmall, + }); + + const zigtris_mod = zigtris_dep.module("zigtris"); + exe.root_module.addImport("zigtris", zigtris_mod); + + b.installArtifact(exe); + + exe.addAssemblyFile(b.path("../crt0.s")); + exe.setLinkerScript(b.path("../linker.ld")); + exe.addIncludePath(b.path("../../common")); + + const bin = b.addObjCopy(exe.getEmittedBin(), .{ + .format = .bin, + }); + bin.step.dependOn(&exe.step); + + const copy_bin = b.addInstallBinFile(bin.getOutput(), "zigtris.bin"); + b.default_step.dependOn(©_bin.step); +} diff --git a/apps/zigtris/build.zig.zon b/apps/zigtris/build.zig.zon new file mode 100644 index 0000000..16bb8f4 --- /dev/null +++ b/apps/zigtris/build.zig.zon @@ -0,0 +1,16 @@ +.{ + .name = .zigtris, + .version = "0.15.2", + .dependencies = .{ + .mibu = .{ + .url = "git+https://github.com/xyaman/mibu.git#be3713ff04e7db3584669e679253ef388e426dc6", + .hash = "mibu-0.0.1-dev-Ddr1riTEAAAYAe1TWBT--W8fPUL8UyBE7dy-yNNZ3z5V", + }, + .zigtris = .{ + .url = "git+https://github.com/ringtailsoftware/zigtris.git#1dc9fc4c5dae709279bfe0708e3fae5c810837f0", + .hash = "zigtris-0.0.1-of0vIotsAACy777-kWnBDCH2tYIprpqXLpidQgvRF6r1", + }, + }, + .paths = .{""}, + .fingerprint = 0x1f86de49aac15bec, +} diff --git a/apps/zigtris/src/console.zig b/apps/zigtris/src/console.zig new file mode 100644 index 0000000..c5ae395 --- /dev/null +++ b/apps/zigtris/src/console.zig @@ -0,0 +1,49 @@ +const std = @import("std"); +extern fn console_write(data: [*]const u8, len: usize) void; +var wbuf:[4096]u8 = undefined; +var cw = ConsoleWriter.init(&wbuf); +const uvm = @import("uvm.zig"); + +pub const WriteError = error{ Unsupported, NotConnected }; + +pub const ConsoleWriter = struct { + interface: std.Io.Writer, + err: ?WriteError = null, + + fn drain(w: *std.Io.Writer, data: []const []const u8, splat: usize) std.Io.Writer.Error!usize { + var ret: usize = 0; + + const b = w.buffered(); + uvm.print(b); + _ = w.consume(b.len); + + for (data) |d| { + uvm.print(d); + ret += d.len; + } + + const pattern = data[data.len - 1]; + for (0..splat) |_| { + uvm.print(pattern); + ret += pattern.len; + } + + return ret; + } + + pub fn init(buf: []u8) ConsoleWriter { + return ConsoleWriter{ + .interface = .{ + .buffer = buf, + .vtable = &.{ + .drain = drain, + }, + }, + }; + } +}; + +pub fn getWriter() *std.Io.Writer { + return &cw.interface; +} + diff --git a/apps/zigtris/src/main.zig b/apps/zigtris/src/main.zig new file mode 100644 index 0000000..e171753 --- /dev/null +++ b/apps/zigtris/src/main.zig @@ -0,0 +1,41 @@ +const uvm = @import("uvm.zig"); + +const mibu = @import("mibu"); +const zigtris = @import("zigtris"); +var nextEvent:mibu.events.Event = .none; + +const console = @import("console.zig").getWriter(); + +export fn main() void { + var gameRunning = true; + var lastUpdate:u32 = 0; + + zigtris.gamesetup(console, uvm.millis()) catch |err| { + _ = console.print("err {any}\n", .{err}) catch 0; + _ = console.flush() catch 0; + return; + }; + + while(gameRunning) { + const now = uvm.millis(); + if (uvm.getch()) |key| { + switch(key) { + ' ' => nextEvent = mibu.events.Event{.key = .{.code = .{.char = ' '}}}, + 'a' => nextEvent = mibu.events.Event{.key = .{.code = .left}}, + 'd' => nextEvent = mibu.events.Event{.key = .{.code = .right}}, + 'w' => nextEvent = mibu.events.Event{.key = .{.code = .up}}, + 's' => nextEvent = mibu.events.Event{.key = .{.code = .down}}, + 'q' => gameRunning = false, + else => {}, + } + } + + if (now > lastUpdate + 100 or nextEvent != .none) { + + lastUpdate = now; + gameRunning = zigtris.gameloop(console, now, nextEvent) catch false; + nextEvent = .none; + _ = console.flush() catch 0; + } + } +} diff --git a/apps/zigtris/src/uvm.zig b/apps/zigtris/src/uvm.zig new file mode 100644 index 0000000..631c481 --- /dev/null +++ b/apps/zigtris/src/uvm.zig @@ -0,0 +1,73 @@ +const uvm32 = @cImport({ + @cDefine("USE_MAIN", "1"); + @cInclude("uvm32_target.h"); +}); +const std = @import("std"); + +// dupeZ would be better, but want to avoid using an allocator +var new_buf:[128]u8 = undefined; +pub inline fn print(m: []const u8) void { + @memcpy(new_buf[0..m.len], m); + new_buf[m.len] = 0; + const s = new_buf[0..m.len :0]; + + asm volatile ("csrw " ++ std.fmt.comptimePrint("0x{x}", .{uvm32.IOREQ_PRINT}) ++ ", %[arg1]" + : + : [arg1] "r" (s.ptr), + ); +} + +pub inline fn println(val: [:0]const u8) void { + asm volatile ("csrw " ++ std.fmt.comptimePrint("0x{x}", .{uvm32.IOREQ_PRINTLN}) ++ ", %[arg1]" + : + : [arg1] "r" (val.ptr), + ); +} + +pub inline fn printd(val: u32) void { + asm volatile ("csrw " ++ std.fmt.comptimePrint("0x{x}", .{uvm32.IOREQ_PRINTD}) ++ ", %[arg1]" + : + : [arg1] "r" (val), + ); +} + +pub inline fn printx(val: u32) void { + asm volatile ("csrw " ++ std.fmt.comptimePrint("0x{x}", .{uvm32.IOREQ_PRINTX}) ++ ", %[arg1]" + : + : [arg1] "r" (val), + ); +} + +pub inline fn printc(val: u32) void { + asm volatile ("csrw " ++ std.fmt.comptimePrint("0x{x}", .{uvm32.IOREQ_PRINTC}) ++ ", %[arg1]" + : + : [arg1] "r" (val), + ); +} + +pub inline fn yield() void { + asm volatile (std.fmt.comptimePrint("csrwi 0x{x}, 0", .{uvm32.IOREQ_YIELD})); +} + +var millis_storage:u32 = 0; +pub inline fn millis() u32 { + asm volatile ("csrw " ++ std.fmt.comptimePrint("0x{x}", .{uvm32.IOREQ_MILLIS}) ++ ", %[arg1]" + : + : [arg1] "r" (&millis_storage), + ); + return millis_storage; +} + +var getch_storage:u32 = 0; +pub inline fn getch() ?u8 { + asm volatile ("csrw " ++ std.fmt.comptimePrint("0x{x}", .{uvm32.IOREQ_GETC}) ++ ", %[arg1]" + : + : [arg1] "r" (&getch_storage), + ); + if (getch_storage <= 0xFF) { + return @truncate(getch_storage); + } else { + return null; + } +} + diff --git a/precompiled/zigtris.bin b/precompiled/zigtris.bin new file mode 100755 index 0000000000000000000000000000000000000000..9ce1ebb77919c4daaae4b11cb0e76c4d143b75c3 GIT binary patch literal 16284 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

_V2;Gd6mXo%AX z@vRK`q5tAh=w6?Kyn>9PK8-Ig#(cu}q~#bWx9xYU>dl}312PflVSBdFa&2cz7L0A+~)VV@WH7yh_Ro)M|t{Z(PUzzr2!)}lDKQX zWVr$wckd?Sok1o3I`n+wumqnOu>NOoQv5d(>e7;Iy(>ZYLjmiwDtApkpJNG#9y_@vYMIyzg}YT!*vv2jBiCR4H0OW|K&eo9iaL5 zufY~iBW^wkTPpze*O9gJZL)rI1G9D@hJPu+;^*$6_?hKo6>MO9`3`(bjZ*yG=Mmq( z3*R|N{>tUJpGK^uB9=`criE?KP1&|wHjdla=cmRIm)rRIl;4&#+kfGE6V@69W+o)l z2fu}Q$BHUATjT<^u2E^qcSYf!_S$;sSGohqe8u)(T{7apGGIwLuq4BG*>>d`;{iW6 z?!QEy_-FX9Puv=M!U6PNf zHZPrEhj!g~a5T9?6L|kIwrc;D=27^m?8~oxXxoKr+f}&Za!4m`6B3w^z=Q-QBrqX? z2?}LIM*Kn2^AP1STXfA%O`AOi199B)}M2TW?5x zQ<%2$hU@095o8j6RKv8D3l>jX`PIKzFn__?X)FEWK5gZ7*RA!^xk3s@ z3Mjm~h{9`dEe&l5t+~ErX?;Ve`TCMujmD44>d-C5yBqJzaL4~bM6aV=@NL9h%*W9#`28*Jf`2dC@n<0P zD`)&U+{Jp!obi>;J5BOPS*lC0q-iVXtqnCbl}yT}67in?rFAQPPq(|$54e|PJf|Ns z^v7-z>reldG^}fFxuvxQ|I)(7hK7*QQs3C{t@^d0)o7)^X}opaDkHQsbXN=A`e1WQ zXze#c&5f;1MyQ#VG*{O*Weh@3sO827YeS(XTH0vbx4gb_%__l-f(@&0x$D-JrqHUj z*xU`*edW5Zt)Uf-t!q}_xCVsjwtFZ=Q{QkmCT_W9U8td^vFV$kRjWnIjZKaBg&Jz> z*M+FAp*a+~Z`GY^LR8z-h_y6>yr!|WVYTRLUAL~WsU@_Uz@W)qK-Hb8hPsCOwd>Y| z)`l8HcU?p1fpyp~9&g1eLM>q8hyYD1n(A9ZHLL2^;8`red0e=v!3c@ADnra$9crk@ nOKqrWZGCey_Ubg?_!^t$riJX>#kmc9ox=Cs2K^Pv;r#v=9-a)9 literal 0 HcmV?d00001