avoid using mrs

[cyclone68000.git] / OpLogic.cpp

diff --git a/OpLogic.cpp b/OpLogic.cpp
index 19ec569..4d4312c 100644 (file)
--- a/OpLogic.cpp
+++ b/OpLogic.cpp
@@ -285,12 +285,11 @@ int OpNeg(int op)
     ot(";@ Not:\n");\r
     if(size!=2) {\r
       ot("  mov r0,r0,asl #%i\n",size?16:24);\r
-      ot("  mvn r1,r0,asr #%i\n",size?16:24);\r
+      ot("  mvns r1,r0,asr #%i\n",size?16:24);\r
     }\r
     else\r
-      ot("  mvn r1,r0\n");\r
-    ot("  adds r1,r1,#0 ;@ Defines NZ, clears CV\n");\r
-    OpGetFlags(0,0);\r
+      ot("  mvns r1,r0\n");\r
+    OpGetFlagsNZ(1);\r
     ot("\n");\r
   }\r
 \r
@@ -318,9 +317,8 @@ int OpSwap(int op)
   EaCalc (11,0x0007,ea,2,1);\r
   EaRead (11,     0,ea,2,0x0007,1);\r
 \r
-  ot("  mov r1,r0,ror #16\n");\r
-  ot("  adds r1,r1,#0 ;@ Defines NZ, clears CV\n");\r
-  OpGetFlags(0,0);\r
+  ot("  movs r1,r0,ror #16\n");\r
+  OpGetFlagsNZ(1);\r
 \r
   EaWrite(11,     1,8,2,0x0007,1);\r
 \r
@@ -347,11 +345,10 @@ int OpTst(int op)
 \r
   OpStart(op,sea); Cycles=4;\r
 \r
-  EaCalc ( 0,0x003f,sea,size,1);\r
-  EaRead ( 0,     0,sea,size,0x003f,1);\r
+  EaCalc (0,0x003f,sea,size,1);\r
+  EaRead (0,     0,sea,size,0x003f,1,0,1);\r
 \r
-  ot("  adds r0,r0,#0 ;@ Defines NZ, clears CV\n");\r
-  ot("  mrs r10,cpsr ;@ r10=flags\n");\r
+  OpGetFlagsNZ(0);\r
   ot("\n");\r
 \r
   OpEnd(sea);\r
@@ -378,9 +375,8 @@ int OpExt(int op)
   EaCalc (11,0x0007,ea,size+1,0,0);\r
   EaRead (11,     0,ea,size+1,0x0007,0,0);\r
 \r
-  ot("  mov r0,r0,asl #%d\n",shift);\r
-  ot("  adds r0,r0,#0 ;@ Defines NZ, clears CV\n");\r
-  ot("  mrs r10,cpsr ;@ r10=flags\n");\r
+  ot("  movs r0,r0,asl #%d\n",shift);\r
+  OpGetFlagsNZ(0);\r
   ot("  mov r1,r0,asr #%d\n",shift);\r
   ot("\n");\r
 \r
@@ -596,8 +592,8 @@ static int EmitAsr(int op,int type,int dir,int count,int size,int usereg)
       ot("  b nozerox%.4x\n",op);\r
       ot("norotx_%.4x%s\n",op,ms?"":":");\r
       ot("  ldr r2,[r7,#0x4c]\n");\r
-      ot("  adds r0,r0,#0 ;@ Defines NZ, clears CV\n");\r
-      OpGetFlags(0,0);\r
+      ot("  adds r0,r0,#0 ;@ Define flags\n");\r
+      OpGetFlagsNZ(0);\r
       ot("  and r2,r2,#0x20000000\n");\r
       ot("  orr r10,r10,r2 ;@ C = old_X\n");\r
       ot("nozerox%.4x%s\n",op,ms?"":":");\r
@@ -746,10 +742,9 @@ int OpTas(int op, int gen_special)
   if(ea>=8) Cycles+=10;\r
 \r
   EaCalc (11,0x003f,ea,0,1);\r
-  EaRead (11,     1,ea,0,0x003f,1);\r
+  EaRead (11,     1,ea,0,0x003f,1,0,1);\r
 \r
-  ot("  adds r1,r1,#0 ;@ Defines NZ, clears CV\n");\r
-  OpGetFlags(0,0);\r
+  OpGetFlagsNZ(1);\r
   ot("\n");\r
 \r
 #if CYCLONE_FOR_GENESIS\r