Support banks in memory editor

smokku · smokku · commit 5f6005850a7d · 2025-05-16T15:12:34.000+02:00
diff --git a/src/ui/ui_memedit.h b/src/ui/ui_memedit.h
@@ -33,6 +33,7 @@
     ## zlib/libpng license
 
     Copyright (c) 2018 Andre Weissflog
+    Copyright (c) 2025 Tomasz Sterna
     This software is provided 'as-is', without any express or implied warranty.
     In no event will the authors be held liable for any damages arising from the
     use of this software.
@@ -64,16 +65,18 @@ typedef void MemoryEditor;
 #define UI_MEMEDIT_MAX_LAYERS (16)
 
 /* callbacks for reading and writing bytes */
-typedef uint8_t (*ui_memedit_read_t)(int layer, uint32_t addr, void* user_data);
-typedef void (*ui_memedit_write_t)(int layer, uint32_t addr, uint8_t data, void* user_data);
+typedef uint8_t (*ui_memedit_read_t)(int layer, int bank, uint16_t addr, void* user_data);
+typedef void (*ui_memedit_write_t)(int layer, int bank, uint16_t addr, uint8_t data, void* user_data);
 
 /* setup parameters for ui_memedit_init()
 
     NOTE: all strings must be static!
 */
 typedef struct {
     const char* title;  /* window title */
-    const char* layers[UI_MEMEDIT_MAX_LAYERS];   /* memory system layer names */
+    int banks;
+    const char* layers[UI_MEMEDIT_MAX_LAYERS];  /* memory system layer names */
+    int layer_banks[UI_MEMEDIT_MAX_LAYERS];     /* banks in layer */
     ui_memedit_read_t read_cb;
     ui_memedit_write_t write_cb;
     size_t max_addr;
@@ -238,6 +241,9 @@ struct MemoryEditor
     int NumLayers;
     int CurLayer;
     const char* Layers[UI_MEMEDIT_MAX_LAYERS];
+    int NumBanks;
+    int CurBank;
+    int LayerBanks[UI_MEMEDIT_MAX_LAYERS];
     bool OptShowAddrInput;      // = true
     /*--- END ui_memedit.h changes ---*/
 
@@ -316,6 +322,8 @@ struct MemoryEditor
 
         /*--- BEGIN ui_memedit.h changes ---*/
         OptShowAddrInput = true;
+        NumBanks = 0;
+        CurBank = 0;
         NumLayers = 0;
         CurLayer = 0;
         for (int i = 0; i < UI_MEMEDIT_MAX_LAYERS; i++) {
@@ -708,7 +716,9 @@ struct MemoryEditor
     {
         IM_UNUSED(mem_data);
         ImGuiStyle& style = ImGui::GetStyle();
-        const char* format_range = OptUpperCaseHex ? "Range %0*" _PRISizeT "X..%0*" _PRISizeT "X" : "Range %0*" _PRISizeT "x..%0*" _PRISizeT "x";
+        /*--- BEGIN ui_memedit.h changes ---*/
+        const char* format_range = OptUpperCaseHex ? "Range %02X:%0*" _PRISizeT "X..%0*" _PRISizeT "X" : "Range %02X:%0*" _PRISizeT "x..%0*" _PRISizeT "x";
+        /*--- END ui_memedit.h changes ---*/
 
         // Options menu
         if (ImGui::Button("Options"))
@@ -718,7 +728,17 @@ struct MemoryEditor
         if (OptShowAddrInput) {
         /*--- END ui_memedit.h changes ---*/
         ImGui::SameLine();
-        ImGui::Text(format_range, s.AddrDigitsCount, base_display_addr, s.AddrDigitsCount, base_display_addr + mem_size - 1);
+        ImGui::Text(format_range, CurBank, s.AddrDigitsCount, base_display_addr, s.AddrDigitsCount, base_display_addr + mem_size - 1);
+        /*--- BEGIN ui_memedit.h changes */
+        if (NumBanks > 1) {
+            ImGui::SameLine();
+            ImGui::SetNextItemWidth(2 * s.GlyphWidth + 2 * ImGui::GetFrameHeight() + style.FramePadding.x * 4.0f);
+            static const int step = 0x1, step_fast = 0x10;
+            ImGui::InputScalar(":", ImGuiDataType_U8, &CurBank, &step, &step_fast, "%02X", ImGuiInputTextFlags_CharsHexadecimal|ImGuiInputTextFlags_CharsUppercase);
+            if (CurBank < 0) CurBank = 0;
+            if (CurBank > NumBanks-1) CurBank = NumBanks-1;
+        }
+        /*--- END ui_memedit.h changes */
         ImGui::SameLine();
         ImGui::SetNextItemWidth((s.AddrDigitsCount + 1) * s.GlyphWidth + style.FramePadding.x * 2.0f);
         if (ImGui::InputText("##addr", AddrInputBuf, IM_ARRAYSIZE(AddrInputBuf), ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_EnterReturnsTrue))
@@ -739,6 +759,7 @@ struct MemoryEditor
             ImGui::SameLine();
             ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
             ImGui::Combo("##layer", &CurLayer, Layers, NumLayers);
+            NumBanks = LayerBanks[CurLayer];
             ImGui::PopItemWidth();
         }
         /*--- END ui_memedit.h changes */
@@ -1011,7 +1032,7 @@ static uint8_t _ui_memedit_readfn(const uint8_t* ptr, size_t off, void* user_dat
     const ui_memedit_t* win = (ui_memedit_t*) user_data;
     CHIPS_ASSERT(win && win->ed);
     if (win->read_cb) {
-        return win->read_cb(win->ed->CurLayer, (uint16_t)off, win->user_data);
+        return win->read_cb(win->ed->CurLayer, win->ed->CurBank, (uint16_t)off, win->user_data);
     }
     else {
         return 0;
@@ -1022,7 +1043,7 @@ static void _ui_memedit_writefn(uint8_t* ptr, size_t off, uint8_t val, void* use
     const ui_memedit_t* win = (ui_memedit_t*) user_data;
     CHIPS_ASSERT(win && win->ed);
     if (win->write_cb) {
-        win->write_cb(win->ed->CurLayer, (uint16_t)off, val, win->user_data);
+        win->write_cb(win->ed->CurLayer, win->ed->CurBank, (uint16_t)off, val, win->user_data);
     }
 }
 
@@ -1051,10 +1072,12 @@ void ui_memedit_init(ui_memedit_t* win, const ui_memedit_desc_t* desc) {
     win->ed->WriteFn = _ui_memedit_writefn;
     win->ed->UserData = win;
     win->ed->OptAddrDigitsCount = 4;
+    win->ed->NumBanks = desc->banks;
     for (int i = 0; i < UI_MEMEDIT_MAX_LAYERS; i++) {
         if (desc->layers[i]) {
             win->ed->NumLayers++;
             win->ed->Layers[i] = desc->layers[i];
+            win->ed->LayerBanks[i] = desc->layer_banks[i];
         }
         else {
             break;
diff --git a/src/ui/ui_x65.cc b/src/ui/ui_x65.cc
@@ -213,45 +213,47 @@ static void _ui_x65_draw_about(ui_x65_t* ui) {
 }
 
 /* keep disassembler layer at the start */
-#define _UI_X65_MEMLAYER_CPU   (0) /* CPU visible mapping */
-#define _UI_X65_MEMLAYER_RAM00 (1) /* RAM blocks */
-#define _UI_X65_MEMLAYER_RAM01 (2) /* RAM blocks */
-#define _UI_X65_MEMLAYER_RAMFF (3) /* RAM blocks */
-#define _UI_X65_MEMLAYER_VRAM0 (4) /* CGIA VRAM bank 0 */
-#define _UI_X65_MEMLAYER_VRAM1 (5) /* CGIA VRAM bank 1 */
-#define _UI_X65_CODELAYER_NUM  (3) /* number of valid layers for disassembler */
-#define _UI_X65_MEMLAYER_NUM   (6)
+#define _UI_X65_MEMLAYER_CPU  (0) /* CPU visible mapping */
+#define _UI_X65_MEMLAYER_RAM  (1) /* RAM banks */
+#define _UI_X65_MEMLAYER_VRAM (2) /* CGIA VRAM banks */
+#define _UI_X65_MEMLAYER_NUM  (3)
+#define _UI_X65_CODELAYER_NUM (3) /* number of valid layers for disassembler */
 
 static const char* _ui_x65_memlayer_names[_UI_X65_MEMLAYER_NUM] = {
-    "CPU Mapped", "RAM Bank 00", "RAM Bank 01", "RAM Bank FF", "VRAM0", "VRAM1",
+    "CPU Mapped",
+    "RAM Bank",
+    "VRAM Cache Bank",
+};
+static const int _ui_x65_memlayer_banks[_UI_X65_MEMLAYER_NUM] = {
+    256,
+    256,
+    2,
 };
 
-static uint8_t _ui_x65_mem_read(int layer, uint32_t addr, void* user_data) {
+static uint8_t _ui_x65_mem_read(int layer, int bank, uint16_t addr, void* user_data) {
     CHIPS_ASSERT(user_data);
     ui_x65_t* ui = (ui_x65_t*)user_data;
     x65_t* x65 = ui->x65;
     switch (layer) {
-        case _UI_X65_MEMLAYER_CPU: return mem_rd(x65, (addr >> 16) & 0xFF, addr & 0xFFFF);
-        case _UI_X65_MEMLAYER_RAM00: return x65->ram[(0x00 << 16) + addr];
-        case _UI_X65_MEMLAYER_RAM01: return x65->ram[(0x01 << 16) + addr];
-        case _UI_X65_MEMLAYER_RAMFF: return x65->ram[(0xFF << 16) + addr];
-        case _UI_X65_MEMLAYER_VRAM0: return x65->cgia.vram[0][addr];
-        case _UI_X65_MEMLAYER_VRAM1: return x65->cgia.vram[1][addr];
+        case _UI_X65_MEMLAYER_CPU: return mem_rd(x65, (uint8_t)bank, addr);
+        case _UI_X65_MEMLAYER_RAM: return x65->ram[((bank & 0xFF) << 16) | addr];
+        case _UI_X65_MEMLAYER_VRAM: return x65->cgia.vram[bank & 0x1][addr];
         default: return 0xFF;
     }
 }
 
-static void _ui_x65_mem_write(int layer, uint32_t addr, uint8_t data, void* user_data) {
+static uint8_t _ui_x65_mem_read32(int layer, uint32_t addr, void* user_data) {
+    return _ui_x65_mem_read(layer, (uint8_t)(addr >> 16), (uint16_t)addr, user_data);
+}
+
+static void _ui_x65_mem_write(int layer, int bank, uint16_t addr, uint8_t data, void* user_data) {
     CHIPS_ASSERT(user_data);
     ui_x65_t* ui = (ui_x65_t*)user_data;
     x65_t* x65 = ui->x65;
     switch (layer) {
-        case _UI_X65_MEMLAYER_CPU: mem_wr(x65, (addr >> 16) & 0xFF, addr & 0xFFFF, data); break;
-        case _UI_X65_MEMLAYER_RAM00: x65->ram[(0x00 << 16) + addr] = data; break;
-        case _UI_X65_MEMLAYER_RAM01: x65->ram[(0x01 << 16) + addr] = data; break;
-        case _UI_X65_MEMLAYER_RAMFF: x65->ram[(0xFF << 16) + addr] = data; break;
-        case _UI_X65_MEMLAYER_VRAM0: x65->cgia.vram[0][addr] = data; break;
-        case _UI_X65_MEMLAYER_VRAM1: x65->cgia.vram[1][addr] = data; break;
+        case _UI_X65_MEMLAYER_CPU: mem_wr(x65, (uint8_t)bank, addr, data); break;
+        case _UI_X65_MEMLAYER_RAM: x65->ram[((bank & 0xFF) << 16) | addr] = data; break;
+        case _UI_X65_MEMLAYER_VRAM: x65->cgia.vram[bank & 0x1][addr] = data; break;
     }
 }
 
@@ -452,7 +454,7 @@ void ui_x65_init(ui_x65_t* ui, const ui_x65_desc_t* ui_desc) {
         desc.freq_hz = X65_FREQUENCY;
         desc.scanline_ticks = ui->x65->cgia.h_period / CGIA_FIXEDPOINT_SCALE;
         desc.frame_ticks = MODE_V_TOTAL_LINES * ui->x65->cgia.h_period / CGIA_FIXEDPOINT_SCALE;
-        desc.read_cb = _ui_x65_mem_read;
+        desc.read_cb = _ui_x65_mem_read32;
         desc.break_cb = _ui_x65_eval_bp;
         desc.texture_cbs = ui_desc->dbg_texture;
         desc.debug_cbs = ui_desc->dbg_debug;
@@ -561,6 +563,7 @@ void ui_x65_init(ui_x65_t* ui, const ui_x65_desc_t* ui_desc) {
         ui_memedit_desc_t desc = { 0 };
         for (int i = 0; i < _UI_X65_MEMLAYER_NUM; i++) {
             desc.layers[i] = _ui_x65_memlayer_names[i];
+            desc.layer_banks[i] = _ui_x65_memlayer_banks[i];
         }
         desc.read_cb = _ui_x65_mem_read;
         desc.write_cb = _ui_x65_mem_write;
@@ -588,7 +591,7 @@ void ui_x65_init(ui_x65_t* ui, const ui_x65_desc_t* ui_desc) {
         desc.cpu_type = UI_DASM_CPUTYPE_W65C816S;
         desc.cpu = &ui->cpu;
         desc.start_addr = mem_rd16(ui->x65, 0, 0xFFFC);
-        desc.read_cb = _ui_x65_mem_read;
+        desc.read_cb = _ui_x65_mem_read32;
         desc.user_data = ui;
         desc.labels = ui_desc->labels;
         static const char* titles[4] = { "Disassembler #1", "Disassembler #2", "Disassembler #2", "Dissassembler #3" };
