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

Compare commits

base: paoda:c6a30e62b7726bf2d8495095fe5221104c5be630
Branches Tags
paoda:main
paoda:ppu
..
compare: paoda:cd3a3dbe633d9ab3fc3d27cba46f9e97f50abc0b
Branches Tags
paoda:main
paoda:ppu

No commits in common. "c6a30e62b7726bf2d8495095fe5221104c5be630" and "cd3a3dbe633d9ab3fc3d27cba46f9e97f50abc0b" have entirely different histories.
c6a30e62b7 ... cd3a3dbe63

5 changed files with 30 additions and 48 deletions
Show Stats Expand all files Collapse all files

2
lib/arm32

@ -1 +1 @@
Subproject commit e6863e7a9b292f29fe2c56addbf315ff10fe51ea Subproject commit ada2a08516d55a61bddd96f1c29e1547d0466049

9
src/core/emu.zig
View File

@ -131,12 +131,3 @@ pub const SharedContext = struct {
allocator.destroy(self.main); allocator.destroy(self.main);
} }
}; };
pub inline fn forceAlign(comptime T: type, address: u32) u32 {
return switch (T) {
u32 => address & ~@as(u32, 3),
u16 => address & ~@as(u32, 1),
u8 => address,
else => @compileError("Bus: Invalid read/write type"),
};
}

30
src/core/nds7/Bus.zig
View File

@ -1,10 +1,10 @@
const std = @import("std"); const std = @import("std");
const io = @import("io.zig"); const io = @import("io.zig");
const Scheduler = @import("Scheduler.zig"); const Scheduler = @import("Scheduler.zig");
const SharedIo = @import("../io.zig").Io; const SharedIo = @import("../io.zig").Io;
const SharedContext = @import("../emu.zig").SharedContext; const SharedContext = @import("../emu.zig").SharedContext;
const forceAlign = @import("../emu.zig").forceAlign;
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
@ -50,19 +50,17 @@ fn _read(self: *@This(), comptime T: type, comptime mode: Mode, address: u32) T
const byte_count = @divExact(@typeInfo(T).Int.bits, 8); const byte_count = @divExact(@typeInfo(T).Int.bits, 8);
const readInt = std.mem.readIntLittle; const readInt = std.mem.readIntLittle;
const aligned_addr = forceAlign(T, address);
switch (mode) { switch (mode) {
// .debug => log.debug("read {} from 0x{X:0>8}", .{ T, aligned_addr }), // .debug => log.debug("read {} from 0x{X:0>8}", .{ T, address }),
.debug => {}, .debug => {},
else => self.scheduler.tick += 1, else => self.scheduler.tick += 1,
} }
return switch (aligned_addr) { return switch (address) {
0x0200_0000...0x02FF_FFFF => readInt(T, self.main[aligned_addr & 0x003F_FFFF ..][0..byte_count]), 0x0200_0000...0x02FF_FFFF => readInt(T, self.main[address & 0x003F_FFFF ..][0..byte_count]),
0x0380_0000...0x0380_FFFF => readInt(T, self.wram[aligned_addr & 0x0000_FFFF ..][0..byte_count]), 0x0380_0000...0x0380_FFFF => readInt(T, self.wram[address & 0x0000_FFFF ..][0..byte_count]),
0x0400_0000...0x04FF_FFFF => io.read(self, T, aligned_addr), 0x0400_0000...0x04FF_FFFF => io.read(self, T, address),
else => warn("unexpected read: 0x{x:0>8} -> {}", .{ aligned_addr, T }), else => warn("unexpected read: 0x{x:0>8} -> {}", .{ address, T }),
}; };
} }
@ -78,19 +76,17 @@ fn _write(self: *@This(), comptime T: type, comptime mode: Mode, address: u32, v
const byte_count = @divExact(@typeInfo(T).Int.bits, 8); const byte_count = @divExact(@typeInfo(T).Int.bits, 8);
const writeInt = std.mem.writeIntLittle; const writeInt = std.mem.writeIntLittle;
const aligned_addr = forceAlign(T, address);
switch (mode) { switch (mode) {
// .debug => log.debug("wrote 0x{X:}{} to 0x{X:0>8}", .{ value, T, aligned_addr }), // .debug => log.debug("wrote 0x{X:}{} to 0x{X:0>8}", .{ value, T, address }),
.debug => {}, .debug => {},
else => self.scheduler.tick += 1, else => self.scheduler.tick += 1,
} }
switch (aligned_addr) { switch (address) {
0x0200_0000...0x02FF_FFFF => writeInt(T, self.main[aligned_addr & 0x003F_FFFF ..][0..byte_count], value), 0x0200_0000...0x02FF_FFFF => writeInt(T, self.main[address & 0x003F_FFFF ..][0..byte_count], value),
0x0380_0000...0x0380_FFFF => writeInt(T, self.wram[aligned_addr & 0x0000_FFFF ..][0..byte_count], value), 0x0380_0000...0x0380_FFFF => writeInt(T, self.wram[address & 0x0000_FFFF ..][0..byte_count], value),
0x0400_0000...0x04FF_FFFF => io.write(self, T, aligned_addr, value), 0x0400_0000...0x04FF_FFFF => io.write(self, T, address, value),
else => log.warn("unexpected write: 0x{X:}{} -> 0x{X:0>8}", .{ value, T, aligned_addr }), else => log.warn("unexpected write: 0x{X:}{} -> 0x{X:0>8}", .{ value, T, address }),
} }
} }

31
src/core/nds9/Bus.zig
View File

@ -1,10 +1,9 @@
const std = @import("std"); const std = @import("std");
const io = @import("io.zig");
const Ppu = @import("../ppu.zig").Ppu; const Ppu = @import("../ppu.zig").Ppu;
const Scheduler = @import("Scheduler.zig"); const Scheduler = @import("Scheduler.zig");
const SharedContext = @import("../emu.zig").SharedContext; const SharedContext = @import("../emu.zig").SharedContext;
const forceAlign = @import("../emu.zig").forceAlign; const io = @import("io.zig");
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
@ -61,19 +60,17 @@ fn _read(self: *@This(), comptime T: type, comptime mode: Mode, address: u32) T
const byte_count = @divExact(@typeInfo(T).Int.bits, 8); const byte_count = @divExact(@typeInfo(T).Int.bits, 8);
const readInt = std.mem.readIntLittle; const readInt = std.mem.readIntLittle;
const aligned_addr = forceAlign(T, address);
switch (mode) { switch (mode) {
// .debug => log.debug("read {} from 0x{X:0>8}", .{ T, aligned_addr }), // .debug => log.debug("read {} from 0x{X:0>8}", .{ T, address }),
.debug => {}, .debug => {},
else => self.scheduler.tick += 1, else => self.scheduler.tick += 1,
} }
return switch (aligned_addr) { return switch (address) {
0x0200_0000...0x02FF_FFFF => readInt(T, self.main[aligned_addr & 0x003F_FFFF ..][0..byte_count]), 0x0200_0000...0x02FF_FFFF => readInt(T, self.main[address & 0x003F_FFFF ..][0..byte_count]),
0x0400_0000...0x04FF_FFFF => io.read(self, T, aligned_addr), 0x0400_0000...0x04FF_FFFF => io.read(self, T, address),
0x0600_0000...0x06FF_FFFF => readInt(T, self.vram1[aligned_addr & 0x0007_FFFF ..][0..byte_count]), 0x0600_0000...0x06FF_FFFF => readInt(T, self.vram1[address & 0x0007_FFFF ..][0..byte_count]),
else => warn("unexpected read: 0x{x:0>8} -> {}", .{ aligned_addr, T }), else => warn("unexpected read: 0x{x:0>8} -> {}", .{ address, T }),
}; };
} }
@ -89,19 +86,17 @@ fn _write(self: *@This(), comptime T: type, comptime mode: Mode, address: u32, v
const byte_count = @divExact(@typeInfo(T).Int.bits, 8); const byte_count = @divExact(@typeInfo(T).Int.bits, 8);
const writeInt = std.mem.writeIntLittle; const writeInt = std.mem.writeIntLittle;
const aligned_addr = forceAlign(T, address);
switch (mode) { switch (mode) {
// .debug => log.debug("wrote 0x{X:}{} to 0x{X:0>8}", .{ value, T, aligned_addr }), // .debug => log.debug("wrote 0x{X:}{} to 0x{X:0>8}", .{ value, T, address }),
.debug => {}, .debug => {},
else => self.scheduler.tick += 1, else => self.scheduler.tick += 1,
} }
switch (aligned_addr) { switch (address) {
0x0200_0000...0x02FF_FFFF => writeInt(T, self.main[aligned_addr & 0x003F_FFFF ..][0..byte_count], value), 0x0200_0000...0x02FF_FFFF => writeInt(T, self.main[address & 0x003F_FFFF ..][0..byte_count], value),
0x0400_0000...0x04FF_FFFF => io.write(self, T, aligned_addr, value), 0x0400_0000...0x04FF_FFFF => io.write(self, T, address, value),
0x0600_0000...0x06FF_FFFF => writeInt(T, self.vram1[aligned_addr & 0x0007_FFFF ..][0..byte_count], value), 0x0600_0000...0x06FF_FFFF => writeInt(T, self.vram1[address & 0x0007_FFFF ..][0..byte_count], value),
else => log.warn("unexpected write: 0x{X:}{} -> 0x{X:0>8}", .{ value, T, aligned_addr }), else => log.warn("unexpected write: 0x{X:}{} -> 0x{X:0>8}", .{ value, T, address }),
} }
} }

6
src/ui/imgui.zig
View File

@ -15,7 +15,7 @@ pub const State = struct {
const default_rom_title: [12:0]u8 = "No Title\x00\x00\x00\x00".*; const default_rom_title: [12:0]u8 = "No Title\x00\x00\x00\x00".*;
title: [12:0]u8 = default_rom_title, title: [12:0]u8 = default_rom_title,
dim: Dimensions = .{ .width = 1600, .height = 900 }, dim: Dimensions = .{ .width = 1280, .height = 720 },
}; };
pub fn draw(state: *const State, top_tex: GLuint, btm_tex: GLuint, arm946es: *Arm946es) bool { pub fn draw(state: *const State, top_tex: GLuint, btm_tex: GLuint, arm946es: *Arm946es) bool {
@ -23,8 +23,8 @@ pub fn draw(state: *const State, top_tex: GLuint, btm_tex: GLuint, arm946es: *Ar
zgui.backend.newFrame(@floatFromInt(state.dim.width), @floatFromInt(state.dim.height)); zgui.backend.newFrame(@floatFromInt(state.dim.width), @floatFromInt(state.dim.height));
{ {
const w: f32 = @floatFromInt(nds_width * 2); const w: f32 = @floatFromInt((nds_width * 3) / 2);
const h: f32 = @floatFromInt(nds_height * 2); const h: f32 = @floatFromInt((nds_height * 3) / 2);
const provided = std.mem.sliceTo(&state.title, 0); const provided = std.mem.sliceTo(&state.title, 0);
const window_title = if (provided.len == 0) &State.default_rom_title else provided; const window_title = if (provided.len == 0) &State.default_rom_title else provided;