From e144261e073d9f3c4e5dda2155a8d0c20dafcbce Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Sun, 2 Jan 2022 03:16:03 -0600
Subject: [PATCH] feat(bus): emu is now able to read from user-provided BIOS

---
 src/bus.zig           | 12 ++++++++----
 src/bus/bios.zig      | 30 ++++++++++++++++++++++++++++++
 src/{ => bus}/pak.zig |  0
 src/cpu.zig           |  1 +
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 src/bus/bios.zig
 rename src/{ => bus}/pak.zig (100%)

diff --git a/src/bus.zig b/src/bus.zig
index e780e37..eac5836 100644
--- a/src/bus.zig
+++ b/src/bus.zig
@@ -1,21 +1,25 @@
 const std = @import("std");
 
-const GamePak = @import("pak.zig").GamePak;
+const Bios = @import("bus/bios.zig").Bios;
+const GamePak = @import("bus/pak.zig").GamePak;
 const Allocator = std.mem.Allocator;
 
 pub const Bus = struct {
     pak: GamePak,
+    bios: Bios,
 
     pub fn withPak(alloc: Allocator, path: []const u8) !@This() {
         return @This(){
             .pak = try GamePak.fromPath(alloc, path),
+            // TODO: don't hardcode this + bundle open-sorce Boot ROM
+            .bios = try Bios.fromPath(alloc, "./bin/gba_bios.bin"),
         };
     }
 
     pub fn read32(self: *const @This(), addr: u32) u32 {
         return switch (addr) {
             // General Internal Memory
-            0x0000_0000...0x0000_3FFF => std.debug.panic("read32 from 0x{X:} in BIOS", .{addr}),
+            0x0000_0000...0x0000_3FFF => self.bios.get32(@as(usize, addr)),
             0x0200_0000...0x0203FFFF => std.debug.panic("read32 from 0x{X:} in IWRAM", .{addr}),
             0x0300_0000...0x0300_7FFF => std.debug.panic("read32 from 0x{X:} in EWRAM", .{addr}),
             0x0400_0000...0x0400_03FE => std.debug.panic("read32 from 0x{X:} in I/O", .{addr}),
@@ -58,7 +62,7 @@ pub const Bus = struct {
     pub fn read16(self: *const @This(), addr: u32) u16 {
         return switch (addr) {
             // General Internal Memory
-            0x0000_0000...0x0000_3FFF => std.debug.panic("read16 from 0x{X:} in BIOS", .{addr}),
+            0x0000_0000...0x0000_3FFF => self.bios.get16(@as(usize, addr)),
             0x0200_0000...0x0203FFFF => std.debug.panic("read16 from 0x{X:} in IWRAM", .{addr}),
             0x0300_0000...0x0300_7FFF => std.debug.panic("read16 from 0x{X:} in EWRAM", .{addr}),
             0x0400_0000...0x0400_03FE => std.debug.panic("read16 from 0x{X:} in I/O", .{addr}),
@@ -101,7 +105,7 @@ pub const Bus = struct {
     pub fn read8(self: *const @This(), addr: u32) u8 {
         return switch (addr) {
             // General Internal Memory
-            0x0000_0000...0x0000_3FFF => std.debug.panic("read8 from 0x{X:} in BIOS", .{addr}),
+            0x0000_0000...0x0000_3FFF => self.bios.get8(@as(usize, addr)),
             0x0200_0000...0x0203FFFF => std.debug.panic("read8 from 0x{X:} in IWRAM", .{addr}),
             0x0300_0000...0x0300_7FFF => std.debug.panic("read8 from 0x{X:} in EWRAM", .{addr}),
             0x0400_0000...0x0400_03FE => std.debug.panic("read8 from 0x{X:} in I/O", .{addr}),
diff --git a/src/bus/bios.zig b/src/bus/bios.zig
new file mode 100644
index 0000000..c9456c6
--- /dev/null
+++ b/src/bus/bios.zig
@@ -0,0 +1,30 @@
+const std = @import("std");
+
+const Allocator = std.mem.Allocator;
+
+pub const Bios = struct {
+    buf: []u8,
+
+    pub fn fromPath(alloc: Allocator, path: []const u8) !@This() {
+        const file = try std.fs.cwd().openFile(path, .{ .read = true });
+        defer file.close();
+
+        const len = try file.getEndPos();
+
+        return @This(){
+            .buf = try file.readToEndAlloc(alloc, len),
+        };
+    }
+
+    pub inline fn get32(self: *const @This(), 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 inline fn get16(self: *const @This(), idx: usize) u16 {
+        return (@as(u16, self.buf[idx + 1]) << 8) | @as(u16, self.buf[idx]);
+    }
+
+    pub inline fn get8(self: *const @This(), idx: usize) u8 {
+        return self.buf[idx];
+    }
+};
diff --git a/src/pak.zig b/src/bus/pak.zig
similarity index 100%
rename from src/pak.zig
rename to src/bus/pak.zig
diff --git a/src/cpu.zig b/src/cpu.zig
index 5a627c8..af3487d 100644
--- a/src/cpu.zig
+++ b/src/cpu.zig
@@ -26,6 +26,7 @@ pub const Arm7tdmi = struct {
     }
 
     pub inline fn step(self: *@This()) u64 {
+        std.debug.print("PC: 0x{X:} ", .{self.r[15]});
         const opcode = self.fetch();
         std.debug.print("opcode: 0x{X:}\n", .{opcode}); // Debug