Skip to content

Commit

Permalink
Merge pull request #19610 from hrydgard/more-debugger
Browse files Browse the repository at this point in the history 
More ImGui debugger windows
  • Loading branch information
@hrydgard
hrydgard authored Nov 7, 2024
2 parents ace7cae + 88a2994 commit 37190be
Show file tree
Hide file tree
Showing 4 changed files with 171 additions and 4 deletions.
165 changes: 165 additions & 0 deletions UI/ImDebugger/ImDebugger.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
#include "Core/MemMap.h"
#include "Common/System/Request.h"

// Threads window
#include "Core/HLE/sceKernelThread.h"

// Callstack window
#include "Core/MIPS/MIPSStackWalk.h"

#include "UI/ImDebugger/ImDebugger.h"

void DrawRegisterView(MIPSDebugInterface *mipsDebug, bool *open) {
Expand Down Expand Up @@ -82,6 +88,150 @@ void DrawRegisterView(MIPSDebugInterface *mipsDebug, bool *open) {
ImGui::End();
}

static const char *ThreadStatusToString(u32 status) {
switch (status) {
case THREADSTATUS_RUNNING: return "Running";
case THREADSTATUS_READY: return "Ready";
case THREADSTATUS_WAIT: return "Wait";
case THREADSTATUS_SUSPEND: return "Suspend";
case THREADSTATUS_DORMANT: return "Dormant";
case THREADSTATUS_DEAD: return "Dead";
case THREADSTATUS_WAITSUSPEND: return "WaitSuspend";
default:
break;
}
return "(unk)";
}

void DrawThreadView(bool *open) {
if (!ImGui::Begin("Threads", open)) {
ImGui::End();
return;
}

std::vector<DebugThreadInfo> info = GetThreadsInfo();
if (ImGui::BeginTable("threads", 5, ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersH)) {
ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("PC", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Entry", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Priority", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("State", ImGuiTableColumnFlags_WidthStretch);

ImGui::TableHeadersRow();
ImGui::TableNextRow();

// TODO: Add context menu
for (auto &thread : info) {
ImGui::TableSetColumnIndex(0);
ImGui::Text("%s", thread.name);
ImGui::TableSetColumnIndex(1);
ImGui::Text("%08x", thread.curPC);
ImGui::TableSetColumnIndex(2);
ImGui::Text("%08x", thread.entrypoint);
ImGui::TableSetColumnIndex(3);
ImGui::Text("%d", thread.priority);
ImGui::TableSetColumnIndex(4);
ImGui::Text("%s", ThreadStatusToString(thread.status));
ImGui::TableNextRow();
// TODO: More fields?
}

ImGui::EndTable();
}
ImGui::End();
}

void DrawCallStacks(MIPSDebugInterface *debug, bool *open) {
if (!ImGui::Begin("Callstacks", open)) {
ImGui::End();
return;
}

std::vector<DebugThreadInfo> info = GetThreadsInfo();
// TODO: Add dropdown for thread choice.
u32 entry = 0;
u32 stackTop = 0;
for (auto &thread : info) {
if (thread.isCurrent) {
entry = thread.entrypoint;
stackTop = thread.initialStack;
break;
}
}

if (entry != 0 && ImGui::BeginTable("frames", 6, ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersH)) {
ImGui::TableSetupColumn("Entry", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("EntryAddr", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("CurPC", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("CurOpCode", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("CurSP", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Size", ImGuiTableColumnFlags_WidthStretch);

ImGui::TableHeadersRow();
ImGui::TableNextRow();

std::vector<MIPSStackWalk::StackFrame> frames = MIPSStackWalk::Walk(debug->GetPC(), debug->GetRegValue(0, 31), debug->GetRegValue(0, 29), entry, stackTop);

// TODO: Add context menu and clickability
for (auto &frame : frames) {
const std::string entrySym = g_symbolMap->GetLabelString(frame.entry);

ImGui::TableSetColumnIndex(0);
ImGui::Text("%s", entrySym.c_str());
ImGui::TableSetColumnIndex(1);
ImGui::Text("%08x", frame.entry);
ImGui::TableSetColumnIndex(2);
ImGui::Text("%08x", frame.pc);
ImGui::TableSetColumnIndex(3);
ImGui::Text("%s", "N/A"); // opcode, see the old debugger
ImGui::TableSetColumnIndex(4);
ImGui::Text("%08x", frame.sp);
ImGui::TableSetColumnIndex(5);
ImGui::Text("%d", frame.stackSize);
ImGui::TableNextRow();
// TODO: More fields?
}

ImGui::EndTable();
}
ImGui::End();
}

void DrawModules(MIPSDebugInterface *debug, bool *open) {
if (!ImGui::Begin("Modules", open)) {
ImGui::End();
return;
}

std::vector<LoadedModuleInfo> modules = g_symbolMap->getAllModules();

if (ImGui::BeginTable("modules", 4, ImGuiTableFlags_RowBg | ImGuiTableFlags_BordersH)) {
ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Address", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Size", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Active", ImGuiTableColumnFlags_WidthFixed);

ImGui::TableHeadersRow();
ImGui::TableNextRow();

// TODO: Add context menu and clickability
for (auto &module : modules) {
ImGui::TableSetColumnIndex(0);
ImGui::Text("%s", module.name.c_str());
ImGui::TableSetColumnIndex(1);
ImGui::Text("%08x", module.address);
ImGui::TableSetColumnIndex(2);
ImGui::Text("%08x", module.size);
ImGui::TableSetColumnIndex(3);
ImGui::Text("%s", module.active ? "yes" : "no");
ImGui::TableNextRow();
}

ImGui::EndTable();
}
ImGui::End();
}

void ImDebugger::Frame(MIPSDebugInterface *mipsDebug) {
// Snapshot the coreState to avoid inconsistency.
const CoreState coreState = ::coreState;
Expand Down Expand Up @@ -116,6 +266,9 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug) {
ImGui::Checkbox("Dear ImGUI Demo", &demoOpen_);
ImGui::Checkbox("CPU debugger", &disasmOpen_);
ImGui::Checkbox("Registers", &regsOpen_);
ImGui::Checkbox("Callstacks", &callstackOpen_);
ImGui::Checkbox("HLE Modules", &modulesOpen_);
ImGui::Checkbox("HLE Threads", &threadsOpen_);
ImGui::EndMenu();
}
ImGui::EndMainMenuBar();
Expand All @@ -132,6 +285,18 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug) {
if (regsOpen_) {
DrawRegisterView(mipsDebug, &regsOpen_);
}

if (threadsOpen_) {
DrawThreadView(&threadsOpen_);
}

if (callstackOpen_) {
DrawCallStacks(mipsDebug, &callstackOpen_);
}

if (modulesOpen_) {
DrawModules(mipsDebug, &modulesOpen_);
}
}

void ImDisasmWindow::Draw(MIPSDebugInterface *mipsDebug, bool *open, CoreState coreState) {
Expand Down
3 changes: 3 additions & 0 deletions UI/ImDebugger/ImDebugger.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,7 @@ struct ImDebugger {
bool disasmOpen_ = true;
bool demoOpen_ = false;
bool regsOpen_ = true;
bool threadsOpen_ = true;
bool callstackOpen_ = true;
bool modulesOpen_ = true;
};
4 changes: 2 additions & 2 deletions Windows/Debugger/CtrlDisAsmView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,10 +527,10 @@ void CtrlDisAsmView::onPaint(WPARAM wParam, LPARAM lParam)
addressPositions[address] = rowY1;

// draw background
COLORREF backgroundColor = whiteBackground ? 0xFFFFFF : debugger->getColor(address, false);
COLORREF backgroundColor = whiteBackground ? 0xFFFFFF : (debugger->getColor(address, false) & 0xFFFFFF);
COLORREF textColor = 0x000000;

if (isInInterval(address,line.totalSize,debugger->getPC()))
if (isInInterval(address, line.totalSize, debugger->getPC()))
{
backgroundColor = scaleColor(backgroundColor,1.05f);
}
Expand Down
3 changes: 1 addition & 2 deletions Windows/Debugger/Debugger_Lists.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,7 @@ void CtrlBreakpointList::removeBreakpoint(int itemIndex)
int index = getBreakpointIndex(itemIndex,isMemory);
if (index == -1) return;

if (isMemory)
{
if (isMemory) {
auto mc = displayedMemChecks_[index];
CBreakPoints::RemoveMemCheck(mc.start, mc.end);
} else {
Expand Down

0 comments on commit 37190be

Please sign in to comment.