bugfixes, test_misc2, checkpc options

[picodrive.git] / cpu / Cyclone / OpMove.cpp

diff --git a/cpu/Cyclone/OpMove.cpp b/cpu/Cyclone/OpMove.cpp
index c0e436c..1d7165b 100644 (file)
--- a/cpu/Cyclone/OpMove.cpp
+++ b/cpu/Cyclone/OpMove.cpp
@@ -133,18 +133,18 @@ int OpMove(int op)
   if (movea) size=2; // movea always expands to 32-bits\r
 \r
 #if SPLIT_MOVEL_PD\r
-  EaCalc (10,0x1e00,tea,size,0,0);\r
+  EaCalc (10,0x0e00,tea,size,0,0);\r
   if ((tea&0x38)==0x20 && size==2) { // -(An)\r
     ot("  mov r11,r1\n");\r
     ot("  add r0,r10,#2\n");\r
-    EaWrite(0,     1,tea,1,0x1e00,0,0);\r
-    EaWrite(10,   11,tea,1,0x1e00,1);\r
+    EaWrite(0,     1,tea,1,0x0e00,0,0);\r
+    EaWrite(10,   11,tea,1,0x0e00,1);\r
   } else {\r
-    EaWrite(0,     1,tea,size,0x1e00,0,0);\r
+    EaWrite(0,     1,tea,size,0x0e00,0,0);\r
   }\r
 #else\r
-  EaCalc (0,0x1e00,tea,size,0,0);\r
-  EaWrite(0,     1,tea,size,0x1e00,0,0);\r
+  EaCalc (0,0x0e00,tea,size,0,0);\r
+  EaWrite(0,     1,tea,size,0x0e00,0,0);\r
 #endif\r
 \r
 #if CYCLONE_FOR_GENESIS && !MEMHANDLERS_CHANGE_CYCLES\r
@@ -178,8 +178,8 @@ int OpLea(int op)
   OpStart(op,sea,tea);\r
 \r
   EaCalc (1,0x003f,sea,0); // Lea\r
-  EaCalc (0,0x1e00,tea,2);\r
-  EaWrite(0,     1,tea,2,0x1e00);\r
+  EaCalc (0,0x0e00,tea,2);\r
+  EaWrite(0,     1,tea,2,0x0e00);\r
 \r
   Cycles=Ea_add_ns(g_lea_cycle_table,sea);\r
 \r
@@ -513,7 +513,7 @@ int OpMovep(int op)
 \r
   // Get EA\r
   ea = (op&0x0007)|0x28;\r
-  rea=  op&0x0e00;\r
+  rea= (op&0x0e00)>>9;\r
   dir = (op>>7)&1;\r
 \r
   // Find size extension\r
@@ -522,7 +522,7 @@ int OpMovep(int op)
   OpStart(op,ea);\r
   \r
   if(dir) { // reg to mem\r
-    EaCalcReadNoSE(-1,11,rea,size,0x1e00);\r
+    EaCalcReadNoSE(-1,11,rea,size,0x0e00);\r
 \r
     EaCalc(10,0x000f,ea,size);\r
     if(size==2) { // if operand is long\r