From e28a980fb7737edcf70fbce20c77b64fa14264a2 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Sat, 8 Sep 2007 20:04:20 +0000
Subject: [PATCH] SPLIT_MOVEL_PD now affects movem too

git-svn-id: file:///home/notaz/opt/svn/PicoDrive@241 be3aeb3a-fb24-0410-a615-afba39da0efa
---
 cpu/Cyclone/OpMove.cpp    | 17 +++++++++++++----
 cpu/Cyclone/config.h      |  4 ++--
 cpu/Cyclone/config_pico.h |  6 +++---
 cpu/musashi/m68k_in.c     |  7 +++++--
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/cpu/Cyclone/OpMove.cpp b/cpu/Cyclone/OpMove.cpp
index b5dc0ce..1bc7a51 100644
--- a/cpu/Cyclone/OpMove.cpp
+++ b/cpu/Cyclone/OpMove.cpp
@@ -415,12 +415,21 @@ int OpMovem(int op)
   }
   else
   {
-    // if (size == 2 && decr && SPLIT_MOVEL_PD) we should do 2xWrite16 here
-    // (same as in movel.l ?, -(An)), but as this is not likely to be needed and
-    // we do not want the performance hit, we do single Write32 instead.
     ot("  ;@ Copy register to memory:\n",1<<size);
     ot("  ldr r1,[r7,r10] ;@ Load value from Dn/An\n");
-    EaWrite(6,1,ea,size,0x003f);
+#if SPLIT_MOVEL_PD
+    if (decr && size==2) { // -(An)
+      ot("  add r0,r6,#2\n");
+      EaWrite(0,1,ea,1,0x003f,0,0);
+      ot("  ldr r1,[r7,r10] ;@ Load value from Dn/An\n");
+      ot("  mov r0,r6\n");
+      EaWrite(0,1,ea,1,0x003f,1);
+    }
+    else
+#endif
+    {
+      EaWrite(6,1,ea,size,0x003f);
+    }
   }
 
   if (decr==0) ot("  add r6,r6,#%d ;@ Post-increment address\n",1<<size);
diff --git a/cpu/Cyclone/config.h b/cpu/Cyclone/config.h
index 6ec08f8..7736712 100644
--- a/cpu/Cyclone/config.h
+++ b/cpu/Cyclone/config.h
@@ -133,8 +133,8 @@
 
 /*
  * When this option is enabled Cyclone will do two word writes instead of one
- * long write when handling MOVE.L with pre-decrementing destination, as described in
- * Bart Trzynadlowski's doc (http://www.trzy.org/files/68knotes.txt).
+ * long write when handling MOVE.L or MOVEM.L with pre-decrementing destination,
+ * as described in Bart Trzynadlowski's doc (http://www.trzy.org/files/68knotes.txt).
  * Enable this if you are emulating a 16 bit system.
  */
 #define SPLIT_MOVEL_PD              1
diff --git a/cpu/Cyclone/config_pico.h b/cpu/Cyclone/config_pico.h
index 6c002ae..8f7a336 100644
--- a/cpu/Cyclone/config_pico.h
+++ b/cpu/Cyclone/config_pico.h
@@ -58,7 +58,7 @@
  * MEMHANDLERS_NEED_CYCLES, or else Cyclone will keep reloading the same cycle
  * count and this will screw timing (if not cause a deadlock).
  */
-#define MEMHANDLERS_NEED_PC         0
+#define MEMHANDLERS_NEED_PC         1
 #define MEMHANDLERS_NEED_PREV_PC    0
 #define MEMHANDLERS_NEED_FLAGS      0
 #define MEMHANDLERS_NEED_CYCLES     1
@@ -133,8 +133,8 @@
 
 /*
  * When this option is enabled Cyclone will do two word writes instead of one
- * long write when handling MOVE.L with pre-decrementing destination, as described in
- * Bart Trzynadlowski's doc (http://www.trzy.org/files/68knotes.txt).
+ * long write when handling MOVE.L or MOVEM.L with pre-decrementing destination,
+ * as described in Bart Trzynadlowski's doc (http://www.trzy.org/files/68knotes.txt).
  * Enable this if you are emulating a 16 bit system.
  */
 #define SPLIT_MOVEL_PD              1
diff --git a/cpu/musashi/m68k_in.c b/cpu/musashi/m68k_in.c
index 804b87a..d3ee866 100644
--- a/cpu/musashi/m68k_in.c
+++ b/cpu/musashi/m68k_in.c
@@ -7133,9 +7133,12 @@ M68KMAKE_OP(movem, 32, re, pd)
 		if(register_list & (1 << i))
 		{
 			ea -= 4;
+#if 0
 			m68ki_write_32(ea, REG_DA[15-i] ); // notaz Cyclone hack
-			//m68ki_write_16(ea+2, REG_DA[15-i] & 0xFFFF );
-			//m68ki_write_16(ea, (REG_DA[15-i] >> 16) & 0xFFFF );
+#else
+			m68ki_write_16(ea+2, REG_DA[15-i] & 0xFFFF );
+			m68ki_write_16(ea, (REG_DA[15-i] >> 16) & 0xFFFF );
+#endif
 			count++;
 		}
 	AY = ea;
-- 
2.39.2