X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FCyclone%2FOpArith.cpp;h=3aebd8fd6ab92a25b69ee4ba1675fea164d87575;hb=0e11c502b05a9ccd67d34d1f0975852d8c3d4232;hp=8280a2b5156e66f52e2ba1e973860082a2140034;hpb=85a36a57a816ac643ee5f982d774532a0ca4d58b;p=picodrive.git

diff --git a/cpu/Cyclone/OpArith.cpp b/cpu/Cyclone/OpArith.cpp
index 8280a2b..3aebd8f 100644
--- a/cpu/Cyclone/OpArith.cpp
+++ b/cpu/Cyclone/OpArith.cpp
@@ -25,20 +25,21 @@ int OpArith(int op)
 
   OpStart(op, sea, tea); Cycles=4;
 
-  EaCalcReadNoSE((type!=6)?11:-1,0,tea,size,0x003f);
+  // imm must be read first
   EaCalcReadNoSE(-1,10,sea,size,0);
+  EaCalcReadNoSE((type!=6)?11:-1,0,tea,size,0x003f);
 
   if (size<2) shiftstr=(char *)(size?",asl #16":",asl #24");
-  if (size<2) ot("  mov r0,r0,asl %i\n",size?16:24);
+  if (size<2) ot("  mov r10,r10,asl #%i\n",size?16:24);
 
   ot(";@ Do arithmetic:\n");
 
-  if (type==0) ot("  orr r1,r0,r10%s\n",shiftstr);
-  if (type==1) ot("  and r1,r0,r10%s\n",shiftstr);
-  if (type==2) ot("  subs r1,r0,r10%s ;@ Defines NZCV\n",shiftstr);
-  if (type==3) ot("  adds r1,r0,r10%s ;@ Defines NZCV\n",shiftstr);
-  if (type==5) ot("  eor r1,r0,r10%s\n",shiftstr);
-  if (type==6) ot("  cmp r0,r10%s ;@ Defines NZCV\n",shiftstr);
+  if (type==0) ot("  orr r1,r10,r0%s\n",shiftstr);
+  if (type==1) ot("  and r1,r10,r0%s\n",shiftstr);
+  if (type==2||type==6)
+               ot("  rsbs r1,r10,r0%s ;@ Defines NZCV\n",shiftstr);
+  if (type==3) ot("  adds r1,r10,r0%s ;@ Defines NZCV\n",shiftstr);
+  if (type==5) ot("  eor r1,r10,r0%s\n",shiftstr);
 
   if (type<2 || type==5) ot("  adds r1,r1,#0 ;@ Defines NZ, clears CV\n"); // 0,1,5
 
@@ -236,7 +237,7 @@ int OpMul(int op)
   EaCalc(10,0x0e00,rea, 2);
   EaRead(10,     2,rea, 2,0x0e00);
 
-  ot("  movs r0,r0,asl #16\n");
+  ot("  movs r1,r0,asl #16\n");
 
   if (type==0) // div
   {
@@ -248,20 +249,25 @@ int OpMul(int op)
     if (sign)
     {
       ot("  mov r11,#0 ;@ r11 = 1 or 2 if the result is negative\n");
-      ot("  orrmi r11,r11,#1\n");
-      ot("  mov r0,r0,asr #16\n");
-      ot("  rsbmi r0,r0,#0 ;@ Make r0 positive\n");
-      ot("\n");
       ot("  tst r2,r2\n");
       ot("  orrmi r11,r11,#2\n");
       ot("  rsbmi r2,r2,#0 ;@ Make r2 positive\n");
       ot("\n");
+      ot("  movs r0,r1,asr #16\n");
+      ot("  orrmi r11,r11,#1\n");
+      ot("  rsbmi r0,r0,#0 ;@ Make r0 positive\n");
+      ot("\n");
+      ot(";@ detect the nasty 0x80000000 / -1 situation\n");
+      ot("  mov r3,r2,asr #31\n");
+      ot("  eors r3,r3,r1,asr #16\n");
+      ot("  beq wrendofop%.4x\n",op);
     }
     else
     {
-      ot("  mov r0,r0,lsr #16 ;@ use only 16 bits of divisor\n");
+      ot("  mov r0,r1,lsr #16 ;@ use only 16 bits of divisor\n");
     }
 
+    ot("\n");
     ot(";@ Divide r2 by r0\n");
     ot("  mov r3,#0\n");
     ot("  mov r1,r0\n");
@@ -298,6 +304,8 @@ int OpMul(int op)
       ot("  cmp r3,r1,asr #16 ;@ signed overflow?\n");
       ot("  orrne r9,r9,#0x10000000 ;@ set overflow flag\n");
       ot("  bne endofop%.4x ;@ overflow!\n",op);
+      ot("\n");
+      ot("wrendofop%.4x%s\n",op,ms?"":":");
     }
     else
     {
@@ -305,6 +313,7 @@ int OpMul(int op)
       ot("  movs r1,r3,lsr #16 ;@ check for overflow condition\n");
       ot("  orrne r9,r9,#0x10000000 ;@ set overflow flag\n");
       ot("  bne endofop%.4x ;@ overflow!\n",op);
+      ot("\n");
     }
 
     ot("  mov r1,r3,lsl #16 ;@ Clip to 16-bits\n");
@@ -318,7 +327,7 @@ int OpMul(int op)
   if (type==1)
   {
     ot(";@ Get 16-bit signs right:\n");
-    ot("  mov r0,r0,%s #16\n",sign?"asr":"lsr");
+    ot("  mov r0,r1,%s #16\n",sign?"asr":"lsr");
     ot("  mov r2,r2,lsl #16\n");
     ot("  mov r2,r2,%s #16\n",sign?"asr":"lsr");
     ot("\n");
@@ -337,7 +346,7 @@ int OpMul(int op)
   if (type==0) // div
   {
     ot("divzero%.4x%s\n",op,ms?"":":");
-    ot("  mov r0,#0x14 ;@ Divide by zero\n");
+    ot("  mov r0,#5 ;@ Divide by zero\n");
     ot("  bl Exception\n");
     Cycles+=38;
     OpEnd(ea);
@@ -384,7 +393,7 @@ int OpAbcd(int op)
     ot(";@ Get src/dest EA vals\n");
     EaCalc (0,0x000f, sea,0,1);
     EaRead (0,    10, sea,0,0x000f,1);
-    EaCalcReadNoSE(11,0,dea,0,0x1e00);
+    EaCalcReadNoSE(11,0,dea,0,0x0e00);
   }
   else
   {
@@ -485,29 +494,31 @@ int OpNbcd(int op)
   ot("  mov r0,r0,asl #24\n");
   ot("  and r2,r2,#0x20000000\n");
   ot("  add r2,r0,r2,lsr #5 ;@ add X\n");
-  ot("  rsbs r1,r2,#0x9a000000 ;@ do arithmetic\n");
+  ot("  rsb r11,r2,#0x9a000000 ;@ do arithmetic\n");
 
-  ot("  orrmi r9,r9,#0x80000000 ;@ N\n");
-  ot("  cmp r1,#0x9a000000\n");
+  ot("  cmp r11,#0x9a000000\n");
   ot("  beq finish%.4x\n",op);
   ot("\n");
 
-  ot("  mvn r3,r9,lsr #3 ;@ Undefined V behavior\n",op);
-  ot("  and r2,r1,#0x0f000000\n");
+  ot("  mvn r3,r11,lsr #31 ;@ Undefined V behavior\n",op);
+  ot("  and r2,r11,#0x0f000000\n");
   ot("  cmp r2,#0x0a000000\n");
-  ot("  andeq r1,r1,#0xf0000000\n");
-  ot("  addeq r1,r1,#0x10000000\n");
-  ot("  and r3,r3,r1,lsr #3 ;@ Undefined V behavior part II\n",op);
-  ot("  tst r1,r1\n");
-  ot("  orr r9,r9,r3 ;@ save V\n",op);
+  ot("  andeq r11,r11,#0xf0000000\n");
+  ot("  addeq r11,r11,#0x10000000\n");
+  ot("  and r3,r3,r11,lsr #31 ;@ Undefined V behavior part II\n",op);
+  ot("  movs r1,r11,asr #24\n");
   ot("  bicne r9,r9,#0x40000000 ;@ Z\n");
+  ot("  orr r9,r9,r3,lsl #28 ;@ save V\n",op);
   ot("  orr r9,r9,#0x20000000 ;@ C\n");
   ot("\n");
 
-  EaWrite(10,     1, ea,0,0x3f,1);
+  EaWrite(10,     1, ea,0,0x3f,0,0);
 
   ot("finish%.4x%s\n",op,ms?"":":");
+  ot("  tst r11,r11\n");
+  ot("  orrmi r9,r9,#0x80000000 ;@ N\n");
   ot("  str r9,[r7,#0x4c] ;@ Save X\n");
+  ot("\n");
 
   OpEnd(ea);
 
@@ -540,13 +551,22 @@ int OpAritha(int op)
   if(size==2&&(sea<0x10||sea==0x3c)) Cycles+=2;
   if(type==1) Cycles=6;
 
-  // must calculate reg EA first, because of situations like: suba.w (A0)+, A0
-  EaCalc (10,0x1e00, dea,2,1);
-  EaRead (10,    11, dea,2,0x1e00);
-
-  EaCalc ( 0,0x003f, sea,size,1);
-  EaRead ( 0,     0, sea,size,0x003f,1);
+  // EA calculation order defines how situations like  suba.w (A0)+, A0 get handled.
+  // different emus act differently in this situation, I couldn't fugure which is right behaviour.
+  //if (type == 1)
+  {
+    EaCalcReadNoSE(-1,0,sea,size,0x003f);
+    EaCalcReadNoSE(type!=1?10:-1,11,dea,2,0x0e00);
+  }
+#if 0
+  else
+  {
+    EaCalcReadNoSE(type!=1?10:-1,11,dea,2,0x0e00);
+    EaCalcReadNoSE(-1,0,sea,size,0x003f);
+  }
+#endif
 
+  if (size<2) ot("  mov r0,r0,asl #%d\n\n",size?16:24);
   if (size<2) asr=(char *)(size?",asr #16":",asr #24");
 
   if (type==0) ot("  sub r11,r11,r0%s\n",asr);
@@ -555,7 +575,7 @@ int OpAritha(int op)
   if (type==2) ot("  add r11,r11,r0%s\n",asr);
   ot("\n");
   
-  if (type!=1) EaWrite(10,    11, dea,2,0x0e00,1);
+  if (type!=1) EaWrite(10,    11, dea,2,0x0e00);
 
   OpEnd(sea);
 
@@ -596,7 +616,7 @@ int OpAddx(int op)
     ot(";@ Get src/dest EA vals\n");
     EaCalc (0,0x000f, sea,size,1);
     EaRead (0,    11, sea,size,0x000f,1);
-    EaCalcReadNoSE(10,0,dea,size,0x1e00);
+    EaCalcReadNoSE(10,0,dea,size,0x0e00);
   }
   else
   {
@@ -716,11 +736,11 @@ int OpCmpm(int op)
   OpStart(op,sea); Cycles=4;
 
   ot(";@ Get src operand into r10:\n");
-  EaCalc (0,0x1e00, sea,size,1);
-  EaRead (0,    10, sea,size,0x000f,1);
+  EaCalc (0,0x0007, sea,size,1);
+  EaRead (0,    10, sea,size,0x0007,1);
 
   ot(";@ Get dst operand into r0:\n");
-  EaCalcReadNoSE(-1,0,dea,size,0x1e00);
+  EaCalcReadNoSE(-1,0,dea,size,0x0e00);
 
   if (size<2) asl=(char *)(size?",asl #16":",asl #24");
 
@@ -785,7 +805,7 @@ int OpChk(int op)
   OpEnd(ea);
 
   ot("chktrap%.4x%s ;@ CHK exception:\n",op,ms?"":":");
-  ot("  mov r0,#0x18\n");
+  ot("  mov r0,#6\n");
   ot("  bl Exception\n");
   Cycles+=40;
   OpEnd(ea);