Compare commits

..

14 Commits

Author SHA1 Message Date
Rekai Nyangadzayi Musuka 23f5d676d4 chore: reimplement alpha blending 2022-12-04 18:35:20 -04:00
Rekai Nyangadzayi Musuka 4ccacb0754 chore(ppu): use @ptrCast in drawTextMode 2022-12-04 18:35:20 -04:00
Rekai Nyangadzayi Musuka e67dc9b7de chore(ppu): reimplement modes 3, 4, and 5 2022-12-04 18:35:20 -04:00
Rekai Nyangadzayi Musuka f9ca005faf style(ppu): move text mode drawing to unique fn 2022-12-04 18:35:20 -04:00
Rekai Nyangadzayi Musuka 11b905dc82 fix(window): proper inRange impl for window
window wrap now works (it's pretty slow though?)
2022-12-04 18:35:20 -04:00
Rekai Nyangadzayi Musuka 5d3435757c chore: improve readability of sprite drawing code a bit 2022-12-04 18:35:20 -04:00
Rekai Nyangadzayi Musuka d705137f24 style: remove unused imports 2022-12-04 18:35:20 -04:00
Rekai Nyangadzayi Musuka 2c6fe879ad chore: dont allocate not-small ?Sprite array on stack
use memset like most other allocations in this emu
2022-12-04 18:35:20 -04:00
Rekai Nyangadzayi Musuka 24905e8096 chore: move FrameBuffer struct to util.zig 2022-12-04 18:35:19 -04:00
Rekai Nyangadzayi Musuka cab7816ce5 chore: move OAM, PALRAM and VRAM structs to separate files 2022-12-04 18:33:28 -04:00
Rekai Nyangadzayi Musuka 6b6614cfa7 fix: 8-bit writes to WIN PPU registers
Advance Wars depends on these registers similar to Mario Kart's 8-bit
writes to Affine Background registers:
2022-12-04 18:33:28 -04:00
Rekai Nyangadzayi Musuka 106a3f8b4d chore: refactor window 2022-12-04 18:33:28 -04:00
Rekai Nyangadzayi Musuka 918df2743e chore: crude background window impl (no affine) 2022-12-04 18:33:28 -04:00
Rekai Nyangadzayi Musuka 78c5160897 chore: rename function (misspelt until now somehow) 2022-12-04 18:33:28 -04:00
5 changed files with 38 additions and 51 deletions

@ -1 +1 @@
Subproject commit 2fbd4b228516bf08348a3173f1446c7e8d75540a
Subproject commit 00b43568854f14e3bab340a4e062776ecb44a727

@ -1 +1 @@
Subproject commit 8a38c14266d1d00e0c3aee16b2e2b69675209147
Subproject commit a1b01ffeab452790790034b8a0e97aa30bbeb800

View File

@ -197,29 +197,8 @@ fn fillTableExternalMemory(bus: *Self, addr: usize) ?*anyopaque {
return &bus.pak.buf[masked_addr];
}
// TODO: Take advantage of fastmem here too?
pub fn dbgRead(self: *const Self, comptime T: type, unaligned_address: u32) T {
const bits = @typeInfo(std.math.IntFittingRange(0, page_size - 1)).Int.bits;
const page = unaligned_address >> bits;
const offset = unaligned_address & (page_size - 1);
// We're doing some serious out-of-bounds open-bus reads
if (page >= table_len) return self.openBus(T, unaligned_address);
if (self.read_table[page]) |some_ptr| {
// We have a pointer to a page, cast the pointer to it's underlying type
const Ptr = [*]const T;
const alignment = @alignOf(std.meta.Child(Ptr));
const ptr = @ptrCast(Ptr, @alignCast(alignment, some_ptr));
// Note: We don't check array length, since we force align the
// lower bits of the address as the GBA would
return ptr[forceAlign(T, offset) / @sizeOf(T)];
}
return self.dbgSlowRead(T, unaligned_address);
}
fn dbgSlowRead(self: *const Self, comptime T: type, unaligned_address: u32) T {
const page = @truncate(u8, unaligned_address >> 24);
const address = forceAlign(T, unaligned_address);
@ -231,18 +210,29 @@ fn dbgSlowRead(self: *const Self, comptime T: type, unaligned_address: u32) T {
break :blk self.openBus(T, address);
},
0x02 => unreachable, // handled by fastmem
0x03 => unreachable, // handled by fastmem
0x02 => self.ewram.read(T, address),
0x03 => self.iwram.read(T, address),
0x04 => self.readIo(T, address),
// Internal Display Memory
0x05 => unreachable, // handled by fastmem
0x06 => unreachable, // handled by fastmem
0x07 => unreachable, // handled by fastmem
0x05 => self.ppu.palette.read(T, address),
0x06 => self.ppu.vram.read(T, address),
0x07 => self.ppu.oam.read(T, address),
// External Memory (Game Pak)
0x08...0x0D => self.pak.dbgRead(T, address),
0x0E...0x0F => self.readBackup(T, unaligned_address),
0x0E...0x0F => blk: {
const value = self.pak.backup.read(unaligned_address);
const multiplier = switch (T) {
u32 => 0x01010101,
u16 => 0x0101,
u8 => 1,
else => @compileError("Backup: Unsupported read width"),
};
break :blk @as(T, value) * multiplier;
},
else => self.openBus(T, address),
};
}
@ -362,12 +352,7 @@ fn slowRead(self: *Self, comptime T: type, unaligned_address: u32) T {
// External Memory (Game Pak)
0x08...0x0D => self.pak.read(T, address),
0x0E...0x0F => self.readBackup(T, unaligned_address),
else => self.openBus(T, address),
};
}
fn readBackup(self: *const Self, comptime T: type, unaligned_address: u32) T {
0x0E...0x0F => blk: {
const value = self.pak.backup.read(unaligned_address);
const multiplier = switch (T) {
@ -377,7 +362,10 @@ fn readBackup(self: *const Self, comptime T: type, unaligned_address: u32) T {
else => @compileError("Backup: Unsupported read width"),
};
return @as(T, value) * multiplier;
break :blk @as(T, value) * multiplier;
},
else => self.openBus(T, address),
};
}
pub fn write(self: *Self, comptime T: type, unaligned_address: u32, value: T) void {

View File

@ -94,9 +94,10 @@ pub fn sound1CntL(self: *const Self) u8 {
pub fn setSound1CntL(self: *Self, value: u8) void {
const new = io.Sweep{ .raw = value };
if (!new.direction.read()) {
// If at least one (1) sweep calculation has been made with
// the negate bit set (since last trigger), disable the channel
if (self.sweep.direction.read() and !new.direction.read()) {
// Sweep Negate bit has been cleared
// If At least 1 Sweep Calculation has been made since
// the last trigger, the channel is immediately disabled
if (self.sweep_dev.calc_performed) self.enabled = false;
}

View File

@ -31,6 +31,7 @@ pub fn tick(self: *Self, ch1: *ToneSweep) void {
if (self.timer == 0) {
const period = ch1.sweep.period.read();
self.timer = if (period == 0) 8 else period;
if (!self.calc_performed) self.calc_performed = true;
if (self.enabled and period != 0) {
const new_freq = self.calculate(ch1.sweep, &ch1.enabled);
@ -51,10 +52,7 @@ pub fn calculate(self: *Self, sweep: io.Sweep, ch_enable: *bool) u12 {
const shadow_shifted = shadow >> sweep.shift.read();
const decrease = sweep.direction.read();
const freq = if (decrease) blk: {
self.calc_performed = true;
break :blk shadow - shadow_shifted;
} else shadow + shadow_shifted;
const freq = if (decrease) shadow - shadow_shifted else shadow + shadow_shifted;
if (freq > 0x7FF) ch_enable.* = false;
return freq;