[WIP] Add Z3 Fast autoconf support

[pistorm] / platforms / amiga / amiga-platform.c

diff --git a/platforms/amiga/amiga-platform.c b/platforms/amiga/amiga-platform.c
index def8f19a7945e0f586c37d8c70f10047c8519117..33e179669cb39209e55ce92a1eec0114ae614417 100644 (file)
--- a/platforms/amiga/amiga-platform.c
+++ b/platforms/amiga/amiga-platform.c
@@ -7,46 +7,89 @@
 int handle_register_read_amiga(unsigned int addr, unsigned char type, unsigned int *val);
 int handle_register_write_amiga(unsigned int addr, unsigned int value, unsigned char type);
 
-extern int ac_done;
-extern int ac_pic_count;
-extern int ac_type[AC_PIC_LIMIT];
-extern int ac_index[AC_PIC_LIMIT];
+extern int ac_z2_done;
+extern int ac_z2_pic_count;
+extern int ac_z2_type[AC_PIC_LIMIT];
+extern int ac_z2_index[AC_PIC_LIMIT];
 
-const char *z2_autoconf_id = "z2_autoconf_fast";
-const char *z2_autoconf_zap_id = "^2_autoconf_fast";
+extern int ac_z3_pic_count;
+extern int ac_z3_done;
+extern int ac_z3_type[AC_PIC_LIMIT];
+extern int ac_z3_index[AC_PIC_LIMIT];
+
+char *z2_autoconf_id = "z2_autoconf_fast";
+char *z2_autoconf_zap_id = "^2_autoconf_fast";
+char *z3_autoconf_id = "z3_autoconf_fast";
+char *z3_autoconf_zap_id = "^3_autoconf_fast";
+
+extern const char *op_type_names[OP_TYPE_NUM];
 
 int custom_read_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int *val, unsigned char type) {
-    if (!ac_done && addr >= AC_BASE && addr < AC_BASE + AC_SIZE) {
-        if (ac_pic_count == 0) {
-            ac_done = 1;
+    if (!ac_z2_done && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) {
+        if (ac_z2_pic_count == 0) {
+            ac_z2_done = 1;
             return -1;
         }
 
         if (type == OP_TYPE_BYTE) {
-            //printf("Read from autoconf area.\n");
             *val = autoconfig_read_memory_8(cfg, addr);
             return 1;
         }
     }
+    if (!ac_z3_done && addr >= AC_Z3_BASE && addr < AC_Z3_BASE + AC_SIZE) {
+        if (ac_z3_pic_count == 0) {
+            ac_z3_done = 1;
+            return -1;
+        }
+
+        if (type == OP_TYPE_BYTE) {
+            *val = autoconfig_read_memory_z3_8(cfg, addr);
+            return 1;
+        }
+        else {
+            printf("Unexpected %s read from Z3 autoconf addr %.X\n", op_type_names[type], addr - AC_Z3_BASE);
+            //stop_emulation();
+        }
+    }
 
     return -1;
 }
 
 int custom_write_amiga(struct emulator_config *cfg, unsigned int addr, unsigned int val, unsigned char type) {
-    if (cfg || addr || val || type) {}
-    if (!ac_done && addr >= AC_BASE && addr < AC_BASE + AC_SIZE) {
+    if (!ac_z2_done && addr >= AC_Z2_BASE && addr < AC_Z2_BASE + AC_SIZE) {
         if (type == OP_TYPE_BYTE) {
-            if (ac_pic_count == 0) {
-                ac_done = 1;
+            if (ac_z2_pic_count == 0) {
+                ac_z2_done = 1;
                 return -1;
             }
 
-            //printf("Write to autoconf area.\n");
+            printf("Write to Z2 autoconf area.\n");
             autoconfig_write_memory_8(cfg, addr, val);
             return 1;
         }
     }
 
+    if (!ac_z3_done && addr >= AC_Z3_BASE && addr < AC_Z3_BASE + AC_SIZE) {
+        if (type == OP_TYPE_BYTE) {
+            if (ac_z3_pic_count == 0) {
+                ac_z3_done = 1;
+                return -1;
+            }
+
+            //printf("Write to autoconf area.\n");
+            autoconfig_write_memory_z3_8(cfg, addr, val);
+            return 1;
+        }
+        else if (type == OP_TYPE_WORD) {
+            autoconfig_write_memory_z3_16(cfg, addr, val);
+            return 1;
+        }
+        else {
+            printf("Unexpected %s write to Z3 autoconf addr %.X\n", op_type_names[type], addr - AC_Z3_BASE);
+            //stop_emulation();
+        }
+    }
+
     return -1;
 }
 
@@ -54,9 +97,10 @@ int setup_platform_amiga(struct emulator_config *cfg) {
     if (cfg) {}
     printf("Performing setup for Amiga platform.\n");
     // Look for Z2 autoconf Fast RAM by id
-    int index = get_named_mapped_item(cfg, "z2_autoconf_fast");
+    int index = get_named_mapped_item(cfg, z2_autoconf_id);
     more_z2_fast:;
     if (index != -1) {
+        // "Zap" config items as they are processed.
         cfg->map_id[index][0] = '^';
         int resize_data = 0;
         if (cfg->map_size[index] > 8 * SIZE_MEGA) {
@@ -79,20 +123,41 @@ int setup_platform_amiga(struct emulator_config *cfg) {
             cfg->map_data[index] = (unsigned char *)malloc(cfg->map_size[index]);
         }
         printf("%dMB of Z2 Fast RAM configured at $%lx\n", cfg->map_size[index] / SIZE_MEGA, cfg->map_offset[index]);
-        ac_type[ac_pic_count] = ACTYPE_MAPFAST_Z2;
-        ac_index[ac_pic_count] = index;
-        ac_pic_count++;
-        printf("AAAAHH!\n");
+        ac_z2_type[ac_z2_pic_count] = ACTYPE_MAPFAST_Z2;
+        ac_z2_index[ac_z2_pic_count] = index;
+        ac_z2_pic_count++;
     }
     else
         printf("No Z2 Fast RAM configured.\n");
-    index = get_named_mapped_item(cfg, "z2_autoconf_fast");
+
+    index = get_named_mapped_item(cfg, z2_autoconf_id);
     if (index != -1)
         goto more_z2_fast;
     
     for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i ++) {
+        // Restore any "zapped" autoconf items so they can be reinitialized if needed.
         if (cfg->map_id[i] && strcmp(cfg->map_id[i], z2_autoconf_zap_id) == 0) {
-            cfg->map_id[i][0] = 'z';
+            cfg->map_id[i][0] = z2_autoconf_id[0];
+        }
+    }
+
+    index = get_named_mapped_item(cfg, z3_autoconf_id);
+    more_z3_fast:;
+    if (index != -1) {
+        cfg->map_id[index][0] = '^';
+        printf("%dMB of Z3 Fast RAM configured at $%lx\n", cfg->map_size[index] / SIZE_MEGA, cfg->map_offset[index]);
+        ac_z3_type[ac_z3_pic_count] = ACTYPE_MAPFAST_Z3;
+        ac_z3_index[ac_z3_pic_count] = index;
+        ac_z3_pic_count++;
+    }
+    else
+        printf("No Z3 Fast RAM configured.\n");
+    index = get_named_mapped_item(cfg, z3_autoconf_id);
+    if (index != -1)
+        goto more_z3_fast;
+    for (int i = 0; i < MAX_NUM_MAPPED_ITEMS; i ++) {
+        if (cfg->map_id[i] && strcmp(cfg->map_id[i], z3_autoconf_zap_id) == 0) {
+            cfg->map_id[i][0] = z3_autoconf_id[0];
         }
     }