Skip to content

Fixing callstack widget. #1909

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 2 commits into from
Apr 15, 2025
Merged

Fixing callstack widget. #1909

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67fd798
Fixing callstack widget.
nicolasnoble Mar 19, 2025
d222c2d
Merge branch 'main' into callstacks-imgui-fix
nicolasnoble Apr 15, 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 src/gui/widgets/callstacks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,32 @@
ImGuiTreeNodeFlags flags = ImGuiTreeNodeFlags_Bullet | ImGuiTreeNodeFlags_DefaultOpen;
if (isCurrent) flags |= ImGuiTreeNodeFlags_Selected;
if (!ImGui::TreeNodeEx(label.c_str(), flags)) continue;
int callId = 0;

Check warning on line 68 in src/gui/widgets/callstacks.cc

View check run for this annotation

Codecov / codecov/patch

src/gui/widgets/callstacks.cc#L68 

Added line #L68 was not covered by tests
for (auto& call : stack.calls) {
std::string label = fmt::format("0x{:08x}", call.ra);
ImGui::PushID(callId++);
std::string label = fmt::format("0x{:08x}##lowsp", call.ra);

Check warning on line 71 in src/gui/widgets/callstacks.cc

View check run for this annotation

Codecov / codecov/patch

src/gui/widgets/callstacks.cc#L70-L71 

Added lines #L70 - L71 were not covered by tests
if (ImGui::Button(label.c_str())) {
g_system->m_eventBus->signal(PCSX::Events::GUI::JumpToPC{call.ra});
}
ImGui::SameLine();
ImGui::TextUnformatted(" :: ");
ImGui::SameLine();
label = fmt::format("0x{:08x}", call.sp);
label = fmt::format("0x{:08x}##highsp", call.sp);

Check warning on line 78 in src/gui/widgets/callstacks.cc

View check run for this annotation

Codecov / codecov/patch

src/gui/widgets/callstacks.cc#L78 

Added line #L78 was not covered by tests
if (ImGui::Button(label.c_str())) {
g_system->m_eventBus->signal(PCSX::Events::GUI::JumpToMemory{call.sp, 4});
}
ImGui::SameLine();
ImGui::TextUnformatted(" :: ");
ImGui::SameLine();
label = fmt::format("0x{:08x}", call.fp);
label = fmt::format("0x{:08x}##frame", call.fp);

Check warning on line 85 in src/gui/widgets/callstacks.cc

View check run for this annotation

Codecov / codecov/patch

src/gui/widgets/callstacks.cc#L85 

Added line #L85 was not covered by tests
if (ImGui::Button(label.c_str())) {
g_system->m_eventBus->signal(PCSX::Events::GUI::JumpToMemory{call.fp, 1});
}
drawSymbol(call.ra);
ImGui::PopID();

Check warning on line 90 in src/gui/widgets/callstacks.cc

View check run for this annotation

Codecov / codecov/patch

src/gui/widgets/callstacks.cc#L90 

Added line #L90 was not covered by tests
}
if (stack.ra != 0) {
std::string label = fmt::format("0x{:08x}", stack.ra);
std::string label = fmt::format("0x{:08x}##ralowsp", stack.ra);

Check warning on line 93 in src/gui/widgets/callstacks.cc

View check run for this annotation

Codecov / codecov/patch

src/gui/widgets/callstacks.cc#L93 

Added line #L93 was not covered by tests
if (ImGui::Button(label.c_str())) {
g_system->m_eventBus->signal(PCSX::Events::GUI::JumpToPC{stack.ra});
}
Expand All @@ -100,7 +103,7 @@
ImGui::SameLine();
ImGui::TextUnformatted(" :: ");
ImGui::SameLine();
label = fmt::format("0x{:08x}", stack.fp);
label = fmt::format("0x{:08x}##raframe", stack.fp);

Check warning on line 106 in src/gui/widgets/callstacks.cc

View check run for this annotation

Codecov / codecov/patch

src/gui/widgets/callstacks.cc#L106 

Added line #L106 was not covered by tests
if (ImGui::Button(label.c_str())) {
g_system->m_eventBus->signal(PCSX::Events::GUI::JumpToMemory{stack.fp, 1});
}
Expand Down
Loading