optimizations, bugfixes, uae works (but with timing glitches?)

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

diff --git a/cpu/Cyclone/OpLogic.cpp b/cpu/Cyclone/OpLogic.cpp
index 65d2293..a081605 100644 (file)
--- a/cpu/Cyclone/OpLogic.cpp
+++ b/cpu/Cyclone/OpLogic.cpp
@@ -307,7 +307,7 @@ int OpExt(int op)
 int OpSet(int op)\r
 {\r
   int cc=0,ea=0;\r
-  int size=0,use=0;\r
+  int size=0,use=0,changed_cycles=0;\r
   char *cond[16]=\r
   {\r
     "al","", "hi","ls","cc","cs","ne","eq",\r
@@ -325,7 +325,8 @@ int OpSet(int op)
   use=OpBase(op,size);\r
   if (op!=use) { OpUse(op,use); return 0; } // Use existing handler\r
 \r
-  OpStart(op,ea); Cycles=8;\r
+  changed_cycles=ea<8 && cc>=2;\r
+  OpStart(op,ea,0,changed_cycles); Cycles=8;\r
   if (ea<8) Cycles=4;\r
 \r
   if (cc)\r
@@ -362,7 +363,7 @@ int OpSet(int op)
   EaCalc (0,0x003f, ea,size,0,0);\r
   EaWrite(0,     1, ea,size,0x003f,0,0);\r
 \r
-  OpEnd(ea);\r
+  OpEnd(ea,0,changed_cycles);\r
   return 0;\r
 }\r
 \r
@@ -586,7 +587,6 @@ int OpAsr(int op)
   int count=0,dir=0;\r
   int size=0,usereg=0,type=0;\r
 \r
-  ea=0;\r
   count =(op>>9)&7;\r
   dir   =(op>>8)&1;\r
   size  =(op>>6)&3;\r
@@ -605,7 +605,7 @@ int OpAsr(int op)
 \r
   if (op!=use) { OpUse(op,use); return 0; } // Use existing handler\r
 \r
-  OpStart(op); Cycles=size<2?6:8;\r
+  OpStart(op,ea,0,count<0); Cycles=size<2?6:8;\r
 \r
   EaCalc(10,0x0007, ea,size,1);\r
   EaRead(10,     0, ea,size,0x0007,1);\r
@@ -614,7 +614,7 @@ int OpAsr(int op)
 \r
   EaWrite(10,    0, ea,size,0x0007,1);\r
 \r
-  OpEnd();\r
+  OpEnd(ea,0,count<0);\r
 \r
   return 0;\r
 }\r