From 677eecad4125d50f4efc2192fa3960b713d9d5a3 Mon Sep 17 00:00:00 2001 From: Rekai Musuka Date: Fri, 21 Oct 2022 05:12:32 -0300 Subject: [PATCH] chore: rewrite read/write methods for remainig Bus devices --- src/Bus.zig | 72 ++++++++++++++++----------------- src/bus/Bios.zig | 28 +++++-------- src/bus/Ewram.zig | 46 +++++++++++---------- src/bus/GamePak.zig | 17 ++++---- src/bus/Iwram.zig | 48 +++++++++++----------- src/bus/backup.zig | 30 ++++++++------ src/ppu.zig | 98 +++++++++++++++++++++++++-------------------- 7 files changed, 176 insertions(+), 163 deletions(-) diff --git a/src/Bus.zig b/src/Bus.zig index 5c5a493..db4ff99 100644 --- a/src/Bus.zig +++ b/src/Bus.zig @@ -54,20 +54,20 @@ pub fn deinit(self: Self) void { pub fn read32(self: *const Self, addr: u32) u32 { return switch (addr) { // General Internal Memory - 0x0000_0000...0x0000_3FFF => self.bios.get32(addr), - 0x0200_0000...0x02FF_FFFF => self.ewram.get32(addr & 0x3FFFF), - 0x0300_0000...0x03FF_FFFF => self.iwram.get32(addr & 0x7FFF), + 0x0000_0000...0x0000_3FFF => self.bios.read(u32, addr), + 0x0200_0000...0x02FF_FFFF => self.ewram.read(u32, addr), + 0x0300_0000...0x03FF_FFFF => self.iwram.read(u32, addr), 0x0400_0000...0x0400_03FE => io.read32(self, addr), // Internal Display Memory - 0x0500_0000...0x05FF_FFFF => self.ppu.palette.get32(addr & 0x3FF), + 0x0500_0000...0x05FF_FFFF => self.ppu.palette.read(u32, addr), 0x0600_0000...0x06FF_FFFF => self.ppu.vram.read(u32, addr), - 0x0700_0000...0x07FF_FFFF => self.ppu.oam.get32(addr & 0x3FF), + 0x0700_0000...0x07FF_FFFF => self.ppu.oam.read(u32, addr), // External Memory (Game Pak) - 0x0800_0000...0x09FF_FFFF => self.pak.get32(addr - 0x0800_0000), - 0x0A00_0000...0x0BFF_FFFF => self.pak.get32(addr - 0x0A00_0000), - 0x0C00_0000...0x0DFF_FFFF => self.pak.get32(addr - 0x0C00_0000), + 0x0800_0000...0x09FF_FFFF => self.pak.read(u32, addr), + 0x0A00_0000...0x0BFF_FFFF => self.pak.read(u32, addr), + 0x0C00_0000...0x0DFF_FFFF => self.pak.read(u32, addr), else => undRead("Tried to read from 0x{X:0>8}", .{addr}), }; @@ -78,14 +78,14 @@ pub fn write32(self: *Self, addr: u32, word: u32) void { switch (addr) { // General Internal Memory - 0x0200_0000...0x02FF_FFFF => self.ewram.set32(addr & 0x3FFFF, word), - 0x0300_0000...0x03FF_FFFF => self.iwram.set32(addr & 0x7FFF, word), + 0x0200_0000...0x02FF_FFFF => self.ewram.write(u32, addr, word), + 0x0300_0000...0x03FF_FFFF => self.iwram.write(u32, addr, word), 0x0400_0000...0x0400_03FE => io.write32(self, addr, word), // Internal Display Memory - 0x0500_0000...0x05FF_FFFF => self.ppu.palette.set32(addr & 0x3FF, word), + 0x0500_0000...0x05FF_FFFF => self.ppu.palette.write(u32, addr, word), 0x0600_0000...0x06FF_FFFF => self.ppu.vram.write(u32, addr, word), - 0x0700_0000...0x07FF_FFFF => self.ppu.oam.set32(addr & 0x3FF, word), + 0x0700_0000...0x07FF_FFFF => self.ppu.oam.write(u32, addr, word), else => undWrite("Tried to write 0x{X:0>8} to 0x{X:0>8}", .{ word, addr }), } @@ -94,20 +94,20 @@ pub fn write32(self: *Self, addr: u32, word: u32) void { pub fn read16(self: *const Self, addr: u32) u16 { return switch (addr) { // General Internal Memory - 0x0000_0000...0x0000_3FFF => self.bios.get16(addr), - 0x0200_0000...0x02FF_FFFF => self.ewram.get16(addr & 0x3FFFF), - 0x0300_0000...0x03FF_FFFF => self.iwram.get16(addr & 0x7FFF), + 0x0000_0000...0x0000_3FFF => self.bios.read(u16, addr), + 0x0200_0000...0x02FF_FFFF => self.ewram.read(u16, addr), + 0x0300_0000...0x03FF_FFFF => self.iwram.read(u16, addr), 0x0400_0000...0x0400_03FE => io.read16(self, addr), // Internal Display Memory - 0x0500_0000...0x05FF_FFFF => self.ppu.palette.get16(addr & 0x3FF), + 0x0500_0000...0x05FF_FFFF => self.ppu.palette.read(u16, addr), 0x0600_0000...0x06FF_FFFF => self.ppu.vram.read(u16, addr), - 0x0700_0000...0x07FF_FFFF => self.ppu.oam.get16(addr & 0x3FF), + 0x0700_0000...0x07FF_FFFF => self.ppu.oam.read(u16, addr), // External Memory (Game Pak) - 0x0800_0000...0x09FF_FFFF => self.pak.get16(addr - 0x0800_0000), - 0x0A00_0000...0x0BFF_FFFF => self.pak.get16(addr - 0x0A00_0000), - 0x0C00_0000...0x0DFF_FFFF => self.pak.get16(addr - 0x0C00_0000), + 0x0800_0000...0x09FF_FFFF => self.pak.read(u16, addr), + 0x0A00_0000...0x0BFF_FFFF => self.pak.read(u16, addr), + 0x0C00_0000...0x0DFF_FFFF => self.pak.read(u16, addr), else => undRead("Tried to read from 0x{X:0>8}", .{addr}), }; @@ -117,14 +117,14 @@ pub fn write16(self: *Self, addr: u32, halfword: u16) void { // TODO: write16 can write to GamePak Flash switch (addr) { // General Internal Memory - 0x0200_0000...0x02FF_FFFF => self.ewram.set16(addr & 0x3FFFF, halfword), - 0x0300_0000...0x03FF_FFFF => self.iwram.set16(addr & 0x7FFF, halfword), + 0x0200_0000...0x02FF_FFFF => self.ewram.write(u16, addr, halfword), + 0x0300_0000...0x03FF_FFFF => self.iwram.write(u16, addr, halfword), 0x0400_0000...0x0400_03FE => io.write16(self, addr, halfword), // Internal Display Memory - 0x0500_0000...0x05FF_FFFF => self.ppu.palette.set16(addr & 0x3FF, halfword), + 0x0500_0000...0x05FF_FFFF => self.ppu.palette.write(u16, addr, halfword), 0x0600_0000...0x06FF_FFFF => self.ppu.vram.write(u16, addr, halfword), - 0x0700_0000...0x07FF_FFFF => self.ppu.oam.set16(addr & 0x3FF, halfword), + 0x0700_0000...0x07FF_FFFF => self.ppu.oam.write(u16, addr, halfword), 0x0800_00C4, 0x0800_00C6, 0x0800_00C8 => log.warn("Tried to write 0x{X:0>4} to GPIO", .{halfword}), else => undWrite("Tried to write 0x{X:0>4} to 0x{X:0>8}", .{ halfword, addr }), @@ -134,21 +134,21 @@ pub fn write16(self: *Self, addr: u32, halfword: u16) void { pub fn read8(self: *const Self, addr: u32) u8 { return switch (addr) { // General Internal Memory - 0x0000_0000...0x0000_3FFF => self.bios.get8(addr), - 0x0200_0000...0x02FF_FFFF => self.ewram.get8(addr & 0x3FFFF), - 0x0300_0000...0x03FF_FFFF => self.iwram.get8(addr & 0x7FFF), + 0x0000_0000...0x0000_3FFF => self.bios.read(u8, addr), + 0x0200_0000...0x02FF_FFFF => self.ewram.read(u8, addr), + 0x0300_0000...0x03FF_FFFF => self.iwram.read(u8, addr), 0x0400_0000...0x0400_03FE => io.read8(self, addr), // Internal Display Memory - 0x0500_0000...0x05FF_FFFF => self.ppu.palette.get8(addr & 0x3FF), + 0x0500_0000...0x05FF_FFFF => self.ppu.palette.read(u8, addr), 0x0600_0000...0x06FF_FFFF => self.ppu.vram.read(u8, addr), - 0x0700_0000...0x07FF_FFFF => self.ppu.oam.get8(addr & 0x3FF), + 0x0700_0000...0x07FF_FFFF => self.ppu.oam.read(u8, addr), // External Memory (Game Pak) - 0x0800_0000...0x09FF_FFFF => self.pak.get8(addr - 0x0800_0000), - 0x0A00_0000...0x0BFF_FFFF => self.pak.get8(addr - 0x0A00_0000), - 0x0C00_0000...0x0DFF_FFFF => self.pak.get8(addr - 0x0C00_0000), - 0x0E00_0000...0x0E00_FFFF => self.pak.backup.get8(addr & 0xFFFF), + 0x0800_0000...0x09FF_FFFF => self.pak.read(u8, addr), + 0x0A00_0000...0x0BFF_FFFF => self.pak.read(u8, addr), + 0x0C00_0000...0x0DFF_FFFF => self.pak.read(u8, addr), + 0x0E00_0000...0x0E00_FFFF => self.pak.backup.read(addr), else => undRead("Tried to read from 0x{X:0>2}", .{addr}), }; @@ -157,13 +157,13 @@ pub fn read8(self: *const Self, addr: u32) u8 { pub fn write8(self: *Self, addr: u32, byte: u8) void { switch (addr) { // General Internal Memory - 0x0200_0000...0x02FF_FFFF => self.ewram.set8(addr & 0x3FFFF, byte), - 0x0300_0000...0x03FF_FFFF => self.iwram.set8(addr & 0x7FFF, byte), + 0x0200_0000...0x02FF_FFFF => self.ewram.write(u8, addr, byte), + 0x0300_0000...0x03FF_FFFF => self.iwram.write(u8, addr, byte), 0x0400_0000...0x0400_03FE => io.write8(self, addr, byte), 0x0400_0410 => log.info("Ignored write of 0x{X:0>2} to 0x{X:0>8}", .{ byte, addr }), // External Memory (Game Pak) - 0x0E00_0000...0x0E00_FFFF => self.pak.backup.set8(addr & 0xFFFF, byte), + 0x0E00_0000...0x0E00_FFFF => self.pak.backup.write(addr, byte), else => undWrite("Tried to write 0x{X:0>2} to 0x{X:0>8}", .{ byte, addr }), } } diff --git a/src/bus/Bios.zig b/src/bus/Bios.zig index 3c2c17e..53b9b08 100644 --- a/src/bus/Bios.zig +++ b/src/bus/Bios.zig @@ -26,23 +26,15 @@ pub fn deinit(self: Self) void { if (self.buf) |buf| self.alloc.free(buf); } -pub fn get32(self: *const Self, idx: usize) u32 { - if (self.buf) |buf| - return (@as(u32, buf[idx + 3]) << 24) | (@as(u32, buf[idx + 2]) << 16) | (@as(u32, buf[idx + 1]) << 8) | (@as(u32, buf[idx])); +pub fn read(self: *const Self, comptime T: type, addr: usize) T { + if (self.buf) |buf| { + return switch (T) { + u32 => (@as(u32, buf[addr + 3]) << 24) | (@as(u32, buf[addr + 2]) << 16) | (@as(u32, buf[addr + 1]) << 8) | (@as(u32, buf[addr])), + u16 => (@as(u16, buf[addr + 1]) << 8) | @as(u16, buf[addr]), + u8 => buf[addr], + else => @compileError("BIOS: Unsupported read width"), + }; + } - std.debug.panic("[CPU/BIOS:32] ZBA tried to read from 0x{X:0>8} but no BIOS was provided.", .{idx}); -} - -pub fn get16(self: *const Self, idx: usize) u16 { - if (self.buf) |buf| - return (@as(u16, buf[idx + 1]) << 8) | @as(u16, buf[idx]); - - std.debug.panic("[CPU/BIOS:16] ZBA tried to read from 0x{X:0>8} but no BIOS was provided.", .{idx}); -} - -pub fn get8(self: *const Self, idx: usize) u8 { - if (self.buf) |buf| - return buf[idx]; - - std.debug.panic("[CPU/BIOS:8] ZBA tried to read from 0x{X:0>8} but no BIOS was provided.", .{idx}); + std.debug.panic("[BIOS] ZBA tried to read {} from 0x{X:0>8} but not BIOS was present", .{ T, addr }); } diff --git a/src/bus/Ewram.zig b/src/bus/Ewram.zig index 2f66dfc..07a7a41 100644 --- a/src/bus/Ewram.zig +++ b/src/bus/Ewram.zig @@ -20,28 +20,32 @@ pub fn deinit(self: Self) void { self.alloc.free(self.buf); } -pub fn get32(self: *const Self, idx: usize) u32 { - return (@as(u32, self.get16(idx + 2)) << 16) | @as(u32, self.get16(idx)); +pub fn read(self: *const Self, comptime T: type, address: usize) T { + const addr = address & 0x3FFFF; + + return switch (T) { + u32 => (@as(u32, self.buf[addr + 3]) << 24) | (@as(u32, self.buf[addr + 2]) << 16) | (@as(u32, self.buf[addr + 1]) << 8) | (@as(u32, self.buf[addr])), + u16 => (@as(u16, self.buf[addr + 1]) << 8) | @as(u16, self.buf[addr]), + u8 => self.buf[addr], + else => @compileError("EWRAM: Unsupported read width"), + }; } -pub fn set32(self: *Self, idx: usize, word: u32) void { - self.set16(idx + 2, @truncate(u16, word >> 16)); - self.set16(idx, @truncate(u16, word)); -} +pub fn write(self: *const Self, comptime T: type, address: usize, value: T) void { + const addr = address & 0x3FFFF; -pub fn get16(self: *const Self, idx: usize) u16 { - return (@as(u16, self.buf[idx + 1]) << 8) | @as(u16, self.buf[idx]); -} - -pub fn set16(self: *Self, idx: usize, halfword: u16) void { - self.buf[idx + 1] = @truncate(u8, halfword >> 8); - self.buf[idx] = @truncate(u8, halfword); -} - -pub fn get8(self: *const Self, idx: usize) u8 { - return self.buf[idx]; -} - -pub fn set8(self: *Self, idx: usize, byte: u8) void { - self.buf[idx] = byte; + return switch (T) { + u32 => { + self.buf[addr + 3] = @truncate(u8, value >> 24); + self.buf[addr + 2] = @truncate(u8, value >> 16); + self.buf[addr + 1] = @truncate(u8, value >> 8); + self.buf[addr + 0] = @truncate(u8, value >> 0); + }, + u16 => { + self.buf[addr + 1] = @truncate(u8, value >> 8); + self.buf[addr + 0] = @truncate(u8, value >> 0); + }, + u8 => self.buf[addr] = value, + else => @compileError("EWRAM: Unsupported write width"), + }; } diff --git a/src/bus/GamePak.zig b/src/bus/GamePak.zig index 24383ae..9ee9ac7 100644 --- a/src/bus/GamePak.zig +++ b/src/bus/GamePak.zig @@ -60,14 +60,13 @@ pub fn deinit(self: Self) void { self.backup.deinit(); } -pub fn get32(self: *const Self, idx: usize) u32 { - return (@as(u32, self.get16(idx + 2)) << 16) | @as(u32, self.get16(idx)); -} +pub fn read(self: *const Self, comptime T: type, address: u32) T { + const addr = address & 0x1FF_FFFF; -pub fn get16(self: *const Self, idx: usize) u16 { - return (@as(u16, self.buf[idx + 1]) << 8) | @as(u16, self.buf[idx]); -} - -pub fn get8(self: *const Self, idx: usize) u8 { - return self.buf[idx]; + return switch (T) { + u32 => (@as(T, self.buf[addr + 3]) << 24) | (@as(T, self.buf[addr + 2]) << 16) | (@as(T, self.buf[addr + 1]) << 8) | (@as(T, self.buf[addr])), + u16 => (@as(T, self.buf[addr + 1]) << 8) | @as(T, self.buf[addr]), + u8 => self.buf[addr], + else => @compileError("GamePak: Unsupported read width"), + }; } diff --git a/src/bus/Iwram.zig b/src/bus/Iwram.zig index 2c9cd03..76c15b5 100644 --- a/src/bus/Iwram.zig +++ b/src/bus/Iwram.zig @@ -20,30 +20,32 @@ pub fn deinit(self: Self) void { self.alloc.free(self.buf); } -pub fn get32(self: *const Self, idx: usize) u32 { - return (@as(u32, self.buf[idx + 3]) << 24) | (@as(u32, self.buf[idx + 2]) << 16) | (@as(u32, self.buf[idx + 1]) << 8) | (@as(u32, self.buf[idx])); +pub fn read(self: *const Self, comptime T: type, address: usize) T { + const addr = address & 0x7FFF; + + return switch (T) { + u32 => (@as(u32, self.buf[addr + 3]) << 24) | (@as(u32, self.buf[addr + 2]) << 16) | (@as(u32, self.buf[addr + 1]) << 8) | (@as(u32, self.buf[addr])), + u16 => (@as(u16, self.buf[addr + 1]) << 8) | @as(u16, self.buf[addr]), + u8 => self.buf[addr], + else => @compileError("IWRAM: Unsupported read width"), + }; } -pub fn set32(self: *Self, idx: usize, word: u32) void { - self.buf[idx + 3] = @truncate(u8, word >> 24); - self.buf[idx + 2] = @truncate(u8, word >> 16); - self.buf[idx + 1] = @truncate(u8, word >> 8); - self.buf[idx] = @truncate(u8, word); -} +pub fn write(self: *const Self, comptime T: type, address: usize, value: T) void { + const addr = address & 0x7FFF; -pub fn get16(self: *const Self, idx: usize) u16 { - return (@as(u16, self.buf[idx + 1]) << 8) | @as(u16, self.buf[idx]); -} - -pub fn set16(self: *Self, idx: usize, halfword: u16) void { - self.buf[idx + 1] = @truncate(u8, halfword >> 8); - self.buf[idx] = @truncate(u8, halfword); -} - -pub fn get8(self: *const Self, idx: usize) u8 { - return self.buf[idx]; -} - -pub fn set8(self: *Self, idx: usize, byte: u8) void { - self.buf[idx] = byte; + return switch (T) { + u32 => { + self.buf[addr + 3] = @truncate(u8, value >> 24); + self.buf[addr + 2] = @truncate(u8, value >> 16); + self.buf[addr + 1] = @truncate(u8, value >> 8); + self.buf[addr + 0] = @truncate(u8, value >> 0); + }, + u16 => { + self.buf[addr + 1] = @truncate(u8, value >> 8); + self.buf[addr + 0] = @truncate(u8, value >> 0); + }, + u8 => self.buf[addr] = value, + else => @compileError("IWRAM: Unsupported write width"), + }; } diff --git a/src/bus/backup.zig b/src/bus/backup.zig index 6199718..505c617 100644 --- a/src/bus/backup.zig +++ b/src/bus/backup.zig @@ -115,38 +115,42 @@ pub const Backup = struct { } } - pub fn get8(self: *const Self, idx: usize) u8 { + pub fn read(self: *const Self, address: usize) u8 { + const addr = address & 0xFFFF; + switch (self.kind) { .Flash => { - switch (idx) { + switch (addr) { 0x0000 => if (self.flash.id_mode) return 0x32, // Panasonic manufacturer ID 0x0001 => if (self.flash.id_mode) return 0x1B, // Panasonic device ID else => {}, } - return self.flash.read(self.buf, idx); + return self.flash.read(self.buf, addr); }, .Flash1M => { - switch (idx) { + switch (addr) { 0x0000 => if (self.flash.id_mode) return 0x62, // Sanyo manufacturer ID 0x0001 => if (self.flash.id_mode) return 0x13, // Sanyo device ID else => {}, } - return self.flash.read(self.buf, idx); + return self.flash.read(self.buf, addr); }, - .Eeprom => return self.buf[idx], - .Sram => return self.buf[idx & 0x7FFF], // 32K SRAM chip is mirrored + .Eeprom => return self.buf[addr], + .Sram => return self.buf[addr & 0x7FFF], // 32K SRAM chip is mirrored } } - pub fn set8(self: *Self, idx: usize, byte: u8) void { + pub fn write(self: *Self, address: usize, byte: u8) void { + const addr = address & 0xFFFF; + switch (self.kind) { .Flash, .Flash1M => { - if (self.flash.prep_write) return self.flash.write(self.buf, idx, byte); - if (self.flash.shouldEraseSector(idx, byte)) return self.flash.eraseSector(self.buf, idx); + if (self.flash.prep_write) return self.flash.write(self.buf, addr, byte); + if (self.flash.shouldEraseSector(addr, byte)) return self.flash.eraseSector(self.buf, addr); - switch (idx) { + switch (addr) { 0x0000 => if (self.kind == .Flash1M and self.flash.set_bank) { self.flash.bank = @truncate(u1, byte); }, @@ -165,8 +169,8 @@ pub const Backup = struct { else => {}, } }, - .Eeprom => self.buf[idx] = byte, - .Sram => self.buf[idx & 0x7FFF] = byte, + .Eeprom => self.buf[addr] = byte, + .Sram => self.buf[addr & 0x7FFF] = byte, } } }; diff --git a/src/ppu.zig b/src/ppu.zig index 64f8efc..a140ab4 100644 --- a/src/ppu.zig +++ b/src/ppu.zig @@ -92,11 +92,11 @@ pub const Ppu = struct { search: while (i < self.oam.buf.len) : (i += 8) { // Attributes in OAM are 6 bytes long, with 2 bytes of padding // Grab Attributes from OAM - const attr0 = @bitCast(Attr0, self.oam.get16(i)); + const attr0 = @bitCast(Attr0, self.oam.read(u16, i)); // Only consider enabled Sprites if (!attr0.disabled.read()) { - const attr1 = @bitCast(Attr1, self.oam.get16(i + 2)); + const attr1 = @bitCast(Attr1, self.oam.read(u16, i + 2)); // When fetching sprites we only care about ones that could be rendered // on this scanline @@ -113,7 +113,7 @@ pub const Ppu = struct { if ((start <= y and y < end) or (istart <= iy and iy < iend)) { for (self.scanline_sprites) |*maybe_sprite| { if (maybe_sprite.* == null) { - maybe_sprite.* = Sprite.init(attr0, attr1, @bitCast(Attr2, self.oam.get16(i + 4))); + maybe_sprite.* = Sprite.init(attr0, attr1, @bitCast(Attr2, self.oam.read(u16, i + 4))); continue :search; } } @@ -205,7 +205,7 @@ pub const Ppu = struct { } else tile; // Sprite Palette starts at 0x0500_0200 - if (pal_id != 0) self.scanline_buf[@bitCast(u9, x)] = self.palette.get16(0x200 + pal_id * 2); + if (pal_id != 0) self.scanline_buf[@bitCast(u9, x)] = self.palette.read(u16, 0x200 + pal_id * 2); } fn drawBackround(self: *Self, comptime n: u3) void { @@ -266,7 +266,7 @@ pub const Ppu = struct { break :blk pal_bank | nybble_tile; } else tile; - if (pal_id != 0) self.scanline_buf[i] = self.palette.get16(pal_id * 2); + if (pal_id != 0) self.scanline_buf[i] = self.palette.read(u16, pal_id * 2); } } @@ -321,7 +321,7 @@ pub const Ppu = struct { // Render Current Scanline for (self.vram.buf[vram_base .. vram_base + width]) |byte, i| { const pal_id = @as(u16, byte) * @sizeOf(u16); - const bgr555 = self.palette.get16(pal_id); + const bgr555 = self.palette.read(u16, pal_id); std.mem.copy(u8, self.framebuf[fb_base + i * @sizeOf(u32) ..][0..4], &intToBytes(u32, toRgba8888(bgr555))); } @@ -432,30 +432,37 @@ const Palette = struct { self.alloc.free(self.buf); } - pub fn get32(self: *const Self, idx: usize) u32 { - return (@as(u32, self.get16(idx + 2)) << 16) | @as(u32, self.get16(idx)); + pub fn read(self: *const Self, comptime T: type, address: usize) T { + const addr = address & 0x3FF; + + return switch (T) { + u32 => (@as(T, self.buf[addr + 3]) << 24) | (@as(T, self.buf[addr + 2]) << 16) | (@as(T, self.buf[addr + 1]) << 8) | (@as(T, self.buf[addr])), + u16 => (@as(T, self.buf[addr + 1]) << 8) | @as(T, self.buf[addr]), + u8 => self.buf[addr], + else => @compileError("PALRAM: Unsupported read width"), + }; } - pub fn set32(self: *Self, idx: usize, word: u32) void { - self.set16(idx + 2, @truncate(u16, word >> 16)); - self.set16(idx, @truncate(u16, word)); - } + pub fn write(self: *Self, comptime T: type, address: usize, value: T) void { + const addr = address & 0x3FF; - pub fn get16(self: *const Self, idx: usize) u16 { - return (@as(u16, self.buf[idx + 1]) << 8) | @as(u16, self.buf[idx]); - } - - pub fn set16(self: *Self, idx: usize, halfword: u16) void { - self.buf[idx + 1] = @truncate(u8, halfword >> 8); - self.buf[idx] = @truncate(u8, halfword); - } - - pub fn get8(self: *const Self, idx: usize) u8 { - return self.buf[idx]; + switch (T) { + u32 => { + self.buf[addr + 3] = @truncate(u8, value >> 24); + self.buf[addr + 2] = @truncate(u8, value >> 16); + self.buf[addr + 1] = @truncate(u8, value >> 8); + self.buf[addr + 0] = @truncate(u8, value >> 0); + }, + u16 => { + self.buf[addr + 1] = @truncate(u8, value >> 8); + self.buf[addr + 0] = @truncate(u8, value >> 0); + }, + else => @compileError("PALRAM: Unsupported write width"), + } } fn getBackdrop(self: *const Self) u16 { - return self.get16(0); + return self.read(u16, 0); } }; @@ -534,28 +541,33 @@ const Oam = struct { self.alloc.free(self.buf); } - pub fn get32(self: *const Self, idx: usize) u32 { - return (@as(u32, self.buf[idx + 3]) << 24) | (@as(u32, self.buf[idx + 2]) << 16) | (@as(u32, self.buf[idx + 1]) << 8) | (@as(u32, self.buf[idx])); + pub fn read(self: *const Self, comptime T: type, address: usize) T { + const addr = address & 0x3FF; + + return switch (T) { + u32 => (@as(T, self.buf[addr + 3]) << 24) | (@as(T, self.buf[addr + 2]) << 16) | (@as(T, self.buf[addr + 1]) << 8) | (@as(T, self.buf[addr])), + u16 => (@as(T, self.buf[addr + 1]) << 8) | @as(T, self.buf[addr]), + u8 => self.buf[addr], + else => @compileError("OAM: Unsupported read width"), + }; } - pub fn set32(self: *Self, idx: usize, word: u32) void { - self.buf[idx + 3] = @truncate(u8, word >> 24); - self.buf[idx + 2] = @truncate(u8, word >> 16); - self.buf[idx + 1] = @truncate(u8, word >> 8); - self.buf[idx] = @truncate(u8, word); - } + pub fn write(self: *Self, comptime T: type, address: usize, value: T) void { + const addr = address & 0x3FF; - pub fn get16(self: *const Self, idx: usize) u16 { - return (@as(u16, self.buf[idx + 1]) << 8) | @as(u16, self.buf[idx]); - } - - pub fn set16(self: *Self, idx: usize, halfword: u16) void { - self.buf[idx + 1] = @truncate(u8, halfword >> 8); - self.buf[idx] = @truncate(u8, halfword); - } - - pub fn get8(self: *const Self, idx: usize) u8 { - return self.buf[idx]; + switch (T) { + u32 => { + self.buf[addr + 3] = @truncate(u8, value >> 24); + self.buf[addr + 2] = @truncate(u8, value >> 16); + self.buf[addr + 1] = @truncate(u8, value >> 8); + self.buf[addr + 0] = @truncate(u8, value >> 0); + }, + u16 => { + self.buf[addr + 1] = @truncate(u8, value >> 8); + self.buf[addr + 0] = @truncate(u8, value >> 0); + }, + else => @compileError("OAM: Unsupported write width"), + } } };