X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FCyclone%2FOpArith.cpp;h=93d34a24dcd914e66188c58114e7e15b0ab5231a;hb=547045e3c65ca34ea2a02a4da55c27aa94d8f316;hp=74673b8f730e548f5e71d100436c8e4c806d9f4c;hpb=3a5e6cf8477084dd63ab1eeadef88db3d218caea;p=picodrive.git diff --git a/cpu/Cyclone/OpArith.cpp b/cpu/Cyclone/OpArith.cpp index 74673b8..93d34a2 100644 --- a/cpu/Cyclone/OpArith.cpp +++ b/cpu/Cyclone/OpArith.cpp @@ -20,27 +20,26 @@ int OpArith(int op) if (EaCanRead(tea,size)==0) return 1; if (EaCanWrite(tea)==0 || EaAn(tea)) return 1; - use=OpBase(op); + use=OpBase(op,size); if (op!=use) { OpUse(op,use); return 0; } // Use existing handler OpStart(op, sea, tea); Cycles=4; - EaCalc(10,0x0000, sea,size,1); - EaCalc(11,0x003f, tea,size,1); - EaRead(10, 10, sea,size,0,0,0); - EaRead(11, 0, tea,size,0x003f,1); + // imm must be read first + EaCalcReadNoSE(-1,10,sea,size,0); + EaCalcReadNoSE((type!=6)?11:-1,0,tea,size,0x003f); - if (size==0) shiftstr=",asl #24"; - else if (size==1) shiftstr=",asl #16"; + if (size<2) shiftstr=(char *)(size?",asl #16":",asl #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 @@ -92,7 +91,7 @@ int OpAddq(int op) if (EaCanWrite(ea) ==0) return 1; if (size == 0 && EaAn(ea) ) return 1; - use=OpBase(op,1); + use=OpBase(op,size,1); if (num!=8) use|=0x0e00; // If num is not 8, use same handler if (op!=use) { OpUse(op,use); return 0; } // Use existing handler @@ -104,8 +103,7 @@ int OpAddq(int op) if (size>0 && (ea&0x38)==0x08) size=2; // addq.w #n,An is also 32-bit - EaCalc(10,0x003f, ea,size,1); - EaRead(10, 0, ea,size,0x003f,1); + EaCalcReadNoSE(10,0,ea,size,0x003f); shift=32-(8<>12)&5; rea =(op>> 9)&7; @@ -158,26 +160,27 @@ int OpArithReg(int op) if (dir && EaCanWrite(ea)==0) return 1; if ((size==0||!(type&1))&&EaAn(ea)) return 1; - use=OpBase(op); + use=OpBase(op,size); use&=~0x0e00; // Use same opcode for Dn if (op!=use) { OpUse(op,use); return 0; } // Use existing handler OpStart(op,ea); Cycles=4; - ot(";@ Get r10=EA r11=EA value\n"); - EaCalc(10,0x003f, ea,size,1); - EaRead(10, 11, ea,size,0x003f,1); - ot(";@ Get r0=Register r1=Register value\n"); - EaCalc( 0,0x0e00,rea,size,1); - EaRead( 0, 1,rea,size,0x0e00,1); + EaCalcReadNoSE(dir?10:-1,0,ea,size,0x003f); + + EaCalcReadNoSE(dir?-1:10,1,rea,size,0x0e00); ot(";@ Do arithmetic:\n"); - if (type==0) ot(" orr "); - if (type==1) ot(" subs "); - if (type==4) ot(" and "); - if (type==5) ot(" adds "); - if (dir) ot("r1,r11,r1\n"); - else ot("r1,r1,r11\n"); + if (type==0) strop = "orr"; + if (type==1) strop = (char *) (dir ? "subs" : "rsbs"); + if (type==4) strop = "and"; + if (type==5) strop = "adds"; + + if (size==0) asl=",asl #24"; + if (size==1) asl=",asl #16"; + + if (size<2) ot(" mov r0,r0%s\n",asl); + ot(" %s r1,r0,r1%s\n",strop,asl); if ((type&1)==0) ot(" adds r1,r1,#0 ;@ Defines NZ, clears CV\n"); @@ -185,8 +188,9 @@ int OpArithReg(int op) ot("\n"); ot(";@ Save result:\n"); - if (dir) EaWrite(10, 1, ea,size,0x003f,1); - else EaWrite( 0, 1,rea,size,0x0e00,1); + if (size<2) ot(" mov r1,r1,asr #%d\n",size?16:24); + if (dir) EaWrite(10, 1, ea,size,0x003f,0,0); + else EaWrite(10, 1,rea,size,0x0e00,0,0); if(rea==ea) { if(ea<8) Cycles=(size>=2)?8:4; else Cycles+=(size>=2)?26:14; @@ -220,7 +224,7 @@ int OpMul(int op) // See if we can do this opcode: if (EaCanRead(ea,1)==0||EaAn(ea)) return 1; - use=OpBase(op); + use=OpBase(op,1); use&=~0x0e00; // Use same for all registers if (op!=use) { OpUse(op,use); return 0; } // Use existing handler @@ -228,40 +232,45 @@ int OpMul(int op) if(type) Cycles=54; else Cycles=sign?158:140; - EaCalc(10,0x003f, ea, 1); - EaRead(10, 10, ea, 1,0x003f); + EaCalcReadNoSE(-1,0,ea,1,0x003f); + + EaCalc(10,0x0e00,rea, 2); + EaRead(10, 2,rea, 2,0x0e00); - EaCalc (0,0x0e00,rea, 2,1); - EaRead (0, 2,rea, 2,0x0e00,1); + ot(" movs r1,r0,asl #16\n"); if (type==0) // div { // the manual says C is always cleared, but neither Musashi nor FAME do that //ot(" bic r9,r9,#0x20000000 ;@ always clear C\n"); - ot(" tst r10,r10\n"); ot(" beq divzero%.4x ;@ division by zero\n",op); ot("\n"); if (sign) { ot(" mov r11,#0 ;@ r11 = 1 or 2 if the result is negative\n"); - ot(" orrmi r11,r11,#1\n"); - ot(" rsbmi r10,r10,#0 ;@ Make r10 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 r10,r10,lsl #16 ;@ use only 16 bits of divisor\n"); - ot(" mov r10,r10,lsr #16\n"); + ot(" mov r0,r1,lsr #16 ;@ use only 16 bits of divisor\n"); } - ot(";@ Divide r2 by r10\n"); + ot("\n"); + ot(";@ Divide r2 by r0\n"); ot(" mov r3,#0\n"); - ot(" mov r1,r10\n"); + ot(" mov r1,r0\n"); ot("\n"); ot(";@ Shift up divisor till it's just less than numerator\n"); ot("Shift%.4x%s\n",op,ms?"":":"); @@ -274,7 +283,7 @@ int OpMul(int op) ot(" cmp r2,r1\n"); ot(" adc r3,r3,r3 ;@ Double r3 and add 1 if carry set\n"); ot(" subcs r2,r2,r1\n"); - ot(" teq r1,r10\n"); + ot(" teq r1,r0\n"); ot(" movne r1,r1,lsr #1\n"); ot(" bne Divide%.4x\n",op); ot("\n"); @@ -295,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 { @@ -302,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"); @@ -314,33 +326,32 @@ int OpMul(int op) if (type==1) { - char *shift="asr"; - ot(";@ Get 16-bit signs right:\n"); - if (sign==0) { ot(" mov r10,r10,lsl #16\n"); shift="lsr"; } + ot(" mov r0,r1,%s #16\n",sign?"asr":"lsr"); ot(" mov r2,r2,lsl #16\n"); - - if (sign==0) ot(" mov r10,r10,lsr #16\n"); - ot(" mov r2,r2,%s #16\n",shift); + ot(" mov r2,r2,%s #16\n",sign?"asr":"lsr"); ot("\n"); - ot(" mul r1,r2,r10\n"); + ot(" mul r1,r2,r0\n"); ot(" adds r1,r1,#0 ;@ Defines NZ, clears CV\n"); OpGetFlags(0,0); } ot("\n"); - EaWrite(0, 1,rea, 2,0x0e00,1); + EaWrite(10, 1,rea, 2,0x0e00,1); - ot("endofop%.4x%s\n",op,ms?"":":"); + if (type==0) ot("endofop%.4x%s\n",op,ms?"":":"); OpEnd(ea); - ot("divzero%.4x%s\n",op,ms?"":":"); - ot(" mov r0,#0x14 ;@ Divide by zero\n"); - ot(" bl Exception\n"); - Cycles+=38; - OpEnd(ea); - ot("\n"); + if (type==0) // div + { + ot("divzero%.4x%s\n",op,ms?"":":"); + ot(" mov r0,#0x14 ;@ Divide by zero\n"); + ot(" bl Exception\n"); + Cycles+=38; + OpEnd(ea); + ot("\n"); + } return 0; } @@ -349,9 +360,8 @@ int OpMul(int op) int GetXBit(int subtract) { ot(";@ Get X bit:\n"); - ot(" ldrb r2,[r7,#0x45]\n"); - if (subtract) ot(" mvn r2,r2,lsl #28 ;@ Invert it\n"); - else ot(" mov r2,r2,lsl #28\n"); + ot(" ldr r2,[r7,#0x4c]\n"); + if (subtract) ot(" mvn r2,r2 ;@ Invert it\n"); ot(" msr cpsr_flg,r2 ;@ Get into Carry\n"); ot("\n"); return 0; @@ -362,34 +372,46 @@ int GetXBit(int subtract) int OpAbcd(int op) { int use=0; - int type=0,sea=0,addr=0,dea=0; + int type=0,sea=0,mem=0,dea=0; type=(op>>14)&1; // sbcd/abcd dea =(op>> 9)&7; - addr=(op>> 3)&1; + mem =(op>> 3)&1; sea = op &7; - if (addr) { sea|=0x20; dea|=0x20; } + if (mem) { sea|=0x20; dea|=0x20; } use=op&~0x0e07; // Use same opcode for all registers.. - if (sea==0x27||dea==0x27) use=op; // ..except -(a7) + if (sea==0x27) use|=0x0007; // ___x.b -(a7) + if (dea==0x27) use|=0x0e00; // ___x.b -(a7) if (op!=use) { OpUse(op,use); return 0; } // Use existing handler OpStart(op,sea,dea); Cycles=6; - EaCalc( 0,0x0007, sea,0,1); - EaRead( 0, 10, sea,0,0x0007,1); - EaCalc(11,0x0e00, dea,0,1); - EaRead(11, 1, dea,0,0x0e00,1); + if (mem) + { + 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,0x0e00); + } + else + { + ot(";@ Get src/dest reg vals\n"); + EaCalcReadNoSE(-1,10,sea,0,0x0007); + EaCalcReadNoSE(11,0,dea,0,0x0e00); + ot(" mov r10,r10,asl #24\n"); + } + ot(" mov r1,r0,asl #24\n\n"); ot(" bic r9,r9,#0xb1000000 ;@ clear all flags except old Z\n"); if (type) { - ot(" ldrb r0,[r7,#0x45] ;@ Get X bit\n"); + ot(" ldr r0,[r7,#0x4c] ;@ Get X bit\n"); ot(" mov r3,#0x00f00000\n"); ot(" and r2,r3,r1,lsr #4\n"); - ot(" tst r0,#2\n"); + ot(" tst r0,#0x20000000\n"); ot(" and r0,r3,r10,lsr #4\n"); ot(" add r0,r0,r2\n"); ot(" addne r0,r0,#0x00100000\n"); @@ -413,10 +435,10 @@ int OpAbcd(int op) } else { - ot(" ldrb r0,[r7,#0x45] ;@ Get X bit\n"); + ot(" ldr r0,[r7,#0x4c] ;@ Get X bit\n"); ot(" mov r3,#0x00f00000\n"); ot(" and r2,r3,r10,lsr #4\n"); - ot(" tst r0,#2\n"); + ot(" tst r0,#0x20000000\n"); ot(" and r0,r3,r1,lsr #4\n"); ot(" sub r0,r0,r2\n"); ot(" subne r0,r0,#0x00100000\n"); @@ -439,8 +461,8 @@ int OpAbcd(int op) ot(" bicne r9,r9,#0x40000000 ;@ Z flag\n"); } - ot(" mov r2,r9,lsr #28\n"); - ot(" strb r2,[r7,#0x45] ;@ Save X bit\n"); + ot(" str r9,[r7,#0x4c] ;@ Save X bit\n"); + ot("\n"); EaWrite(11, 0, dea,0,0x0e00,1); OpEnd(sea,dea); @@ -448,7 +470,7 @@ int OpAbcd(int op) return 0; } -// 01008000 00eeeeee - nbcd +// 01001000 00eeeeee - nbcd int OpNbcd(int op) { int use=0; @@ -458,45 +480,45 @@ int OpNbcd(int op) if(EaCanWrite(ea)==0||EaAn(ea)) return 1; - use=OpBase(op); + use=OpBase(op,0); if(op!=use) { OpUse(op,use); return 0; } // Use existing handler OpStart(op,ea); Cycles=6; if(ea >= 8) Cycles+=2; - EaCalc(10,0x3f, ea,0,1); - EaRead(10, 0, ea,0,0x3f,1); + EaCalcReadNoSE(10,0,ea,0,0x003f); // this is rewrite of Musashi's code - ot(" ldrb r2,[r7,#0x45]\n"); - ot(" tst r2,#2\n"); - ot(" mov r2,r0\n"); - ot(" addne r2,r0,#0x01000000 ;@ add X\n"); - ot(" rsbs r1,r2,#0x9a000000 ;@ do arithmetic\n"); - + ot(" ldr r2,[r7,#0x4c]\n"); ot(" bic r9,r9,#0xb0000000 ;@ clear all flags, except Z\n"); - ot(" orrmi r9,r9,#0x80000000 ;@ N\n"); - ot(" cmp r1,#0x9a000000\n"); + ot(" mov r0,r0,asl #24\n"); + ot(" and r2,r2,#0x20000000\n"); + ot(" add r2,r0,r2,lsr #5 ;@ add X\n"); + ot(" rsb r11,r2,#0x9a000000 ;@ do arithmetic\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(" mov r2,r9,lsr #28\n"); - ot(" strb r2, [r7,#0x45]\n"); + ot(" tst r11,r11\n"); + ot(" orrmi r9,r9,#0x80000000 ;@ N\n"); + ot(" str r9,[r7,#0x4c] ;@ Save X\n"); + ot("\n"); OpEnd(ea); @@ -509,6 +531,7 @@ int OpAritha(int op) { int use=0; int type=0,size=0,sea=0,dea=0; + char *asr=""; // Suba/Cmpa/Adda/(invalid): type=(op>>13)&3; if (type>=3) return 1; @@ -520,7 +543,7 @@ int OpAritha(int op) // See if we can do this opcode: if (EaCanRead(sea,size)==0) return 1; - use=OpBase(op); + use=OpBase(op,size); use&=~0x0e00; // Use same opcode for An if (op!=use) { OpUse(op,use); return 0; } // Use existing handler @@ -528,21 +551,29 @@ 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,0x0e00, dea,2,1); - EaRead (10, 11, dea,2,0x0e00); + // 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); + } + else + { + EaCalcReadNoSE(type!=1?10:-1,11,dea,2,0x0e00); + EaCalcReadNoSE(-1,0,sea,size,0x003f); + } - EaCalc ( 0,0x003f, sea,size); - EaRead ( 0, 0, sea,size,0x003f); + 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\n"); - if (type==1) ot(" cmp r11,r0 ;@ Defines NZCV\n"); + if (type==0) ot(" sub r11,r11,r0%s\n",asr); + if (type==1) ot(" cmp r11,r0%s ;@ Defines NZCV\n",asr); if (type==1) OpGetFlags(1,0); // Get Cmp flags - if (type==2) ot(" add r11,r11,r0\n"); + 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); @@ -555,8 +586,9 @@ int OpAddx(int op) { int use=0; int type=0,size=0,dea=0,sea=0,mem=0; + char *asl=""; - type=(op>>12)&5; + type=(op>>14)&1; dea =(op>> 9)&7; size=(op>> 6)&3; if (size>=3) return 1; sea = op&7; @@ -569,24 +601,35 @@ int OpAddx(int op) if(mem) { sea+=0x20; dea+=0x20; } use=op&~0x0e07; // Use same opcode for Dn - if (size==0&&(sea==0x27||dea==0x27)) use=op; // ___x.b -(a7) + if (size==0&&sea==0x27) use|=0x0007; // ___x.b -(a7) + if (size==0&&dea==0x27) use|=0x0e00; // ___x.b -(a7) if (op!=use) { OpUse(op,use); return 0; } // Use existing handler OpStart(op,sea,dea); Cycles=4; if(size>=2) Cycles+=4; if(sea>=0x10) Cycles+=2; - ot(";@ Get r10=EA r11=EA value\n"); - EaCalc( 0,0x0007,sea,size,1); - EaRead( 0, 11,sea,size,0x0007,1); - ot(";@ Get r0=Register r1=Register value\n"); - EaCalc( 0,0x0e00,dea,size,1); - EaRead( 0, 1,dea,size,0x0e00,1); + if (mem) + { + 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,0x0e00); + } + else + { + ot(";@ Get src/dest reg vals\n"); + EaCalcReadNoSE(-1,11,sea,size,0x0007); + EaCalcReadNoSE(10,0,dea,size,0x0e00); + if (size<2) ot(" mov r11,r11,asl #%d\n\n",size?16:24); + } + + if (size<2) asl=(char *)(size?",asl #16":",asl #24"); ot(";@ Do arithmetic:\n"); - GetXBit(type==1); + GetXBit(type==0); - if (type==5 && size<2) + if (type==1 && size<2) { ot(";@ Make sure the carry bit will tip the balance:\n"); ot(" mvn r2,#0\n"); @@ -594,10 +637,10 @@ int OpAddx(int op) ot("\n"); } - if (type==1) ot(" sbcs r1,r1,r11\n"); - if (type==5) ot(" adcs r1,r1,r11\n"); + if (type==0) ot(" rscs r1,r11,r0%s\n",asl); + if (type==1) ot(" adcs r1,r11,r0%s\n",asl); ot(" orr r3,r9,#0xb0000000 ;@ for old Z\n"); - OpGetFlags(type==1,1,0); // subtract + OpGetFlags(type==0,1,0); // subtract if (size<2) { ot(" movs r2,r1,lsr #%i\n", size?16:24); ot(" orreq r9,r9,#0x40000000 ;@ add potentially missed Z\n"); @@ -606,7 +649,7 @@ int OpAddx(int op) ot("\n"); ot(";@ Save result:\n"); - EaWrite( 0, 1, dea,size,0x0e00,1); + EaWrite(10, 1, dea,size,0x0e00,1); OpEnd(sea,dea); @@ -619,6 +662,7 @@ int OpCmpEor(int op) { int rea=0,eor=0; int size=0,ea=0,use=0; + char *asl=""; // Get EA and register EA rea=(op>>9)&7; @@ -633,7 +677,7 @@ int OpCmpEor(int op) if (eor && EaCanWrite(ea)==0) return 1; if (EaAn(ea)&&(eor||size==0)) return 1; - use=OpBase(op); + use=OpBase(op,size); use&=~0x0e00; // Use 1 handler for register d0-7 if (op!=use) { OpUse(op,use); return 0; } // Use existing handler @@ -646,18 +690,19 @@ int OpCmpEor(int op) } ot(";@ Get EA into r10 and value into r0:\n"); - EaCalc (10,0x003f, ea,size,1); - EaRead (10, 0, ea,size,0x003f,1); + EaCalcReadNoSE(eor?10:-1,0,ea,size,0x003f); ot(";@ Get register operand into r1:\n"); - EaCalc (1, 0x0e00, rea,size,1); - EaRead (1, 1, rea,size,0x0e00,1); + EaCalcReadNoSE(-1,1,rea,size,0x0e00); + + if (size<2) ot(" mov r0,r0,asl #%d\n\n",size?16:24); + if (size<2) asl=(char *)(size?",asl #16":",asl #24"); ot(";@ Do arithmetic:\n"); - if (eor==0) ot(" cmp r1,r0\n"); + if (eor==0) ot(" rsbs r1,r0,r1%s\n",asl); if (eor) { - ot(" eor r1,r0,r1\n"); + ot(" eor r1,r0,r1%s\n",asl); ot(" adds r1,r1,#0 ;@ Defines NZ, clears CV\n"); } @@ -674,6 +719,7 @@ int OpCmpEor(int op) int OpCmpm(int op) { int size=0,sea=0,dea=0,use=0; + char *asl=""; // get size, get EAs size=(op>>6)&3; if (size>=3) return 1; @@ -681,21 +727,24 @@ int OpCmpm(int op) dea=(op>>9)&0x3f; use=op&~0x0e07; // Use 1 handler for all registers.. - if (size==0&&(sea==0x1f||dea==0x1f)) use=op; // ..except (a7)+ + if (size==0&&sea==0x1f) use|=0x0007; // ..except (a7)+ + if (size==0&&dea==0x1f) use|=0x0e00; if (op!=use) { OpUse(op,use); return 0; } // Use existing handler OpStart(op,sea); Cycles=4; ot(";@ Get src operand into r10:\n"); - EaCalc (0,0x000f, 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"); - EaCalc (0,0x1e00, dea,size,1); - EaRead (0, 0, dea,size,0x1e00,1); + EaCalcReadNoSE(-1,0,dea,size,0x0e00); + + if (size<2) asl=(char *)(size?",asl #16":",asl #24"); - ot(" cmp r0,r10\n"); + ot(" rsbs r0,r10,r0%s\n",asl); OpGetFlags(1,0); // Cmp like subtract + ot("\n"); OpEnd(sea); return 0; @@ -721,19 +770,20 @@ int OpChk(int op) // See if we can do this opcode: if (EaCanRead(ea,size)==0) return 1; - use=OpBase(op); + use=OpBase(op,size); use&=~0x0e00; // Use 1 handler for register d0-7 if (op!=use) { OpUse(op,use); return 0; } // Use existing handler OpStart(op,ea); Cycles=10; ot(";@ Get EA into r10 and value into r0:\n"); - EaCalc (10,0x003f, ea,size,1); - EaRead (10, 0, ea,size,0x003f,1); + EaCalcReadNoSE(-1,0,ea,size,0x003f); ot(";@ Get register operand into r1:\n"); - EaCalc (1, 0x0e00, rea,size,1); - EaRead (1, 1, rea,size,0x0e00,1); + EaCalcReadNoSE(-1,1,rea,size,0x0e00); + + if (size<2) ot(" mov r0,r0,asl #%d\n",size?16:24); + if (size<2) ot(" mov r1,r1,asl #%d\n\n",size?16:24); ot(";@ get flags, including undocumented ones\n"); ot(" and r3,r9,#0x80000000\n"); @@ -744,12 +794,11 @@ int OpChk(int op) ot(" bmi chktrap%.4x\n",op); ot(";@ Do arithmetic:\n"); + ot(" bic r9,r9,#0x80000000 ;@ N\n"); ot(" cmp r1,r0\n"); - ot(" bicgt r9,r9,#0x80000000 ;@ N\n"); ot(" bgt chktrap%.4x\n",op); ot(";@ old N remains\n"); - ot(" bic r9,r9,#0x80000000 ;@ N\n"); ot(" orr r9,r9,r3\n"); OpEnd(ea);