Fix PiStorm dev memcpy, correct extern gayle_emulation_enabled type

diff --git a/platforms/amiga/amiga-platform.c b/platforms/amiga/amiga-platform.c
index 160d2f90c9afa9e5577b65e0cff08fb878246a8c..a395d8c77df402b444e94399746fc10303050461 100644 (file)
--- a/platforms/amiga/amiga-platform.c
+++ b/platforms/amiga/amiga-platform.c
@@ -40,7 +40,7 @@ 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];
-extern int gayle_emulation_enabled;
+extern uint8_t gayle_emulation_enabled;
 
 char *z2_autoconf_id = "z2_autoconf_fast";
 char *z2_autoconf_zap_id = "^2_autoconf_fast";

diff --git a/platforms/amiga/amiga-registers.c b/platforms/amiga/amiga-registers.c
index 056d4c9dfdbe15f6f675bb4a2a991631d7917bb1..5d2f88782c55221a6066350c39088e448336b61e 100644 (file)
--- a/platforms/amiga/amiga-registers.c
+++ b/platforms/amiga/amiga-registers.c
@@ -5,7 +5,7 @@
 #include "amiga-registers.h"
 
 uint8_t rtc_emulation_enabled = 1;
-extern int gayle_emulation_enabled;
+extern uint8_t gayle_emulation_enabled;
 
 void configure_rtc_emulation_amiga(uint8_t enabled) {
     if (enabled == rtc_emulation_enabled)

diff --git a/platforms/amiga/pistorm-dev/pistorm-dev.c b/platforms/amiga/pistorm-dev/pistorm-dev.c
index 9668daffdfeb9e1a3476c892311418d0b651cc8f..84cafa1a04c81fc01e6d1b61a00a243f6a30a953 100644 (file)
--- a/platforms/amiga/pistorm-dev/pistorm-dev.c
+++ b/platforms/amiga/pistorm-dev/pistorm-dev.c
@@ -15,6 +15,7 @@
 
 #include <linux/reboot.h>
 #include <sys/reboot.h>
+#include <endian.h>
 
 #define DEBUG_PISTORM_DEVICE
 
@@ -39,6 +40,7 @@ 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,6 +203,7 @@ 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)
@@ -202,10 +217,10 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                     uint16_t tmps = 0;
                     for (uint32_t i = 0; i < val; i++) {
                         while (i + 2 < val) {
-                            if (src == -1) tmps = (uint16_t)m68k_read_memory_16(pi_ptr[0] + i);
+                            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, tmps);
+                            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;
                         }

diff --git a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/CopyMems b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/CopyMems
index d6276f18798fb49848dc8d5c90a66d6f43c53a77..70c845e4316385a45953507ef044f1d07404a748 100755 (executable)
Binary files a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/CopyMems and b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/CopyMems differ

diff --git a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/PiSimple b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/PiSimple
index 7238b900ce732d6fe89f50ae91d23b69c7ae290c..247706aa9d28e3d37e9d4f03ec9e4e0380e7bbd6 100755 (executable)
Binary files a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/PiSimple and b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/PiSimple differ

diff --git a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/copymems.c b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/copymems.c
index 973a66e09578463b9eb91f8bed6a1eebd898f7ae..e1919b101ae2b6a58394b03f82ad0226210e7ca3 100644 (file)
--- a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/copymems.c
+++ b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/copymems.c
@@ -40,7 +40,7 @@ struct Screen *(*oldOpenScreen)(struct NewScreen *asm("a0"));
 #define AUTO_MONITOR_ID ((options.bits.auto_mon==0)?(PAL_MONITOR_ID):((options.bits.auto_mon==1)?(NTSC_MONITOR_ID):(DEFAULT_MONITOR_ID)))
 
 extern unsigned int pistorm_base_addr;
-#define WRITELONG(cmd, val) *(unsigned int *)((unsigned int)(pistorm_base_addr+cmd)) = val;
+#define WRITELONG(cmd, val) *(volatile unsigned int *)((unsigned int)(pistorm_base_addr+cmd)) = val;
 
 void pi_CopyMem(unsigned char *src asm("a0"), unsigned char *dst asm("a1"), unsigned int size asm("d0")) {
        WRITELONG(PI_PTR1, (unsigned int)src);
@@ -48,6 +48,12 @@ void pi_CopyMem(unsigned char *src asm("a0"), unsigned char *dst asm("a1"), unsi
        WRITELONG(PI_CMD_MEMCPY, size);
 }
 
+void pi_CopyMemQuick(unsigned char *src asm("a0"), unsigned char *dst asm("a1"), unsigned int size asm("d0")) {
+       WRITELONG(PI_PTR1, (unsigned int)src);
+       WRITELONG(PI_PTR2, (unsigned int)dst);
+       WRITELONG(PI_CMD_MEMCPY_Q, size);
+}
+
 int leave(int x)
 {
     Forbid();
@@ -87,7 +93,8 @@ int main(int argc,char *argv[])
 
     oldCopyMemPtr = (APTR)SetFunction((struct Library *)SysBase, -0x270, pi_CopyMem);
     
-    oldCopyMemQuickPtr = (APTR)SetFunction((struct Library *)SysBase, -0x276, pi_CopyMem);
+    oldCopyMemQuickPtr = (APTR)SetFunction((struct Library *)SysBase, -0x276, pi_CopyMemQuick);
+    //oldCopyMemQuickPtr = (APTR)SetFunction((struct Library *)SysBase, -0x276, pi_CopyMem);
 
     do
     {