Use cgia_reg_read/write functions

Author: smokku

ext/firmware

@@ -95,7 +95,7 @@ static uint64_t _cgia_tick(cgia_t* vpu, uint64_t pins) {
             }
         }
         else {
-            vpu->regs[CGIA_REG_RASTER] = 0;
+            vpu->chip[CGIA_REG_RASTER] = 0;
         }
     }
 
@@ -774,7 +774,7 @@ void cgia_mem_wr(cgia_t* vpu, uint32_t addr, uint8_t data) {
 }
 
 static void _copy_internal_regs(cgia_t* vpu) {
-    vpu->regs = (uint8_t*)&CGIA;
+    vpu->chip = (uint8_t*)&CGIA;
     for (int i = 0; i < CGIA_PLANES; ++i) {
         vpu->internal[i].memory_scan = plane_int[i].memory_scan;
         vpu->internal[i].colour_scan = plane_int[i].colour_scan;

src/chips/cgia.c

@@ -193,8 +193,8 @@ typedef struct {
 
     uint scan_line;  // currently rendered physical scan line
 
-    // CGIA registers
-    uint8_t* regs;
+    // CGIA internal registers
+    uint8_t* chip;
 
     // copy of CGIA internal registers
     struct cgia_internal {
@@ -249,6 +249,10 @@ void cgia_snapshot_onload(cgia_t* snapshot, cgia_t* sys);
 void cgia_mem_wr(cgia_t* vpu, uint32_t addr, uint8_t data);
 // copy VRAM - after fastload
 void cgia_mirror_vram(cgia_t* vpu);
+// read CGIA register value
+uint8_t cgia_reg_read(uint8_t reg_no);
+// write CGIA register
+void cgia_reg_write(uint8_t reg_no, uint8_t value);
 
 #ifdef __cplusplus
 }  // extern "C"

src/chips/cgia.h

@@ -269,7 +269,7 @@ uint8_t mem_rd(x65_t* sys, uint8_t bank, uint16_t addr) {
             return 0xFF;
         }
         else if (addr >= 0xFF00) {
-            return sys->cgia.regs[addr & 0x7F];
+            return cgia_reg_read((uint8_t)addr);
         }
     }
     return sys->ram[(bank << 16) | addr];
@@ -285,7 +285,7 @@ void mem_wr(x65_t* sys, uint8_t bank, uint16_t addr, uint8_t data) {
             return;
         }
         else if (addr >= 0xFF00) {
-            sys->cgia.regs[addr & 0x7F] = data;
+            cgia_reg_write((uint8_t)addr, data);
             return;
         }
     }

src/systems/x65.c

@@ -73,7 +73,7 @@ static void _ui_cgia_draw_rgb(const char* label, uint32_t val) {
 
 static void _ui_cgia_draw_registers(const ui_cgia_t* win) {
     if (ImGui::CollapsingHeader("Registers", ImGuiTreeNodeFlags_DefaultOpen)) {
-        const fwcgia_t* chip = (fwcgia_t*)win->cgia->regs;
+        const fwcgia_t* chip = (fwcgia_t*)win->cgia->chip;
         ui_util_b8("mode  : ", chip->mode);
         ui_util_b8("planes: ", chip->planes);
 
@@ -118,7 +118,7 @@ static void _ui_cgia_draw_raster_unit(const ui_cgia_t* win) {
         ImGui::Text("V Counter:   %4d", win->cgia->v_count);
         ImGui::Text("V Period:    %4d", MODE_V_TOTAL_LINES - 1);
         ImGui::Text("Scan Line:   %4d", win->cgia->scan_line);
-        const fwcgia_t* chip = (fwcgia_t*)win->cgia->regs;
+        const fwcgia_t* chip = (fwcgia_t*)win->cgia->chip;
         ImGui::Text("Raster Line: %4d", chip->raster);
     }
 }
@@ -192,7 +192,7 @@ static void _ui_cgia_decode_BG_flags(uint8_t flags) {
 }
 
 static void _ui_cgia_draw_bg_plane(const ui_cgia_t* win, size_t p) {
-    fwcgia_t* chip = (fwcgia_t*)win->cgia->regs;
+    fwcgia_t* chip = (fwcgia_t*)win->cgia->chip;
     ImGui::Text(
         "MS:%04x CS:%04x BS:%04x CG:%04x",
         win->cgia->internal[p].memory_scan,
@@ -250,7 +250,7 @@ static void _ui_cgia_draw_bg_plane(const ui_cgia_t* win, size_t p) {
 }
 
 static void _ui_cgia_draw_sprite_plane(const ui_cgia_t* win, size_t p) {
-    fwcgia_t* chip = (fwcgia_t*)win->cgia->regs;
+    fwcgia_t* chip = (fwcgia_t*)win->cgia->chip;
     if (win->cgia->internal[p].sprites_need_update) {
         ImGui::SameLine();
         ImGui::Text(" Need update");
@@ -310,7 +310,7 @@ static void _ui_cgia_draw_sprite_plane(const ui_cgia_t* win, size_t p) {
 }
 
 static void _ui_cgia_draw_planes(const ui_cgia_t* win) {
-    fwcgia_t* chip = (fwcgia_t*)win->cgia->regs;
+    fwcgia_t* chip = (fwcgia_t*)win->cgia->chip;
     for (int i = 0; i < CGIA_PLANES; i++) {
         ImGui::PushID(i);
         bool plane_active = chip->planes & (1u << i);
@@ -351,8 +351,8 @@ static void _ui_cgia_draw_beepers(const ui_cgia_t* win) {
             ImGui::Text("  Duty:    %.1f%% (%02x)", (float)cgia->pwm[i].duty * 100.0 / 255.0, cgia->pwm[i].duty);
             ImGui::Text(
                 "  Freq:    %4dHz",
-                (uint16_t)((uint16_t)(cgia->regs[i ? CGIA_REG_PWM_1_FREQ : CGIA_REG_PWM_0_FREQ])
-                           | ((uint16_t)(cgia->regs[(i ? CGIA_REG_PWM_1_FREQ : CGIA_REG_PWM_0_FREQ) + 1]) << 8)));
+                (uint16_t)((uint16_t)(cgia->chip[i ? CGIA_REG_PWM_1_FREQ : CGIA_REG_PWM_0_FREQ])
+                           | ((uint16_t)(cgia->chip[(i ? CGIA_REG_PWM_1_FREQ : CGIA_REG_PWM_0_FREQ) + 1]) << 8)));
         }
     }
 }