feat: implement ui for register, interrupt
This commit is contained in:
parent
42764b21ef
commit
d396073142
|
@ -346,10 +346,10 @@ const InterruptEnable = extern union {
|
||||||
vblank: Bit(u16, 0),
|
vblank: Bit(u16, 0),
|
||||||
hblank: Bit(u16, 1),
|
hblank: Bit(u16, 1),
|
||||||
coincidence: Bit(u16, 2),
|
coincidence: Bit(u16, 2),
|
||||||
tm0_overflow: Bit(u16, 3),
|
tim0: Bit(u16, 3),
|
||||||
tm1_overflow: Bit(u16, 4),
|
tim1: Bit(u16, 4),
|
||||||
tm2_overflow: Bit(u16, 5),
|
tim2: Bit(u16, 5),
|
||||||
tm3_overflow: Bit(u16, 6),
|
tim3: Bit(u16, 6),
|
||||||
serial: Bit(u16, 7),
|
serial: Bit(u16, 7),
|
||||||
dma0: Bit(u16, 8),
|
dma0: Bit(u16, 8),
|
||||||
dma1: Bit(u16, 9),
|
dma1: Bit(u16, 9),
|
||||||
|
|
|
@ -647,7 +647,7 @@ pub const PSR = extern union {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const Mode = enum(u5) {
|
pub const Mode = enum(u5) {
|
||||||
User = 0b10000,
|
User = 0b10000,
|
||||||
Fiq = 0b10001,
|
Fiq = 0b10001,
|
||||||
Irq = 0b10010,
|
Irq = 0b10010,
|
||||||
|
@ -656,7 +656,7 @@ const Mode = enum(u5) {
|
||||||
Undefined = 0b11011,
|
Undefined = 0b11011,
|
||||||
System = 0b11111,
|
System = 0b11111,
|
||||||
|
|
||||||
fn toString(self: Mode) []const u8 {
|
pub fn toString(self: Mode) []const u8 {
|
||||||
return switch (self) {
|
return switch (self) {
|
||||||
.User => "usr",
|
.User => "usr",
|
||||||
.Fiq => "fiq",
|
.Fiq => "fiq",
|
||||||
|
|
134
src/platform.zig
134
src/platform.zig
|
@ -100,7 +100,7 @@ pub const Gui = struct {
|
||||||
zgui.plot.init();
|
zgui.plot.init();
|
||||||
zgui.backend.init(window, ctx, "#version 330 core");
|
zgui.backend.init(window, ctx, "#version 330 core");
|
||||||
|
|
||||||
zgui.io.setIniFilename(null);
|
// zgui.io.setIniFilename(null);
|
||||||
|
|
||||||
return Self{
|
return Self{
|
||||||
.window = window,
|
.window = window,
|
||||||
|
@ -260,25 +260,48 @@ pub const Gui = struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn draw(self: *Self, tex_id: GLuint, cpu: *const Arm7tdmi) void {
|
fn draw(self: *Self, tex_id: GLuint, cpu: *const Arm7tdmi) void {
|
||||||
_ = cpu;
|
|
||||||
const win_scale = config.config().host.win_scale;
|
const win_scale = config.config().host.win_scale;
|
||||||
|
|
||||||
{
|
{
|
||||||
|
const w = @intToFloat(f32, gba_width * win_scale);
|
||||||
|
const h = @intToFloat(f32, gba_height * win_scale);
|
||||||
|
|
||||||
_ = zgui.begin("Game Boy Advance Screen", .{ .flags = .{ .no_resize = true, .always_auto_resize = true } });
|
_ = zgui.begin("Game Boy Advance Screen", .{ .flags = .{ .no_resize = true, .always_auto_resize = true } });
|
||||||
defer zgui.end();
|
defer zgui.end();
|
||||||
|
|
||||||
const img_args = .{
|
zgui.image(@intToPtr(*anyopaque, tex_id), .{ .w = w, .h = h, .uv0 = .{ 0, 1 }, .uv1 = .{ 1, 0 } });
|
||||||
.w = @intToFloat(f32, gba_width * win_scale),
|
|
||||||
.h = @intToFloat(f32, gba_height * win_scale),
|
|
||||||
.uv0 = .{ 0.0, 1.0 },
|
|
||||||
.uv1 = .{ 1.0, 0.0 },
|
|
||||||
};
|
|
||||||
|
|
||||||
zgui.image(@intToPtr(*anyopaque, tex_id), img_args);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
_ = zgui.begin("Emulator Performance", .{});
|
_ = zgui.begin("Information", .{});
|
||||||
|
defer zgui.end();
|
||||||
|
|
||||||
|
{
|
||||||
|
var i: usize = 0;
|
||||||
|
while (i < 8) : (i += 1) {
|
||||||
|
zgui.text("R{}: 0x{X:0>8}", .{ i, cpu.r[i] });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
|
||||||
|
const prefix = if (8 + i < 10) " " else "";
|
||||||
|
zgui.text("{s}R{}: 0x{X:0>8}", .{ prefix, 8 + i, cpu.r[8 + i] });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
zgui.separator();
|
||||||
|
|
||||||
|
widgets.psr("CPSR", cpu.cpsr);
|
||||||
|
widgets.psr("SPSR", cpu.spsr);
|
||||||
|
|
||||||
|
zgui.separator();
|
||||||
|
|
||||||
|
widgets.interrupts(" IE", cpu.bus.io.ie); // space is for padding
|
||||||
|
widgets.interrupts("IRQ", cpu.bus.io.irq);
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
_ = zgui.begin("Performance", .{});
|
||||||
|
defer zgui.end();
|
||||||
|
|
||||||
const tmp = blk: {
|
const tmp = blk: {
|
||||||
var buf: [0x400]u32 = undefined;
|
var buf: [0x400]u32 = undefined;
|
||||||
|
@ -307,6 +330,8 @@ pub const Gui = struct {
|
||||||
const x_args = .{ .flags = .{ .no_grid_lines = true, .no_tick_labels = true, .no_tick_marks = true } };
|
const x_args = .{ .flags = .{ .no_grid_lines = true, .no_tick_labels = true, .no_tick_marks = true } };
|
||||||
|
|
||||||
if (zgui.plot.beginPlot("Emulation FPS", .{ .w = 0.0, .flags = .{ .no_title = true, .no_frame = true } })) {
|
if (zgui.plot.beginPlot("Emulation FPS", .{ .w = 0.0, .flags = .{ .no_title = true, .no_frame = true } })) {
|
||||||
|
defer zgui.plot.endPlot();
|
||||||
|
|
||||||
zgui.plot.setupLegend(.{ .north = true, .east = true }, .{});
|
zgui.plot.setupLegend(.{ .north = true, .east = true }, .{});
|
||||||
zgui.plot.setupAxis(.x1, x_args);
|
zgui.plot.setupAxis(.x1, x_args);
|
||||||
zgui.plot.setupAxis(.y1, y_args);
|
zgui.plot.setupAxis(.y1, y_args);
|
||||||
|
@ -315,7 +340,6 @@ pub const Gui = struct {
|
||||||
zgui.plot.setupFinish();
|
zgui.plot.setupFinish();
|
||||||
|
|
||||||
zgui.plot.plotLineValues("FPS", u32, .{ .v = values[0..len] });
|
zgui.plot.plotLineValues("FPS", u32, .{ .v = values[0..len] });
|
||||||
zgui.plot.endPlot();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const stats: struct { u32, u32, u32 } = blk: {
|
const stats: struct { u32, u32, u32 } = blk: {
|
||||||
|
@ -336,8 +360,6 @@ pub const Gui = struct {
|
||||||
zgui.text("Average: {:0>3} fps", .{stats[0]});
|
zgui.text("Average: {:0>3} fps", .{stats[0]});
|
||||||
zgui.text(" Median: {:0>3} fps", .{stats[1]});
|
zgui.text(" Median: {:0>3} fps", .{stats[1]});
|
||||||
zgui.text(" 1% Low: {:0>3} fps", .{stats[2]});
|
zgui.text(" 1% Low: {:0>3} fps", .{stats[2]});
|
||||||
|
|
||||||
defer zgui.end();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -527,3 +549,87 @@ fn panic() noreturn {
|
||||||
const str = @as(?[*:0]const u8, SDL.SDL_GetError()) orelse "unknown error";
|
const str = @as(?[*:0]const u8, SDL.SDL_GetError()) orelse "unknown error";
|
||||||
@panic(std.mem.sliceTo(str, 0));
|
@panic(std.mem.sliceTo(str, 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const widgets = struct {
|
||||||
|
fn interrupts(comptime label: []const u8, int: anytype) void {
|
||||||
|
const h = 15.0;
|
||||||
|
const w = 9.0 * 2 + 3.5;
|
||||||
|
const ww = 9.0 * 3;
|
||||||
|
|
||||||
|
{
|
||||||
|
zgui.text(label ++ ":", .{});
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("VBL", .{ .w = w, .h = h, .selected = int.vblank.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("HBL", .{ .w = w, .h = h, .selected = int.hblank.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("VCT", .{ .w = w, .h = h, .selected = int.coincidence.read() });
|
||||||
|
|
||||||
|
{
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("TIM0", .{ .w = ww, .h = h, .selected = int.tim0.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("TIM1", .{ .w = ww, .h = h, .selected = int.tim1.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("TIM2", .{ .w = ww, .h = h, .selected = int.tim2.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("TIM3", .{ .w = ww, .h = h, .selected = int.tim3.read() });
|
||||||
|
}
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("SRL", .{ .w = w, .h = h, .selected = int.serial.read() });
|
||||||
|
|
||||||
|
{
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("DMA0", .{ .w = ww, .h = h, .selected = int.dma0.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("DMA1", .{ .w = ww, .h = h, .selected = int.dma1.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("DMA2", .{ .w = ww, .h = h, .selected = int.dma2.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("DMA3", .{ .w = ww, .h = h, .selected = int.dma3.read() });
|
||||||
|
}
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("KPD", .{ .w = w, .h = h, .selected = int.keypad.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("GPK", .{ .w = w, .h = h, .selected = int.game_pak.read() });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn psr(comptime label: []const u8, register: anytype) void {
|
||||||
|
const Mode = @import("core/cpu.zig").Mode;
|
||||||
|
|
||||||
|
const maybe_mode = std.meta.intToEnum(Mode, register.mode.read()) catch null;
|
||||||
|
const mode = if (maybe_mode) |mode| mode.toString() else "???";
|
||||||
|
const w = 9.0;
|
||||||
|
const h = 15.0;
|
||||||
|
|
||||||
|
zgui.text(label ++ ": 0x{X:0>8}", .{register.raw});
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("N", .{ .w = w, .h = h, .selected = register.n.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("Z", .{ .w = w, .h = h, .selected = register.z.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("C", .{ .w = w, .h = h, .selected = register.c.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
_ = zgui.selectable("V", .{ .w = w, .h = h, .selected = register.v.read() });
|
||||||
|
|
||||||
|
zgui.sameLine(.{});
|
||||||
|
zgui.text("{s}", .{mode});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
Loading…
Reference in New Issue