Add MEMCPY to PiStorm device

diff --git a/platforms/amiga/pistorm-dev/pistorm-dev-enums.h b/platforms/amiga/pistorm-dev/pistorm-dev-enums.h
index a67eda42f88942398bc409030971e5c70f5d15bf..c48fe87a7715473fb1fac33dc195d78285183f92 100644 (file)
--- a/platforms/amiga/pistorm-dev/pistorm-dev-enums.h
+++ b/platforms/amiga/pistorm-dev/pistorm-dev-enums.h
@@ -25,6 +25,8 @@ enum pistorm_dev_cmds {
     PI_CMD_FILESIZE         = 0x0100, // [R] Get the file size for file on the Pi side using the path
                                       //     at PI_STR1, if it exists.
     PI_CMD_TRANSFERFILE     = 0x0104, // [W] Transfer over a file from the Pi to Amiga RAM.
+    PI_CMD_MEMCPY           = 0x0108, // [W] Copy written longword of bytes from one area of memory (PTR1)
+                                      //     to another (PTR2).
 
     PI_CMD_QBASIC           = 0x0FFC, // QBasic
     PI_CMD_NIBBLES          = 0x0FFE, // Nibbles

diff --git a/platforms/amiga/pistorm-dev/pistorm-dev.c b/platforms/amiga/pistorm-dev/pistorm-dev.c
index 7a161745eea8cb22070508a366f997597ca601b1..be15d1b713e9904d35f7364c371b257160e8aa94 100644 (file)
--- a/platforms/amiga/pistorm-dev/pistorm-dev.c
+++ b/platforms/amiga/pistorm-dev/pistorm-dev.c
@@ -175,6 +175,34 @@ 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:
+            DEBUG("[PISTORM-DEV} Write to MEMCPY: %d (%.8X)\n", val, val);
+            if (pi_ptr[0] == 0 || pi_ptr[1] == 0) {
+                printf("[PISTORM-DEV] MEMCPY from/to null pointer not allowed. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else if (val == 0) {
+                printf("[PISTORM-DEV] MEMCPY called with size 0. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else {
+                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 (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])];
+                    memcpy(dst_ptr, src_ptr, val);
+                } else {
+                    uint8_t tmp = 0;
+                    for (uint32_t i = 0; i < val; i++) {
+                        if (src == -1) tmp = read8(pi_ptr[0] + i);
+                        else tmp = cfg->map_data[src][pi_ptr[0] - cfg->map_offset[src]];
+                        
+                        if (dst == -1) write8(pi_ptr[1] + i, tmp);
+                        else cfg->map_data[dst][pi_ptr[1] - cfg->map_offset[dst]] = tmp;
+                    }
+                }
+                DEBUG("[PISTORM-DEV] Copied %d bytes from $%.8X to $%.8X\n", val, pi_ptr[0], pi_ptr[1]);
+            }
+            break;
 
         case PI_CMD_RTGSTATUS:
             DEBUG("[PISTORM-DEV] Write to RTGSTATUS: %d\n", val);