more MAME fixes, some optimization

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

diff --git a/cpu/Cyclone/OpArith.cpp b/cpu/Cyclone/OpArith.cpp
index 29b6cdf..c6f0bc8 100644 (file)
--- a/cpu/Cyclone/OpArith.cpp
+++ b/cpu/Cyclone/OpArith.cpp
@@ -22,12 +22,11 @@ int OpArith(int op)
   use=OpBase(op);\r
   if (op!=use) { OpUse(op,use); return 0; } // Use existing handler\r
 \r
-  OpStart(op, sea|tea); Cycles=4;\r
+  OpStart(op, sea, tea); Cycles=4;\r
 \r
   EaCalc(10,0x0000, sea,size,1);\r
-  EaRead(10,    10, sea,size,0,1);\r
-\r
   EaCalc(11,0x003f, tea,size,1);\r
+  EaRead(10,    10, sea,size,0,1);\r
   EaRead(11,     0, tea,size,0x003f,1);\r
 \r
   ot(";@ Do arithmetic:\n");\r
@@ -65,7 +64,7 @@ int OpArith(int op)
     if (type==1 && size>=2 && tea<8) Cycles-=2;\r
   }\r
 \r
-  OpEnd();\r
+  OpEnd(sea,tea);\r
 \r
   return 0;\r
 }\r
@@ -128,7 +127,7 @@ int OpAddq(int op)
 \r
   EaWrite(10,     1, ea,size,0x003f,1);\r
 \r
-  OpEnd();\r
+  OpEnd(ea);\r
 \r
   return 0;\r
 }\r
@@ -195,7 +194,7 @@ int OpArithReg(int op)
     }\r
   }\r
 \r
-  OpEnd();\r
+  OpEnd(ea);\r
 \r
   return 0;\r
 }\r
@@ -328,13 +327,13 @@ int OpMul(int op)
   EaWrite(0,     1,rea, 2,0x0e00,1);\r
 \r
   ot("endofop%.4x%s\n",op,ms?"":":");\r
-  OpEnd();\r
+  OpEnd(ea);\r
 \r
   ot("divzero%.4x%s\n",op,ms?"":":");\r
   ot("  mov r0,#0x14 ;@ Divide by zero\n");\r
   ot("  bl Exception\n");\r
   Cycles+=38;\r
-  OpEnd();\r
+  OpEnd(ea);\r
   ot("\n");\r
 \r
   return 0;\r
@@ -370,7 +369,7 @@ int OpAbcd(int op)
   if (sea==0x27||dea==0x27) use=op; // ..except -(a7)\r
   if (op!=use) { OpUse(op,use); return 0; } // Use existing handler\r
 \r
-  OpStart(op,sea|dea); Cycles=6;\r
+  OpStart(op,sea,dea); Cycles=6;\r
 \r
   EaCalc( 0,0x0007, sea,0,1);\r
   EaRead( 0,    10, sea,0,0x0007,1);\r
@@ -438,7 +437,7 @@ int OpAbcd(int op)
   ot("  strb r2,[r7,#0x45] ;@ Save X bit\n");\r
 \r
   EaWrite(11,     0, dea,0,0x0e00,1);\r
-  OpEnd();\r
+  OpEnd(sea,dea);\r
 \r
   return 0;\r
 }\r
@@ -493,7 +492,7 @@ int OpNbcd(int op)
   ot("  mov r2,r9,lsr #28\n");\r
   ot("  strb r2, [r7,#0x45]\n");\r
 \r
-  OpEnd();\r
+  OpEnd(ea);\r
 \r
   return 0;\r
 }\r
@@ -538,7 +537,7 @@ int OpAritha(int op)
   \r
   if (type!=1) EaWrite( 0,     1, dea,2,0x0e00,1);\r
 \r
-  OpEnd();\r
+  OpEnd(sea);\r
 \r
   return 0;\r
 }\r
@@ -566,7 +565,7 @@ int OpAddx(int op)
   if (size==0&&(sea==0x27||dea==0x27)) use=op; // ___x.b -(a7)\r
   if (op!=use) { OpUse(op,use); return 0; } // Use existing handler\r
 \r
-  OpStart(op,sea|dea); Cycles=4;\r
+  OpStart(op,sea,dea); Cycles=4;\r
   if(size>=2)   Cycles+=4;\r
   if(sea>=0x10) Cycles+=2;\r
 \r
@@ -602,7 +601,7 @@ int OpAddx(int op)
   ot(";@ Save result:\n");\r
   EaWrite( 0, 1, dea,size,0x0e00,1);\r
 \r
-  OpEnd();\r
+  OpEnd(sea,dea);\r
 \r
   return 0;\r
 }\r
@@ -660,7 +659,7 @@ int OpCmpEor(int op)
 \r
   if (eor) EaWrite(10, 1,ea,size,0x003f,1);\r
 \r
-  OpEnd();\r
+  OpEnd(ea);\r
   return 0;\r
 }\r
 \r
@@ -691,7 +690,7 @@ int OpCmpm(int op)
   ot("  cmp r0,r10\n");\r
   OpGetFlags(1,0); // Cmp like subtract\r
 \r
-  OpEnd();\r
+  OpEnd(sea);\r
   return 0;\r
 }\r
 \r
@@ -745,13 +744,13 @@ int OpChk(int op)
   ot(";@ old N remains\n");\r
   ot("  bic r9,r9,#0x80000000 ;@ N\n");\r
   ot("  orr r9,r9,r3\n");\r
-  OpEnd();\r
+  OpEnd(ea);\r
 \r
   ot("chktrap%.4x%s ;@ CHK exception:\n",op,ms?"":":");\r
   ot("  mov r0,#0x18\n");\r
   ot("  bl Exception\n");\r
   Cycles+=40;\r
-  OpEnd();\r
+  OpEnd(ea);\r
 \r
   return 0;\r
 }\r