paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: paoda:034f2e8d1dc82d4065dbc9a44770ea385f9943aa
Branches Tags
paoda:main
paoda:april-fools
paoda:window
paoda:apu-things
..
compare: paoda:d2d4667f7ba35784e909a7ced45854090520c5a7
Branches Tags
paoda:main
paoda:april-fools
paoda:window
paoda:apu-things

No commits in common. "034f2e8d1dc82d4065dbc9a44770ea385f9943aa" and "d2d4667f7ba35784e909a7ced45854090520c5a7" have entirely different histories.
034f2e8d1d ... d2d4667f7b

2 changed files with 69 additions and 91 deletions
Show Stats Expand all files Collapse all files

20
src/bus/io.zig
View File

@ -142,14 +142,6 @@ pub fn read32(bus: *const Bus, addr: u32) u32 {
pub fn write32(bus: *Bus, addr: u32, word: u32) void {
switch (addr) {
0x0400_0000 => bus.ppu.dispcnt.raw = @truncate(u16, word),
0x0400_0010 => bus.ppu.bg[0].hofs.raw = @truncate(u16, word), // TODO: Don't write out every HOFS / VOFS?
0x0400_0012 => bus.ppu.bg[0].vofs.raw = @truncate(u16, word),
0x0400_0014 => bus.ppu.bg[1].hofs.raw = @truncate(u16, word),
0x0400_0016 => bus.ppu.bg[1].vofs.raw = @truncate(u16, word),
0x0400_0018 => bus.ppu.bg[2].hofs.raw = @truncate(u16, word),
0x0400_001A => bus.ppu.bg[2].vofs.raw = @truncate(u16, word),
0x0400_001C => bus.ppu.bg[3].hofs.raw = @truncate(u16, word),
0x0400_001E => bus.ppu.bg[3].vofs.raw = @truncate(u16, word),
0x0400_0200 => bus.io.ie.raw = @truncate(u16, word),
0x0400_0208 => bus.io.ime = word & 1 == 1,
else => std.debug.panic("[I/O:32] tried to write 0x{X:} to 0x{X:}", .{ word, addr }),
@ -172,15 +164,9 @@ pub fn write16(bus: *Bus, addr: u32, halfword: u16) void {
switch (addr) {
0x0400_0000 => bus.ppu.dispcnt.raw = halfword,
0x0400_0004 => bus.ppu.dispstat.raw = halfword,
0x0400_0008...0x0400_000F => bus.ppu.bg[addr & 0x7].cnt.raw = halfword,
0x0400_0010 => bus.ppu.bg[0].hofs.raw = halfword, // TODO: Don't write out every HOFS / VOFS?
0x0400_0012 => bus.ppu.bg[0].vofs.raw = halfword,
0x0400_0014 => bus.ppu.bg[1].hofs.raw = halfword,
0x0400_0016 => bus.ppu.bg[1].vofs.raw = halfword,
0x0400_0018 => bus.ppu.bg[2].hofs.raw = halfword,
0x0400_001A => bus.ppu.bg[2].vofs.raw = halfword,
0x0400_001C => bus.ppu.bg[3].hofs.raw = halfword,
0x0400_001E => bus.ppu.bg[3].vofs.raw = halfword,
0x0400_0008 => bus.ppu.bg0.cnt.raw = halfword,
0x0400_0010 => bus.ppu.bg0.hofs.raw = halfword,
0x0400_0012 => bus.ppu.bg0.vofs.raw = halfword,
0x0400_0200 => bus.io.ie.raw = halfword,
0x0400_0202 => bus.io.irq.raw = halfword,
0x0400_0208 => bus.io.ime = halfword & 1 == 1,

60
src/ppu.zig
View File

@ -17,8 +17,10 @@ pub const Ppu = struct {
const Self = @This();
// Registers
bg: [4]Background,
bg0: Background,
bg1: Background,
bg2: Background,
bg3: Background,
dispcnt: io.DisplayControl,
dispstat: io.DisplayStatus,
@ -47,7 +49,10 @@ pub const Ppu = struct {
.alloc = alloc,
// Registers
.bg = [_]Background{Background.init()} ** 4,
.bg0 = Background.init(),
.bg1 = Background.init(),
.bg2 = Background.init(),
.bg3 = Background.init(),
.dispcnt = .{ .raw = 0x0000 },
.dispstat = .{ .raw = 0x0000 },
.vcount = .{ .raw = 0x0000 },
@ -60,7 +65,15 @@ pub const Ppu = struct {
self.palette.deinit();
}
fn drawBackround(self: *Self, comptime n: u3, scanline: u32) void {
pub fn drawScanline(self: *Self) void {
const bg_mode = self.dispcnt.bg_mode.read();
const scanline = self.vcount.scanline.read();
switch (bg_mode) {
0x0 => {
// TODO: Consider more than BG0
// TODO: Consider Scrolling
// The Current Scanline which will be copied into
// the Framebuffer
const start = framebuf_pitch * @as(usize, scanline);
@ -70,10 +83,10 @@ pub const Ppu = struct {
const charblock_len: u32 = 0x4000;
const screenblock_len: u32 = 0x800;
const cbb: u2 = self.bg[n].cnt.char_base.read(); // Char Block Base
const sbb: u5 = self.bg[n].cnt.screen_base.read(); // Screen Block Base
const is_8bpp: bool = self.bg[n].cnt.colour_mode.read(); // Colour Mode
const size: u2 = self.bg[n].cnt.size.read(); // Background Size
const cbb: u2 = self.bg0.cnt.char_base.read(); // Char Block Base
const sbb: u5 = self.bg0.cnt.screen_base.read(); // Screen Block Base
const is_8bpp: bool = self.bg0.cnt.colour_mode.read(); // Colour Mode
const size: u2 = self.bg0.cnt.size.read(); // Background Size
// In 4bpp: 1 byte represents two pixels so the length is (8 x 8) / 2
// In 8bpp: 1 byte represents one pixel so the length is 8 x 8
@ -84,18 +97,13 @@ pub const Ppu = struct {
const char_base: u32 = charblock_len * @as(u32, cbb);
const screen_base: u32 = screenblock_len * @as(u32, sbb);
const vofs = self.bg[n].vofs.offset.read();
const hofs = self.bg[n].hofs.offset.read();
const y = scanline + vofs;
var i: u32 = 0;
while (i < width) : (i += 1) {
const x = i + hofs;
const y = @as(u32, scanline);
var x: u32 = 0;
while (x < width) : (x += 1) {
// Grab the Screen Entry from VRAM
const entry_addr = screen_base + tilemapOffset(size, x, y);
const entry = @bitCast(ScreenEntry, @as(u16, self.vram.get16(entry_addr)));
const entry = @bitCast(ScreenEntry, @as(u16, self.vram.buf[entry_addr + 1]) << 8 | @as(u16, self.vram.buf[entry_addr]));
// Calculate the Address of the Tile in the designated Charblock
// We also take this opportunity to flip tiles if necessary
@ -118,26 +126,10 @@ pub const Ppu = struct {
break :blk pal_bank | tile;
} else tile;
std.mem.copy(u8, scanline_buf[i * 2 ..][0..2], self.palette.buf[colour * 2 ..][0..2]);
std.mem.copy(u8, scanline_buf[x * 2 ..][0..2], self.palette.buf[colour * 2 ..][0..2]);
}
std.mem.copy(u8, self.framebuf[start..][0..framebuf_pitch], &scanline_buf);
}
pub fn drawScanline(self: *Self) void {
const bg_mode = self.dispcnt.bg_mode.read();
const bg_enable = self.dispcnt.bg_enable.read();
const scanline = self.vcount.scanline.read();
switch (bg_mode) {
0x0 => {
var i: usize = 0;
while (i < 4) : (i += 1) {
if (i == self.bg[0].cnt.priority.read() and bg_enable & 1 == 1) self.drawBackround(0, scanline);
if (i == self.bg[1].cnt.priority.read() and bg_enable >> 1 & 1 == 1) self.drawBackround(1, scanline);
if (i == self.bg[2].cnt.priority.read() and bg_enable >> 2 & 1 == 1) self.drawBackround(2, scanline);
if (i == self.bg[3].cnt.priority.read() and bg_enable >> 3 & 1 == 1) self.drawBackround(3, scanline);
}
},
0x3 => {
const start = framebuf_pitch * @as(usize, scanline);