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

Compare commits

base: paoda:2f06f178e2b8c2d275acd5f448eba4921a6eb371
Branches Tags
paoda:main
paoda:ppu
..
compare: paoda:5dbd681ba15ca969cb3dcbb90e07133c248b5f1b
Branches Tags
paoda:main
paoda:ppu

No commits in common. "2f06f178e2b8c2d275acd5f448eba4921a6eb371" and "5dbd681ba15ca969cb3dcbb90e07133c248b5f1b" have entirely different histories.
2f06f178e2 ... 5dbd681ba1

4 changed files with 26 additions and 36 deletions
Show Stats Expand all files Collapse all files

2
lib/arm32

@ -1 +1 @@
Subproject commit 106820b444cf394f2887b44a2afbfb2c01b182ca
Subproject commit a3eefa643268617d10e47ca972c4ba5bd05f131e

27
src/core/io.zig
View File

@ -204,33 +204,6 @@ const IpcFifoCnt = extern union {
raw: u32,
};
pub const masks = struct {
const Bus9 = @import("nds9/Bus.zig");
const Bus7 = @import("nds7/Bus.zig");
pub inline fn ipcFifoSync(bus: anytype, value: anytype) @TypeOf(value) {
comptime verifyBusType(@TypeOf(bus));
const T = @TypeOf(value);
const mask: T = 0xF;
return value & ~mask | @as(T, @intCast(bus.io.shared.ipc_fifo.sync.raw & mask));
}
pub inline fn ipcFifoCnt(bus: anytype, value: anytype) @TypeOf(value) {
comptime verifyBusType(@TypeOf(bus));
const T = @TypeOf(value);
const mask: T = 0x0303;
return value & ~mask | @as(T, @intCast(bus.io.shared.ipc_fifo.cnt.raw & mask));
}
fn verifyBusType(comptime BusT: type) void {
std.debug.assert(@typeInfo(BusT) == .Pointer);
std.debug.assert(@typeInfo(BusT).Pointer.size == .One);
std.debug.assert(@typeInfo(BusT).Pointer.child == Bus9 or @typeInfo(BusT).Pointer.child == Bus7);
}
};
pub const nds7 = struct {
pub const IntEnable = extern union {
raw: u32,

12
src/core/nds7/io.zig
View File

@ -5,7 +5,8 @@ const Bit = @import("bitfield").Bit;
const Bus = @import("Bus.zig");
const SharedIo = @import("../io.zig").Io;
const masks = @import("../io.zig").masks;
const writeToAddressOffset = @import("../io.zig").writeToAddressOffset;
const valueAtAddressOffset = @import("../io.zig").valueAtAddressOffset;
const log = std.log.scoped(.nds7_io);
@ -50,8 +51,13 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void {
else => log.warn("unexpected: write(T: {}, addr: 0x{X:0>8}, value: 0x{X:0>8})", .{ T, address, value }),
},
u16 => switch (address) {
0x0400_0180 => bus.io.shared.ipc_fifo.sync.raw = masks.ipcFifoSync(bus, value),
0x0400_0184 => bus.io.shared.ipc_fifo.cnt.raw = masks.ipcFifoCnt(bus, value),
0x0400_0180 => bus.io.shared.ipc_fifo.sync.raw = blk: {
const ret = value & ~@as(u16, 0xF) | (bus.io.shared.ipc_fifo.sync.raw & 0xF);
log.debug("IPCFIFOSYNC <- 0x{X:0>8}", .{ret});
break :blk ret;
},
0x0400_0184 => bus.io.shared.ipc_fifo.cnt.raw = value,
else => log.warn("unexpected: write(T: {}, addr: 0x{X:0>8}, value: 0x{X:0>8})", .{ T, address, value }),
},
u8 => switch (address) {

21
src/core/nds9/io.zig
View File

@ -5,7 +5,8 @@ const Bit = @import("bitfield").Bit;
const Bus = @import("Bus.zig");
const SharedIo = @import("../io.zig").Io;
const masks = @import("../io.zig").masks;
const writeToAddressOffset = @import("../io.zig").writeToAddressOffset;
const valueAtAddressOffset = @import("../io.zig").valueAtAddressOffset;
const log = std.log.scoped(.nds9_io);
@ -53,8 +54,13 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void {
switch (T) {
u32 => switch (address) {
0x0400_0000 => bus.ppu.io.dispcnt_a.raw = value,
0x0400_0180 => bus.io.shared.ipc_fifo.sync.raw = masks.ipcFifoSync(bus, value),
0x0400_0184 => bus.io.shared.ipc_fifo.cnt.raw = masks.ipcFifoCnt(bus, value),
0x0400_0180 => bus.io.shared.ipc_fifo.sync.raw = blk: {
const ret = value & ~@as(u32, 0xF) | (bus.io.shared.ipc_fifo.sync.raw & 0xF);
log.debug("IPCFIFOSYNC <- 0x{X:0>8}", .{ret});
break :blk ret;
},
0x0400_0184 => bus.io.shared.ipc_fifo.cnt.raw = value,
0x0400_0188 => bus.io.shared.ipc_fifo.send(.arm9, value) catch |e| std.debug.panic("IPC FIFO Error: {}", .{e}),
0x0400_0240 => {
@ -73,8 +79,13 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void {
else => log.warn("unexpected: write(T: {}, addr: 0x{X:0>8}, value: 0x{X:0>8})", .{ T, address, value }),
},
u16 => switch (address) {
0x0400_0180 => bus.io.shared.ipc_fifo.sync.raw = masks.ipcFifoSync(bus, value),
0x0400_0184 => bus.io.shared.ipc_fifo.cnt.raw = masks.ipcFifoCnt(bus, value),
0x0400_0180 => bus.io.shared.ipc_fifo.sync.raw = blk: {
const ret = value & ~@as(u16, 0xF) | (bus.io.shared.ipc_fifo.sync.raw & 0xF);
log.debug("IPCFIFOSYNC <- 0x{X:0>8}", .{ret});
break :blk ret;
},
0x0400_0184 => bus.io.shared.ipc_fifo.cnt.raw = value,
0x0400_0208 => bus.io.shared.ime = value & 1 == 1,
else => log.warn("unexpected: write(T: {}, addr: 0x{X:0>8}, value: 0x{X:0>8})", .{ T, address, value }),