solve merge conflict
This commit is contained in:
commit
607e58b7b5
2 changed files with 63 additions and 1 deletions
|
@ -1,6 +1,7 @@
|
|||
const std = @import("std");
|
||||
|
||||
const Uxn = @import("uxn.zig");
|
||||
const UxnFmt = @import("uxn-instructions.zig");
|
||||
|
||||
pub fn main() !void {
|
||||
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
|
||||
|
@ -23,7 +24,7 @@ pub fn main() !void {
|
|||
|
||||
var running = true;
|
||||
while (running) {
|
||||
std.debug.print("{any} {X}\n", .{ uxn.pc, uxn.mem.m[uxn.pc] });
|
||||
std.debug.print("pc={X} code={X} op={s}\n", .{ uxn.pc, uxn.mem.m[uxn.pc], UxnFmt.fmtInstrs(uxn.mem.m[uxn.pc .. uxn.pc +% 1]) });
|
||||
if (uxn.eval()) running = false;
|
||||
}
|
||||
} else return error.NoRom;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue