Skip to content

Register wnd cleanup #32

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
emoon merged 3 commits into from
May 1, 2025
Merged

Register wnd cleanup #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec1b7b3
Reduced code-duplication in register wnd
emoon May 1, 2025
5b0a312
Fixed so clang-format ignores the cpu-flags table
emoon May 1, 2025
b1df33a
Format fix
emoon May 1, 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
2 changes: 1 addition & 1 deletion src/debugger/action_mgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Base {
bool mCompDone = false;

public:
Base(action::ActionCreator* /*cp*/, uint32_t comp_id) : mCompId(comp_id) {};
Base(action::ActionCreator* /*cp*/, uint32_t comp_id) : mCompId(comp_id){};
virtual EFlow applyMsgProc(action::msg::Base* /*msg*/) {
return EFlow::NO_RESULT;
}
Expand Down
138 changes: 61 additions & 77 deletions src/debugger/window/registers_wnd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,22 @@ static const char* s_regLookup[] = {
};
// clang-format on

struct FlagDef {
const char* name;
const char* displayName;
CpuFlg_ flagType;
};

// clang-format off
static const FlagDef s_flagDefs[] = {
{"Z", "Z:", CpuFlg_Z},
{"C", "C:", CpuFlg_C},
{"N", "N:", CpuFlg_N},
{"V", "V:", CpuFlg_V},
{"X", "X:", CpuFlg_X}
};
// clang-format on

void RegistersView::drawContent() {
Debugger* dbg = getDbg();
VM* vm = dbg->vm;
Expand All @@ -29,114 +45,82 @@ void RegistersView::drawContent() {

eastl::fixed_string<char, 128, false> stVal, stCmd, stId;

auto editCommonRegVal = [&](uint32_t reg_val, uint32_t reg_nr) {
auto displayRegName = [](const char* name) {
ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("%s", name);
ImGui::PopStyleColor();
};

auto editRegisterValue = [&](uint32_t reg_val, const char* reg_name) {
stVal.sprintf("%08X", reg_val);
stId.assign("##") += reg_nr;
stId.assign("##") += reg_name;
ImGui::SetNextItemWidth(ImGui::GetColumnWidth());
ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegValue));
if (ImGui::InputText(stId.c_str(), &stVal, ImGuiInputTextFlags_EnterReturnsTrue)) {
stCmd.sprintf("r %s %s", s_regLookup[reg_nr], stVal.c_str());
stCmd.sprintf("r %s %s", reg_name, stVal.c_str());
dbg->execConsoleCmd(stCmd.c_str());
}
ImGui::PopStyleColor();
};

auto editFlagValue = [&](const char* flag_name, uint32_t flag_val) {
stVal.sprintf("%01X", flag_val);
stId.assign("##") += flag_name;
ImGui::SetNextItemWidth(ImGui::GetColumnWidth());
if (ImGui::InputText(stId.c_str(), &stVal, ImGuiInputTextFlags_EnterReturnsTrue)) {
stCmd.sprintf("r %s %s", flag_name, stVal.c_str());
dbg->execConsoleCmd(stCmd.c_str());
}
};

int flags =
ImGuiTableFlags_RowBg | ImGuiTableFlags_Resizable | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_ScrollY;
if (ImGui::BeginTable("##registers", 4, flags, ImVec2(0, 0))) {
// Draw A and D registers side by side
for (int i = 0; i < 8; ++i) {
ImGui::TableNextRow();
ImGui::TableNextColumn();

// Ax col
ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("A%d", i);
ImGui::PopStyleColor();
// A registers
ImGui::TableNextColumn();
editCommonRegVal(cpu->getRegA(i), REG_A + 8);
displayRegName(s_regLookup[REG_A + i]);
ImGui::TableNextColumn();
editRegisterValue(cpu->getRegA(i), s_regLookup[REG_A + i]);

// Dx col
ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("D%d", i);
ImGui::PopStyleColor();
// D registers
ImGui::TableNextColumn();
editCommonRegVal(cpu->getRegD(i), REG_D + i);
// ImGui::TableNextColumn();
}

{
ImGui::TableNextRow();
ImGui::TableNextColumn();

// PC
ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("##PC");
ImGui::PopStyleColor();
ImGui::TableNextColumn();
editCommonRegVal(cpu->getPC(), REG_PC);
ImGui::TableNextColumn();

ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("IMASK");
ImGui::PopStyleColor();
ImGui::TableNextColumn();
ImGui::Text("%i", cpu->getIntMask());
displayRegName(s_regLookup[REG_D + i]);
ImGui::TableNextColumn();
editRegisterValue(cpu->getRegD(i), s_regLookup[REG_D + i]);
}

//
// PC and IMASK row
ImGui::TableNextRow();
ImGui::TableNextColumn();

auto editFlagsRegVal = [&](const char* flg_name, uint32_t reg_val) {
stVal.sprintf("%01X", reg_val);
stId.assign("##") += flg_name;
ImGui::SetNextItemWidth(ImGui::GetColumnWidth());
if (ImGui::InputText(stId.c_str(), &stVal, ImGuiInputTextFlags_EnterReturnsTrue)) {
stCmd.sprintf("r %s %s", flg_name, stVal.c_str());
dbg->execConsoleCmd(stCmd.c_str());
}
};

ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("Z:");
ImGui::PopStyleColor();
ImGui::TableNextColumn();
editFlagsRegVal("Z", cpu->getFlg(CpuFlg_Z));
ImGui::TableNextColumn();

ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("C:");
ImGui::PopStyleColor();
ImGui::TableNextColumn();
editFlagsRegVal("C", cpu->getFlg(CpuFlg_C));
ImGui::TableNextColumn();

ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("N:");
ImGui::PopStyleColor();
displayRegName("PC");
ImGui::TableNextColumn();
editFlagsRegVal("N", cpu->getFlg(CpuFlg_N));
editRegisterValue(cpu->getPC(), s_regLookup[REG_PC]);
ImGui::TableNextColumn();

ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("V:");
ImGui::PopStyleColor();
ImGui::TableNextColumn();
editFlagsRegVal("V", cpu->getFlg(CpuFlg_V));
displayRegName("IMASK");
ImGui::TableNextColumn();
ImGui::Text("%i", cpu->getIntMask());

// CPU flags
const int flagCount = sizeof(s_flagDefs) / sizeof(s_flagDefs[0]);
for (int i = 0; i < flagCount; i++) {
// Create a new row for every even index (0, 2, 4...)
if (i % 2 == 0) {
ImGui::TableNextRow();
}

ImGui::PushStyleColor(ImGuiCol_Text, uiGetColorU(UiStyle::RegistersWnd_RegName));
ImGui::Text("X:");
ImGui::PopStyleColor();
ImGui::TableNextColumn();
editFlagsRegVal("X", cpu->getFlg(CpuFlg_X));
ImGui::TableNextColumn();
ImGui::TableNextColumn();
displayRegName(s_flagDefs[i].displayName);
ImGui::TableNextColumn();
editFlagValue(s_flagDefs[i].name, cpu->getFlg(s_flagDefs[i].flagType));
}

ImGui::EndTable();
}
}

}; // namespace window
}; // namespace qd
}; // namespace qd
Loading