X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FCyclone%2FOpLogic.cpp;h=d6b893337e0b07a8252a3a7e7411db6aded306c6;hb=2b2b46b05d5fbabb59c1392fbfdf8c715ef02a83;hp=912d94bf773974beb62d1eb2a59d927e13adbf6d;hpb=8527dc450a96f7a292b7f302e8e55147628b6042;p=picodrive.git

diff --git a/cpu/Cyclone/OpLogic.cpp b/cpu/Cyclone/OpLogic.cpp
index 912d94b..d6b8933 100644
--- a/cpu/Cyclone/OpLogic.cpp
+++ b/cpu/Cyclone/OpLogic.cpp
@@ -119,6 +119,11 @@ int OpBtstImm(int op)
     if (type==3) ot("  orr r1,r0,r11 ;@ Set bit\n");
     ot("\n");
     EaWrite(8,   1,tea,size,0x003f,0,0);
+#if CYCLONE_FOR_GENESIS && !MEMHANDLERS_CHANGE_CYCLES
+    // this is a bit hacky (device handlers might modify cycles)
+    if (tea==0x38||tea==0x39)
+      ot("  ldr r5,[r7,#0x5c] ;@ Load Cycles\n");
+#endif
   }
 
   OpEnd(sea,tea);
@@ -301,7 +306,7 @@ int OpSet(int op)
 {
   int cc=0,ea=0;
   int size=0,use=0,changed_cycles=0;
-  char *cond[16]=
+  static const char * const cond[16]=
   {
     "al","", "hi","ls","cc","cs","ne","eq",
     "vc","vs","pl","mi","ge","lt","gt","le"