feat(apu): impelement all apu i/o reads

src/core/apu.zig

@@ -12,9 +12,10 @@ const Noise = @import("apu/Noise.zig");
 
 const SoundFifo = std.fifo.LinearFifo(u8, .{ .Static = 0x20 });
 
-const intToBytes = @import("../util.zig").intToBytes;
+const setHi = util.setHi;
-const setHi = @import("../util.zig").setHi;
+const setLo = util.setLo;
-const setLo = @import("../util.zig").setLo;
+const shift = util.shift;
+const intToBytes = util.intToBytes;
 
 const log = std.log.scoped(.APU);
 
@@ -25,42 +26,80 @@ pub fn read(comptime T: type, apu: *const Apu, addr: u32) ?T {
     const byte = @truncate(u8, addr);
 
     return switch (T) {
+        u32 => switch (byte) {
+            0x60 => @as(T, apu.ch1.sound1CntH()) << 16 | apu.ch1.sound1CntL(),
+            0x64 => apu.ch1.sound1CntX(),
+            0x68 => apu.ch2.sound2CntL(),
+            0x6C => apu.ch2.sound2CntH(),
+            0x70 => @as(T, apu.ch3.sound3CntH()) << 16 | apu.ch3.sound3CntL(),
+            0x74 => apu.ch3.sound3CntX(),
+            0x78 => apu.ch4.sound4CntL(),
+            0x7C => apu.ch4.sound4CntH(),
+            0x80 => @as(T, apu.dma_cnt.raw) << 16 | apu.psg_cnt.raw, // SOUNDCNT_H, SOUNDCNT_L
+            0x84 => apu.soundCntX(),
+            0x88 => apu.bias.raw, // SOUNDBIAS, high is unused
+            0x8C => null,
+            0x90, 0x94, 0x8, 0x9C => apu.ch3.wave_dev.read(T, apu.ch3.select, addr),
+            0xA0 => null, // FIFO_A
+            0xA4 => null, // FIFO_B
+            else => util.io.read.err(T, log, "unaligned {} read from 0x{X:0>8}", .{ T, addr }),
+        },
         u16 => switch (byte) {
             0x60 => apu.ch1.sound1CntL(),
             0x62 => apu.ch1.sound1CntH(),
             0x64 => apu.ch1.sound1CntX(),
+            0x66 => null,
             0x68 => apu.ch2.sound2CntL(),
+            0x6A => null,
             0x6C => apu.ch2.sound2CntH(),
-
+            0x6E => null,
-            0x70 => apu.ch3.select.raw & 0xE0, // SOUND3CNT_L
+            0x70 => apu.ch3.sound3CntL(),
             0x72 => apu.ch3.sound3CntH(),
-            0x74 => apu.ch3.freq.raw & 0x4000, // SOUND3CNT_X
+            0x74 => apu.ch3.sound3CntX(),
-
+            0x76 => null,
             0x78 => apu.ch4.sound4CntL(),
+            0x7A => null,
             0x7C => apu.ch4.sound4CntH(),
-
+            0x7E => null,
-            0x80 => apu.psg_cnt.raw & 0xFF77, // SOUNDCNT_L
+            0x80 => apu.soundCntL(),
-            0x82 => apu.dma_cnt.raw & 0x770F, // SOUNDCNT_H
+            0x82 => apu.soundCntH(),
             0x84 => apu.soundCntX(),
+            0x86 => null,
             0x88 => apu.bias.raw, // SOUNDBIAS
-            0x90...0x9F => apu.ch3.wave_dev.read(T, apu.ch3.select, addr),
+            0x8A, 0x8C, 0x8E => null,
-            else => util.io.read.undef(T, log, "Tried to perform a {} read to 0x{X:0>8}", .{ T, addr }),
+            0x90, 0x92, 0x94, 0x96, 0x98, 0x9A, 0x9C, 0x9E => apu.ch3.wave_dev.read(T, apu.ch3.select, addr),
+            0xA0, 0xA2 => null, // FIFO_A
+            0xA4, 0xA6 => null, // FIFO_B
+            else => util.io.read.err(T, log, "unaligned {} read from 0x{X:0>8}", .{ T, addr }),
         },
         u8 => switch (byte) {
-            0x60 => apu.ch1.sound1CntL(), // NR10
+            0x60, 0x61 => @truncate(T, @as(u16, apu.ch1.sound1CntL()) >> shift(byte)),
-            0x62 => apu.ch1.duty.raw, // NR11
+            0x62, 0x63 => @truncate(T, apu.ch1.sound1CntH() >> shift(byte)),
-            0x63 => apu.ch1.envelope.raw, // NR12
+            0x64, 0x65 => @truncate(T, apu.ch1.sound1CntX() >> shift(byte)),
-            0x68 => apu.ch2.duty.raw, // NR21
+            0x66, 0x67 => null,
-            0x69 => apu.ch2.envelope.raw, // NR22
+            0x68, 0x69 => @truncate(T, apu.ch2.sound2CntL() >> shift(byte)),
-            0x73 => apu.ch3.vol.raw, // NR32
+            0x6A, 0x6B => null,
-            0x79 => apu.ch4.envelope.raw, // NR42
+            0x6C, 0x6D => @truncate(T, apu.ch2.sound2CntH() >> shift(byte)),
-            0x7C => apu.ch4.poly.raw, // NR43
+            0x6E, 0x6F => null,
-            0x81 => @truncate(u8, apu.psg_cnt.raw >> 8), // NR51
+            0x70, 0x71 => @truncate(T, @as(u16, apu.ch3.sound3CntL()) >> shift(byte)), // SOUND3CNT_L
-            0x84 => apu.soundCntX(),
+            0x72, 0x73 => @truncate(T, apu.ch3.sound3CntH() >> shift(byte)),
-            0x89 => @truncate(u8, apu.bias.raw >> 8), // SOUNDBIAS_H
+            0x74, 0x75 => @truncate(T, apu.ch3.sound3CntX() >> shift(byte)), // SOUND3CNT_L
-            else => util.io.read.undef(T, log, "Tried to perform a {} read to 0x{X:0>8}", .{ T, addr }),
+            0x76, 0x77 => null,
+            0x78, 0x79 => @truncate(T, apu.ch4.sound4CntL() >> shift(byte)),
+            0x7A, 0x7B => null,
+            0x7C, 0x7D => @truncate(T, apu.ch4.sound4CntH() >> shift(byte)),
+            0x7E, 0x7F => null,
+            0x80, 0x81 => @truncate(T, apu.soundCntL() >> shift(byte)), // SOUNDCNT_L
+            0x82, 0x83 => @truncate(T, apu.soundCntH() >> shift(byte)), // SOUNDCNT_H
+            0x84, 0x85 => @truncate(T, @as(u16, apu.soundCntX()) >> shift(byte)),
+            0x86, 0x87 => null,
+            0x88, 0x89 => @truncate(T, apu.bias.raw >> shift(byte)), // SOUNDBIAS
+            0x8A...0x8F => null,
+            0x90...0x9F => apu.ch3.wave_dev.read(T, apu.ch3.select, addr),
+            0xA0, 0xA1, 0xA2, 0xA3 => null, // FIFO_A
+            0xA4, 0xA5, 0xA6, 0xA7 => null, // FIFO_B
+            else => util.io.read.err(T, log, "unexpected {} read from 0x{X:0>8}", .{ T, addr }),
         },
-        u32 => util.io.read.undef(T, log, "Tried to perform a {} read to 0x{X:0>8}", .{ T, addr }),
         else => @compileError("APU: Unsupported read width"),
     };
 }
@@ -219,6 +258,11 @@ pub const Apu = struct {
         self.setSoundCntH(@truncate(u16, value >> 16));
     }
 
+    /// SOUNDCNT_L
+    pub fn soundCntL(self: *const Self) u16 {
+        return self.psg_cnt.raw & 0xFF77;
+    }
+
     /// SOUNDCNT_H
     pub fn setSoundCntH(self: *Self, value: u16) void {
         const new: io.DmaSoundControl = .{ .raw = value };
@@ -231,6 +275,11 @@ pub const Apu = struct {
         self.dma_cnt = new;
     }
 
+    /// SOUNDCNT_H
+    pub fn soundCntH(self: *const Self) u16 {
+        return self.dma_cnt.raw & 0x770F;
+    }
+
     /// NR52
     pub fn setSoundCntX(self: *Self, value: bool) void {
         self.cnt.apu_enable.write(value);

src/core/apu/Wave.zig

@@ -71,6 +71,11 @@ pub fn setSound3CntL(self: *Self, value: u8) void {
     if (!self.select.enabled.read()) self.enabled = false;
 }
 
+/// NR30
+pub fn sound3CntL(self: *const Self) u8 {
+    return self.select.raw & 0xE0;
+}
+
 /// NR31, NR32
 pub fn sound3CntH(self: *const Self) u16 {
     return @as(u16, self.length & 0xE0) << 8;
@@ -94,6 +99,11 @@ pub fn setSound3CntX(self: *Self, fs: *const FrameSequencer, value: u16) void {
     self.setNr34(fs, @truncate(u8, value >> 8));
 }
 
+/// NR33, NR34
+pub fn sound3CntX(self: *const Self) u16 {
+    return self.freq.raw & 0x4000;
+}
+
 /// NR33
 pub fn setNr33(self: *Self, byte: u8) void {
     self.freq.raw = (self.freq.raw & 0xFF00) | byte;

src/core/bus/dma.zig

@@ -53,7 +53,7 @@ pub fn read(comptime T: type, dma: *const DmaTuple, addr: u32) ?T {
             0xD2, 0xD3 => @truncate(T, dma.*[2].cnt.raw >> shift(byte)),
             0xD4...0xDD => null, // DMA3SAD, DMA3DAD, DMA3CNT_L
             0xDE, 0xDF => @truncate(T, dma.*[3].cnt.raw >> shift(byte)),
-            else => util.io.read.err(T, log, "unaligned {} read from 0x{X:0>8}", .{ T, addr }),
+            else => util.io.read.err(T, log, "unexpected {} read from 0x{X:0>8}", .{ T, addr }),
         },
         else => @compileError("DMA: Unsupported read width"),
     };

src/core/bus/io.zig

@@ -45,6 +45,9 @@ pub fn read(bus: *const Bus, comptime T: type, address: u32) ?T {
             // Display
             0x0400_0000...0x0400_0054 => ppu.read(T, &bus.ppu, address),
 
+            // Sound
+            0x0400_0060...0x0400_00A4 => apu.read(T, &bus.apu, address),
+
             // DMA Transfers
             0x0400_00B0...0x0400_00DC => dma.read(T, &bus.dma, address),
 
@@ -70,7 +73,7 @@ pub fn read(bus: *const Bus, comptime T: type, address: u32) ?T {
             0x0400_0000...0x0400_0054 => ppu.read(T, &bus.ppu, address),
 
             // Sound
-            0x0400_0060...0x0400_009E => apu.read(T, &bus.apu, address),
+            0x0400_0060...0x0400_00A6 => apu.read(T, &bus.apu, address),
 
             // DMA Transfers
             0x0400_00B0...0x0400_00DE => dma.read(T, &bus.dma, address),
@@ -101,6 +104,12 @@ pub fn read(bus: *const Bus, comptime T: type, address: u32) ?T {
             // Sound
             0x0400_0060...0x0400_00A7 => apu.read(T, &bus.apu, address),
 
+            // DMA Transfers
+            0x0400_00B0...0x0400_00DE => dma.read(T, &bus.dma, address),
+
+            // Timers
+            0x0400_0100...0x0400_010E => timer.read(T, &bus.tim, address),
+
             // Serial Communication 1
             0x0400_0128 => util.io.read.todo(log, "Read {} from SIOCNT_L", .{T}),
 

src/core/ppu.zig

@@ -76,7 +76,7 @@ pub fn read(comptime T: type, ppu: *const Ppu, addr: u32) ?T {
             0x50, 0x51 => @truncate(T, ppu.bldcnt.raw >> shift(byte)),
             0x52, 0x53 => @truncate(T, ppu.bldalpha.raw >> shift(byte)),
             0x54...0x55 => null, // BLDY
-            else => util.io.read.err(T, log, "unaligned {} read from 0x{X:0>8}", .{ T, addr }),
+            else => util.io.read.err(T, log, "unexpected {} read from 0x{X:0>8}", .{ T, addr }),
         },
         else => @compileError("PPU: Unsupported read width"),
     };