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

fix: rotate unaligned reads on BIOS open-bus

Browse Source
This commit is contained in:
Rekai Nyangadzayi Musuka
2022-12-27 05:41:19 -06:00
parent 39d50466c9
commit caaa60d1a8
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/Bus.zig
View File

@@ -227,7 +227,7 @@ fn dbgSlowRead(self: *const Self, comptime T: type, unaligned_address: u32) T {
// General Internal Memory
0x00 => blk: {
if (address < Bios.size)
break :blk self.bios.dbgRead(T, self.cpu.r[15], address);
break :blk self.bios.dbgRead(T, self.cpu.r[15], unaligned_address);
break :blk self.openBus(T, address);
},
@@ -347,7 +347,7 @@ fn slowRead(self: *Self, comptime T: type, unaligned_address: u32) T {
// General Internal Memory
0x00 => blk: {
if (address < Bios.size)
break :blk self.bios.read(T, self.cpu.r[15], address);
break :blk self.bios.read(T, self.cpu.r[15], unaligned_address);
break :blk self.openBus(T, address);
},
@@ -437,11 +437,11 @@ inline fn rotateBy(comptime T: type, address: u32) u32 {
u32 => address & 3,
u16 => address & 1,
u8 => 0,
else => @compileError("Backup: Unsupported write width"),
else => @compileError("Unsupported write width"),
};
}
inline fn forceAlign(comptime T: type, address: u32) u32 {
pub inline fn forceAlign(comptime T: type, address: u32) u32 {
return switch (T) {
u32 => address & ~@as(u32, 3),
u16 => address & ~@as(u32, 1),