Fix PiStorm dev memcpy, correct extern gayle_emulation_enabled type

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

diff --git a/platforms/amiga/pistorm-dev/pistorm-dev.c b/platforms/amiga/pistorm-dev/pistorm-dev.c
index 6f25da409413d4c7e937d5a05e085832ba2c791d..84cafa1a04c81fc01e6d1b61a00a243f6a30a953 100644 (file)
--- a/platforms/amiga/pistorm-dev/pistorm-dev.c
+++ b/platforms/amiga/pistorm-dev/pistorm-dev.c
@@ -15,14 +15,13 @@
 
 #include <linux/reboot.h>
 #include <sys/reboot.h>
+#include <endian.h>
 
 #define DEBUG_PISTORM_DEVICE
 
 #ifdef DEBUG_PISTORM_DEVICE
 #define DEBUG printf
 
-#define PIDEV_SWREV 0x0105
-
 static const char *op_type_names[4] = {
     "BYTE",
     "WORD",
@@ -33,12 +32,15 @@ static const char *op_type_names[4] = {
 #define DEBUG(...)
 #endif
 
+#define PIDEV_SWREV 0x0105
+
 extern uint32_t pistorm_dev_base;
 extern uint32_t do_reset;
 
 extern void adjust_ranges_amiga(struct emulator_config *cfg);
 extern uint8_t rtg_enabled, rtg_on, pinet_enabled, piscsi_enabled, load_new_config, end_signal;
 extern struct emulator_config *cfg;
+extern int cpu_emulation_running;
 
 char cfg_filename[256] = "default.cfg";
 char tmp_string[256];
@@ -180,6 +182,18 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
             pi_string[0] = 0;
             pi_ptr[0] = 0;
             break;
+        case PI_CMD_MEMCPY_Q:
+            DEBUG("CopyMemQuick.\n");
+            if ((pi_ptr[0] & 0x03) != 0) {
+                DEBUG("[!!!PISTORM-DEV] CopyMemQuick src not aligned: %.8X\n", pi_ptr[0]);
+            }
+            if (pi_ptr[1] & 0x03) {
+                DEBUG("[!!!PISTORM-DEV] CopyMemQuick dst not aligned: %.8X\n", pi_ptr[1]);
+            }
+            if (val & 0x03) {
+                DEBUG("[!!!PISTORM-DEV] CopyMemQuick size not aligned: %.8X\n", val);
+            }
+            // Fallthrough
         case PI_CMD_MEMCPY:
             //DEBUG("[PISTORM-DEV} Write to MEMCPY: %d (%.8X)\n", val, val);
             if (pi_ptr[0] == 0 || pi_ptr[1] == 0) {
@@ -189,17 +203,28 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                 printf("[PISTORM-DEV] MEMCPY called with size 0. Aborting.\n");
                 pi_cmd_result = PI_RES_INVALIDVALUE;
             } else {
+                //DEBUG("[PISTORM-DEV] Copy %d bytes from $%.8X to $%.8X\n", val, pi_ptr[0], pi_ptr[1]);
                 int32_t src = get_mapped_item_by_address(cfg, pi_ptr[0]);
                 int32_t dst = get_mapped_item_by_address(cfg, pi_ptr[1]);
+                if (cfg->map_type[dst] == MAPTYPE_ROM)
+                    break;
                 if (dst != -1 && src != -1) {
-                    //printf("doing super memcpy\n");
                     uint8_t *src_ptr = &cfg->map_data[src][(pi_ptr[0] - cfg->map_offset[src])];
                     uint8_t *dst_ptr = &cfg->map_data[dst][(pi_ptr[1] - cfg->map_offset[dst])];
                     memcpy(dst_ptr, src_ptr, val);
                 } else {
                     uint8_t tmp = 0;
+                    uint16_t tmps = 0;
                     for (uint32_t i = 0; i < val; i++) {
-                        if (src == -1) tmp = (unsigned char)m68k_read_memory_8(pi_ptr[0] + i);
+                        while (i + 2 < val) {
+                            if (src == -1) tmps = (uint16_t)htobe16(m68k_read_memory_16(pi_ptr[0] + i));
+                            else memcpy(&tmps, &cfg->map_data[src][pi_ptr[0] - cfg->map_offset[src] + i], 2);
+
+                            if (dst == -1) m68k_write_memory_16(pi_ptr[1] + i, be16toh(tmps));
+                            else memcpy(&cfg->map_data[dst][pi_ptr[1] - cfg->map_offset[dst] + i], &tmps, 2);
+                            i += 2;
+                        }
+                        if (src == -1) tmp = (uint8_t)m68k_read_memory_8(pi_ptr[0] + i);
                         else tmp = cfg->map_data[src][pi_ptr[0] - cfg->map_offset[src] + i];
                         
                         if (dst == -1) m68k_write_memory_8(pi_ptr[1] + i, tmp);
@@ -219,6 +244,8 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                 pi_cmd_result = PI_RES_INVALIDVALUE;
             } else {
                 int32_t dst = get_mapped_item_by_address(cfg, pi_ptr[0]);
+                if (cfg->map_type[dst] == MAPTYPE_ROM)
+                    break;
                 if (dst != -1) {
                     uint8_t *dst_ptr = &cfg->map_data[dst][(pi_ptr[0] - cfg->map_offset[dst])];
                     memset(dst_ptr, pi_byte[0], val);
@@ -241,6 +268,11 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                 int32_t src = get_mapped_item_by_address(cfg, pi_ptr[0]);
                 int32_t dst = get_mapped_item_by_address(cfg, pi_ptr[1]);
 
+                if (addr != PI_CMD_COPYRECT_EX) {
+                    // Clear out the src/dst coordinates in case something else set them previously.
+                    pi_word[4] = pi_word[5] = pi_word[6] = pi_word[7] = 0;
+                }
+
                 if (dst != -1 && src != -1) {
                     uint8_t *src_ptr = &cfg->map_data[src][(pi_ptr[0] - cfg->map_offset[src])];
                     uint8_t *dst_ptr = &cfg->map_data[dst][(pi_ptr[1] - cfg->map_offset[dst])];
@@ -258,13 +290,6 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                         dst_ptr += pi_word[1];
                     }
                 } else {
-                    printf("!!! doing manual copyrect\n");
-
-                    if (addr != PI_CMD_COPYRECT_EX) {
-                        // Clear out the src/dst coordinates in case something else set them previously.
-                        pi_word[4] = pi_word[5] = pi_word[6] = pi_word[7] = 0;
-                    }
-
                     uint32_t src_offset = 0, dst_offset = 0;
                     uint8_t tmp = 0;
 
@@ -418,7 +443,7 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                         free(cfg->map_id[index]);
                         cfg->map_type[index] = MAPTYPE_NONE;
                         // Dirty hack, I am sleepy and lazy.
-                        add_mapping(cfg, MAPTYPE_ROM, cfg->map_offset[index], cfg->map_size[index], 0, tmp_string, "kickstart");
+                        add_mapping(cfg, MAPTYPE_ROM, cfg->map_offset[index], cfg->map_size[index], 0, tmp_string, "kickstart", 0);
                         pi_cmd_result = PI_RES_OK;
                         do_reset = 1;
                     } else {
@@ -448,7 +473,7 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                         free(cfg->map_id[index]);
                         cfg->map_type[index] = MAPTYPE_NONE;
                         // Dirty hack, I am tired and lazy.
-                        add_mapping(cfg, MAPTYPE_ROM, cfg->map_offset[index], cfg->map_size[index], 0, tmp_string, "extended");
+                        add_mapping(cfg, MAPTYPE_ROM, cfg->map_offset[index], cfg->map_size[index], 0, tmp_string, "extended", 0);
                         pi_cmd_result = PI_RES_OK;
                         do_reset = 1;
                     } else {