Skip to content

Merge master work into hw-renderer #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 30, 2025
Merged

Merge master work into hw-renderer #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
083ea89
frontend: Add VU disassembler
allkern Jul 30, 2025
71c61ad
frontend: Update menubar icons
allkern Jul 30, 2025
d3c4130
bus: Add 16-bit EE timer accesses
allkern Jul 30, 2025
ee8da3f
iris: Fix frame pacing
allkern Jul 30, 2025
a90fd4d
dmac: Lots of changes
allkern Jul 30, 2025
2112de5
ee: Implement FPU flags
allkern Jul 30, 2025
60af904
vu: Fix MIN/MAX
allkern Jul 30, 2025
875493f
spu2: Set correct SPDIF IRQ bits on interrupt
allkern Jul 30, 2025
0bb593c
renderer: Fix reversed UV rendering
allkern Jul 30, 2025
7e7ffde
vif: Implement DIRECT(HL) immediate 0 case
allkern Jul 30, 2025
7ef2045
gif: Implement NREGS=0 case
allkern Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,13 @@ check_ipo_supported(RESULT LTO_SUPPORTED OUTPUT LTO_ERROR)
# And this part tells CMake where to find and install the file itself
add_executable(iris MACOSX_BUNDLE ${OSX_ICON} ${WIN_ICON})

if (LTO_SUPPORTED)
message(STATUS "IPO/LTO enabled")
set_property(TARGET iris PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
else()
message(STATUS "IPO/LTO not supported: ${LTO_ERROR}")
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
if (LTO_SUPPORTED)
message(STATUS "IPO/LTO enabled")
set_property(TARGET iris PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE)
else()
message(STATUS "IPO/LTO not supported: ${LTO_ERROR}")
endif()
endif()

set_property(TARGET iris PROPERTY CXX_STANDARD 20)
Expand Down Expand Up @@ -97,6 +99,7 @@ target_sources(iris PRIVATE
frontend/ui/spu2.cpp
frontend/ui/state.cpp
frontend/ui/statusbar.cpp
frontend/ui/vu_disassembly.cpp
src/ps2.c
src/ps2_elf.c
src/ps2_iso9660.c
Expand Down
1 change: 1 addition & 0 deletions frontend/iris.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ void update_window(iris::instance* iris) {
if (iris->show_gs_debugger) show_gs_debugger(iris);
if (iris->show_spu2_debugger) show_spu2_debugger(iris);
if (iris->show_memory_viewer) show_memory_viewer(iris);
if (iris->show_vu_disassembler) show_vu_disassembler(iris);
if (iris->show_status_bar && !iris->fullscreen) show_status_bar(iris);
if (iris->show_breakpoints) show_breakpoints(iris);
if (iris->show_about_window) show_about_window(iris);
Expand Down
2 changes: 2 additions & 0 deletions frontend/iris.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ struct instance {
bool show_settings = false;
bool show_memory_card_tool = false;
bool show_imgui_demo = false;
bool show_vu_disassembler = false;

// Special windows
bool show_bios_setting_window = false;
Expand Down Expand Up @@ -215,6 +216,7 @@ void show_iop_dma(iris::instance* iris);
void show_gs_debugger(iris::instance* iris);
void show_spu2_debugger(iris::instance* iris);
void show_memory_viewer(iris::instance* iris);
void show_vu_disassembler(iris::instance* iris);
void show_status_bar(iris::instance* iris);
void show_breakpoints(iris::instance* iris);
void show_about_window(iris::instance* iris);
Expand Down
2 changes: 2 additions & 0 deletions frontend/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ int parse_toml_settings(iris::instance* iris) {
iris->show_gs_debugger = debugger["show_gs_debugger"].value_or(false);
iris->show_spu2_debugger = debugger["show_spu2_debugger"].value_or(false);
iris->show_memory_viewer = debugger["show_memory_viewer"].value_or(false);
iris->show_vu_disassembler = debugger["show_vu_disassembler"].value_or(false);
iris->show_status_bar = debugger["show_status_bar"].value_or(true);
iris->show_breakpoints = debugger["show_breakpoints"].value_or(false);
iris->show_imgui_demo = debugger["show_imgui_demo"].value_or(false);
Expand Down Expand Up @@ -265,6 +266,7 @@ void close_settings(iris::instance* iris) {
{ "show_gs_debugger", iris->show_gs_debugger },
{ "show_spu2_debugger", iris->show_spu2_debugger },
{ "show_memory_viewer", iris->show_memory_viewer },
{ "show_vu_disassembler", iris->show_vu_disassembler },
{ "show_status_bar", iris->show_status_bar },
{ "show_breakpoints", iris->show_breakpoints },
{ "show_imgui_demo", iris->show_imgui_demo }
Expand Down
32 changes: 17 additions & 15 deletions frontend/ui/menubar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,38 +302,39 @@ void show_main_menubar(iris::instance* iris) {
ImGui::EndMenu();
}
if (BeginMenu("Tools")) {
if (MenuItem(ICON_MS_LINE_START_CIRCLE " ImGui Demo", NULL, &iris->show_imgui_demo));
if (MenuItem(ICON_MS_BUILD " ImGui Demo", NULL, &iris->show_imgui_demo));

ImGui::EndMenu();
}
if (BeginMenu("Debug")) {
SeparatorText("EE");
// if (BeginMenu(ICON_MS_BUG_REPORT " EE")) {
if (MenuItem(ICON_MS_LINE_START_CIRCLE " Control##ee", NULL, &iris->show_ee_control));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " State##ee", NULL, &iris->show_ee_state));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " Logs##ee", NULL, &iris->show_ee_logs));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " Interrupts##ee", NULL, &iris->show_ee_interrupts));
if (MenuItem(ICON_MS_SETTINGS " Control##ee", NULL, &iris->show_ee_control));
if (MenuItem(ICON_MS_EDIT_NOTE " State##ee", NULL, &iris->show_ee_state));
if (MenuItem(ICON_MS_TERMINAL " Logs##ee", NULL, &iris->show_ee_logs));
if (MenuItem(ICON_MS_BOLT " Interrupts##ee", NULL, &iris->show_ee_interrupts));

// ImGui::EndMenu();
// }

SeparatorText("IOP");
// if (BeginMenu(ICON_MS_BUG_REPORT " IOP")) {
if (MenuItem(ICON_MS_LINE_START_CIRCLE " Control##iop", NULL, &iris->show_iop_control));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " State##iop", NULL, &iris->show_iop_state));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " Logs##iop", NULL, &iris->show_iop_logs));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " Interrupts##iop", NULL, &iris->show_iop_interrupts));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " Modules##iop", NULL, &iris->show_iop_modules));
if (MenuItem(ICON_MS_SETTINGS " Control##iop", NULL, &iris->show_iop_control));
if (MenuItem(ICON_MS_EDIT_NOTE " State##iop", NULL, &iris->show_iop_state));
if (MenuItem(ICON_MS_TERMINAL " Logs##iop", NULL, &iris->show_iop_logs));
if (MenuItem(ICON_MS_BOLT " Interrupts##iop", NULL, &iris->show_iop_interrupts));
if (MenuItem(ICON_MS_EXTENSION " Modules##iop", NULL, &iris->show_iop_modules));

// ImGui::EndMenu();
// }

Separator();

if (MenuItem(ICON_MS_LINE_START_CIRCLE " Breakpoints", NULL, &iris->show_breakpoints));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " GS debugger", NULL, &iris->show_gs_debugger));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " SPU2 debugger", NULL, &iris->show_spu2_debugger));
if (MenuItem(ICON_MS_LINE_START_CIRCLE " Memory viewer", NULL, &iris->show_memory_viewer));
if (MenuItem(ICON_MS_BUG_REPORT " Breakpoints", NULL, &iris->show_breakpoints));
if (MenuItem(ICON_MS_BRUSH " GS debugger", NULL, &iris->show_gs_debugger));
if (MenuItem(ICON_MS_MUSIC_NOTE " SPU2 debugger", NULL, &iris->show_spu2_debugger));
if (MenuItem(ICON_MS_MEMORY " Memory viewer", NULL, &iris->show_memory_viewer));
if (MenuItem(ICON_MS_VIEW_IN_AR " VU disassembler", NULL, &iris->show_vu_disassembler));

Separator();

Expand All @@ -352,13 +353,14 @@ void show_main_menubar(iris::instance* iris) {
iris->show_gs_debugger = false;
iris->show_spu2_debugger = false;
iris->show_memory_viewer = false;
iris->show_vu_disassembler = false;
iris->show_breakpoints = false;
}

ImGui::EndMenu();
}
if (BeginMenu("Help")) {
if (MenuItem(ICON_MS_LINE_START_CIRCLE " About")) {
if (MenuItem(ICON_MS_INFO " About")) {
iris->show_about_window = true;
}

Expand Down
Loading