Compare commits
2 Commits
dee0e113d8
...
c9f0e1632c
Author | SHA1 | Date |
---|---|---|
Rekai Nyangadzayi Musuka | c9f0e1632c | |
Rekai Nyangadzayi Musuka | 44d52d8137 |
|
@ -29,7 +29,7 @@ pub const Io = struct {
|
|||
|
||||
pub fn write16(self: *@This(), addr: u32, halfword: u16) void {
|
||||
switch (addr) {
|
||||
0x0400_000 => self.dispcnt.val = halfword,
|
||||
0x0400_0000 => self.dispcnt.val = halfword,
|
||||
else => std.debug.panic("[I/O:16] tried to write 0x{X:} to 0x{X:}", .{ halfword, addr }),
|
||||
}
|
||||
}
|
||||
|
|
|
@ -51,10 +51,7 @@ pub fn comptimeHalfSignedDataTransfer(comptime P: bool, comptime U: bool, compti
|
|||
} else {
|
||||
if (opcode >> 5 & 0x01 == 0x01) {
|
||||
// STRH
|
||||
const src = @truncate(u16, cpu.r[rd]);
|
||||
|
||||
bus.write16(address + 2, src);
|
||||
bus.write16(address, src);
|
||||
bus.write16(address, @truncate(u16, cpu.r[rd]));
|
||||
} else {
|
||||
std.debug.panic("[CPU] TODO: Figure out if this is also SWP", .{});
|
||||
}
|
||||
|
|
|
@ -31,19 +31,11 @@ pub fn comptimeSingleDataTransfer(comptime I: bool, comptime P: bool, comptime U
|
|||
} else {
|
||||
if (B) {
|
||||
// STRB
|
||||
const src = @truncate(u8, cpu.r[rd]);
|
||||
|
||||
bus.write8(address + 3, src);
|
||||
bus.write8(address + 2, src);
|
||||
bus.write8(address + 1, src);
|
||||
bus.write8(address, src);
|
||||
bus.write8(address, @truncate(u8, cpu.r[rd]));
|
||||
} else {
|
||||
// STR
|
||||
|
||||
// FIXME: Is this right?
|
||||
const src = cpu.r[rd];
|
||||
const aligned_addr = address - (address % 4);
|
||||
bus.write32(aligned_addr, src);
|
||||
const force_aligned = address & 0xFFFF_FFFC;
|
||||
bus.write32(force_aligned, cpu.r[rd]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue