[debugger] Improve symbols and call stack windows

Author: drhelius

platforms/shared/desktop/gui_debug_constants.h

@@ -82,49 +82,49 @@ struct stDebugLabel
 static const int k_debug_label_count = 43;
 static const stDebugLabel k_debug_labels[k_debug_label_count] = 
 {
-    { 0x0000, "VDC_ADDRESS_" },
-    { 0x0002, "VDC_DATA_LO_" },
-    { 0x0003, "VDC_DATA_HI_" },
-    { 0x0400, "VCE_CONTROL_" },
-    { 0x0402, "VCE_ADDR_LO_" },
-    { 0x0403, "VCE_ADDR_HI_" },
-    { 0x0404, "VCE_DATA_LO_" },
-    { 0x0405, "VCE_DATA_HI_" },
-    { 0x0800, "PSG_CH_SELECT_" },
-    { 0x0801, "PSG_MAIN_VOL_" },
-    { 0x0802, "PSG_FREQ_LO_" },
-    { 0x0803, "PSG_FREQ_HI_" },
-    { 0x0804, "PSG_CH_CTRL_" },
-    { 0x0805, "PSG_CH_VOL_" },
-    { 0x0806, "PSG_CH_DATA_" },
-    { 0x0807, "PSG_NOISE_" },
-    { 0x0808, "PSG_LFO_FREQ_" },
-    { 0x0809, "PSG_LFO_CTRL_" },
-    { 0x0C00, "TIMER_COUNTER_" },
-    { 0x0C01, "TIMER_CONTROL_" },
-    { 0x1000, "JOYPAD_" },
-    { 0x1402, "IRQ_DISABLE_" },
-    { 0x1403, "IRQ_STATUS_" },
-    { 0x1800, "CD_STATUS_" },
-    { 0x1801, "CD_DATA_BUS_" },
-    { 0x1802, "CD_ENABLED_IRQS_" },
-    { 0x1803, "CD_ACTIVE_IRQS_" },
-    { 0x1804, "CD_RESET_" },
-    { 0x1805, "CD_PCM_LSB_" },
-    { 0x1806, "CD_PCM_MSB_" },
-    { 0x1807, "CD_BRAM_UNLOCK_" },
-    { 0x1808, "CD_DATA_ACK_ADPCM_LSB_" },
-    { 0x1809, "CD_ADPCM_MSB_" },
-    { 0x180A, "CD_ADPCM_DATA_" },
-    { 0x180B, "CD_ADPCM_DMA_" },
-    { 0x180C, "CD_ADPCM_STATUS_" },
-    { 0x180D, "CD_ADPCM_CONTROL_" },
-    { 0x180E, "CD_ADPCM_RATE_" },
-    { 0x180F, "CD_AUDIO_FADER_" },
-    { 0x18C0, "CD_SIGNATURE0_" },
-    { 0x18C1, "CD_SIGNATURE1_" },
-    { 0x18C2, "CD_SIGNATURE2_" },
-    { 0x18C3, "CD_SIGNATURE3_" }
+    { 0x0000, "VDC_ADDRESS" },
+    { 0x0002, "VDC_DATA_LO" },
+    { 0x0003, "VDC_DATA_HI" },
+    { 0x0400, "VCE_CONTROL" },
+    { 0x0402, "VCE_ADDR_LO" },
+    { 0x0403, "VCE_ADDR_HI" },
+    { 0x0404, "VCE_DATA_LO" },
+    { 0x0405, "VCE_DATA_HI" },
+    { 0x0800, "PSG_CH_SELECT" },
+    { 0x0801, "PSG_MAIN_VOL" },
+    { 0x0802, "PSG_FREQ_LO" },
+    { 0x0803, "PSG_FREQ_HI" },
+    { 0x0804, "PSG_CH_CTRL" },
+    { 0x0805, "PSG_CH_VOL" },
+    { 0x0806, "PSG_CH_DATA" },
+    { 0x0807, "PSG_NOISE" },
+    { 0x0808, "PSG_LFO_FREQ" },
+    { 0x0809, "PSG_LFO_CTRL" },
+    { 0x0C00, "TIMER_COUNTER" },
+    { 0x0C01, "TIMER_CONTROL" },
+    { 0x1000, "JOYPAD" },
+    { 0x1402, "IRQ_DISABLE" },
+    { 0x1403, "IRQ_STATUS" },
+    { 0x1800, "CD_STATUS" },
+    { 0x1801, "CD_DATA_BUS" },
+    { 0x1802, "CD_ENABLED_IRQS" },
+    { 0x1803, "CD_ACTIVE_IRQS" },
+    { 0x1804, "CD_RESET" },
+    { 0x1805, "CD_PCM_LSB" },
+    { 0x1806, "CD_PCM_MSB" },
+    { 0x1807, "CD_BRAM_UNLOCK" },
+    { 0x1808, "CD_DATA_ACK_ADPCM_LSB" },
+    { 0x1809, "CD_ADPCM_MSB" },
+    { 0x180A, "CD_ADPCM_DATA" },
+    { 0x180B, "CD_ADPCM_DMA" },
+    { 0x180C, "CD_ADPCM_STATUS" },
+    { 0x180D, "CD_ADPCM_CONTROL" },
+    { 0x180E, "CD_ADPCM_RATE" },
+    { 0x180F, "CD_AUDIO_FADER" },
+    { 0x18C0, "CD_SIGNATURE0" },
+    { 0x18C1, "CD_SIGNATURE1" },
+    { 0x18C2, "CD_SIGNATURE2" },
+    { 0x18C3, "CD_SIGNATURE3" }
 };
 
 static const int k_cdrom_bios_symbol_count = 76;

platforms/shared/desktop/gui_debug_disassembler.cpp

@@ -1207,7 +1207,7 @@ bool gui_debug_resolve_label(GG_Disassembler_Record* record, std::string& instr,
             {
                 char label_address[6];
                 snprintf(label_address, 6, "$%04X", lookup_address);
-                std::string replacement = std::string(color) + k_debug_labels[i].label + label_address + original_color;
+                std::string replacement = std::string(color) + k_debug_labels[i].label + "_" + label_address + original_color;
                 if (replace_address_in_string(instr, lookup_address, is_zp, replacement.c_str()))
                 {
                     if (out_name) *out_name = k_debug_labels[i].label;
@@ -1797,16 +1797,16 @@ void gui_debug_window_call_stack(void)
             }
             ImGui::PushFont(gui_default_font);
 
+            ImGui::SameLine(0, 0);
+            ImGui::TextColored(cyan, "%04X", entry.dest);
             ImGui::SameLine();
-            ImGui::TextColored(cyan, "$%04X", entry.dest);
-            ImGui::SameLine();
-            ImGui::TextColored(green, "%s", symbol_text);
+            ImGui::TextColored(green, " %s", symbol_text);
 
             ImGui::TableNextColumn();
-            ImGui::TextColored(cyan, "$%04X", entry.src);
+            ImGui::TextColored(cyan, "%04X", entry.src);
 
             ImGui::TableNextColumn();
-            ImGui::TextColored(cyan, "$%04X", entry.back);
+            ImGui::TextColored(cyan, "%04X", entry.back);
 
             row_index++;
         }
@@ -1858,8 +1858,8 @@ void gui_debug_window_symbols(void)
     if (ImGui::BeginTable("symbols_table", 4, flags))
     {
         ImGui::TableSetupScrollFreeze(0, 1);
-        ImGui::TableSetupColumn("Bank", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_DefaultSort, 36.0f);
-        ImGui::TableSetupColumn("Address", ImGuiTableColumnFlags_WidthFixed, 58.0f);
+        ImGui::TableSetupColumn("Bank", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_DefaultSort, 44.0f);
+        ImGui::TableSetupColumn("Address", ImGuiTableColumnFlags_WidthFixed, 66.0f);
         ImGui::TableSetupColumn("Symbol", ImGuiTableColumnFlags_WidthStretch, 2.0f);
         ImGui::TableSetupColumn("Type", ImGuiTableColumnFlags_WidthFixed | ImGuiTableColumnFlags_NoSort, 44.0f);
         ImGui::TableHeadersRow();
@@ -1994,11 +1994,11 @@ void gui_debug_window_symbols(void)
                 }
                 ImGui::PushFont(gui_default_font);
 
-                ImGui::SameLine();
-                ImGui::TextColored(cyan, "$%02X", b);
+                ImGui::SameLine(0, 0);
+                ImGui::TextColored(violet, " %02X", b);
 
                 ImGui::TableNextColumn();
-                ImGui::TextColored(cyan, "$%04X", symbol->address);
+                ImGui::TextColored(cyan, " %04X", symbol->address);
 
                 ImGui::TableNextColumn();
                 ImGui::TextColored(is_manual ? green : yellow, "%s", symbol->text);