From b167abc58a828ac76df637bf9dddff9e640641a1 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Thu, 21 Apr 2022 10:43:08 -0300 Subject: [PATCH] feat: panic on unimplemented I/O in ReleaseSafe/Debug but not ReleaseFast --- src/Bus.zig | 2 +- src/bus/io.zig | 30 +++++++++++++++++------------- src/main.zig | 3 ++- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/Bus.zig b/src/Bus.zig index a7cea1c..2458345 100644 --- a/src/Bus.zig +++ b/src/Bus.zig @@ -195,4 +195,4 @@ fn alignAddress(comptime T: type, address: u32) u32 { u8 => address, else => @compileError("Bus: Invalid read/write type"), }; -} \ No newline at end of file +} diff --git a/src/bus/io.zig b/src/bus/io.zig index 60095a5..fb65555 100644 --- a/src/bus/io.zig +++ b/src/bus/io.zig @@ -1,4 +1,5 @@ const std = @import("std"); +const builtin = @import("builtin"); const Bit = @import("bitfield").Bit; const Bitfield = @import("bitfield").Bitfield; @@ -6,8 +7,6 @@ const Bus = @import("../Bus.zig"); const DmaController = @import("dma.zig").DmaController; const Scheduler = @import("../scheduler.zig").Scheduler; -const panic_on_und_io: bool = false; - const log = std.log.scoped(.@"I/O"); pub const Io = struct { @@ -61,7 +60,7 @@ pub fn read(bus: *const Bus, comptime T: type, address: u32) T { // Interrupts 0x0400_0200 => @as(T, bus.io.irq.raw) << 16 | bus.io.ie.raw, 0x0400_0208 => @boolToInt(bus.io.ime), - else => undRead("Tried to read {} from 0x{X:0>8}", .{ T, address }), + else => undefinedRead("Tried to read {} from 0x{X:0>8}", .{ T, address }), }, u16 => switch (address) { // Display @@ -103,7 +102,7 @@ pub fn read(bus: *const Bus, comptime T: type, address: u32) T { 0x0400_0202 => bus.io.irq.raw, 0x0400_0204 => unimplementedRead("Read halfword from WAITCNT", .{}), 0x0400_0208 => @boolToInt(bus.io.ime), - else => undRead("Tried to read {} from 0x{X:0>8}", .{ T, address }), + else => undefinedRead("Tried to read {} from 0x{X:0>8}", .{ T, address }), }, u8 => return switch (address) { // Display @@ -127,7 +126,7 @@ pub fn read(bus: *const Bus, comptime T: type, address: u32) T { // Interrupts 0x0400_0200 => @truncate(T, bus.io.ie.raw), 0x0400_0300 => @enumToInt(bus.io.postflg), - else => undRead("Tried to read byte from 0x{X:0>8}", .{address}), + else => undefinedRead("Tried to read {} from 0x{X:0>8}", .{ T, address }), }, else => @compileError("I/O: Unsupported read width"), }; @@ -185,7 +184,7 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void { 0x0400_0200 => bus.io.setIrqs(value), 0x0400_0204 => log.debug("Wrote 0x{X:0>8} to WAITCNT", .{value}), 0x0400_0208 => bus.io.ime = value & 1 == 1, - else => undWrite("Tried to write {} 0x{X:0>8} to 0x{X:0>8}", .{ T, value, address }), + else => undefinedWrite("Tried to write {} 0x{X:0>8} to 0x{X:0>8}", .{ T, value, address }), }, u16 => switch (address) { // Display @@ -317,7 +316,7 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void { 0x0400_0204 => log.debug("Wrote 0x{X:0>4} to WAITCNT", .{value}), 0x0400_0208 => bus.io.ime = value & 1 == 1, 0x0400_0206, 0x0400_020A => {}, // Not Used - else => undWrite("Tried to write {} 0x{X:0>4} to 0x{X:0>8}", .{ T, value, address }), + else => undefinedWrite("Tried to write {} 0x{X:0>4} to 0x{X:0>8}", .{ T, value, address }), }, u8 => switch (address) { // Display @@ -362,24 +361,29 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void { // Interrupts 0x0400_0208 => bus.io.ime = value & 1 == 1, 0x0400_0301 => bus.io.haltcnt = if (value >> 7 & 1 == 0) .Halt else std.debug.panic("TODO: Implement STOP", .{}), - else => undWrite("Tried to write 0x{X:0>2} to 0x{X:0>8}", .{ value, address }), + else => undefinedWrite("Tried to write {} 0x{X:0>2} to 0x{X:0>8}", .{ T, value, address }), }, else => @compileError("I/O: Unsupported write width"), }; } -fn undRead(comptime format: []const u8, args: anytype) u8 { - if (panic_on_und_io) std.debug.panic(format, args) else log.warn(format, args); +fn undefinedRead(comptime format: []const u8, args: anytype) u8 { + log.debug(format, args); + if (builtin.mode == .Debug) std.debug.panic("TODO: Implement I/O Register", .{}); + return 0; } fn unimplementedRead(comptime format: []const u8, args: anytype) u8 { - log.warn(format, args); + log.debug(format, args); + if (builtin.mode == .Debug) std.debug.panic("TODO: Implement I/O Register", .{}); + return 0; } -fn undWrite(comptime format: []const u8, args: anytype) void { - if (panic_on_und_io) std.debug.panic(format, args) else log.warn(format, args); +fn undefinedWrite(comptime format: []const u8, args: anytype) void { + log.debug(format, args); + if (builtin.mode == .Debug) std.debug.panic("TODO: Implement I/O Register", .{}); } /// Read / Write diff --git a/src/main.zig b/src/main.zig index f663e6a..a6883d3 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,4 +1,5 @@ const std = @import("std"); +const builtin = @import("builtin"); const SDL = @import("sdl2"); const clap = @import("clap"); const known_folders = @import("known_folders"); @@ -26,6 +27,7 @@ const sample_rate = @import("apu.zig").host_sample_rate; pub const enable_logging: bool = false; const is_binary: bool = false; const log = std.log.scoped(.GUI); +pub const log_level = if (builtin.mode != .Debug) .info else std.log.default_level; const correctTitle = @import("util.zig").correctTitle; @@ -267,5 +269,4 @@ fn initAudio(apu: *Apu) SDL.SDL_AudioDeviceID { export fn audioCallback(userdata: ?*anyopaque, stream: [*c]u8, len: c_int) void { const apu = @ptrCast(*Apu, @alignCast(8, userdata)); _ = SDL.SDL_AudioStreamGet(apu.stream, stream, len); - }