X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FCyclone%2FOpBranch.cpp;h=c24c7696e74f9d31ab376225337ecacdf3c818a8;hb=85a36a57a816ac643ee5f982d774532a0ca4d58b;hp=71f9785838fae0f070998f7bc878a46e51948c81;hpb=cc68a136aa179a5f32fe40208371eb9c2b0aadae;p=picodrive.git diff --git a/cpu/Cyclone/OpBranch.cpp b/cpu/Cyclone/OpBranch.cpp index 71f9785..c24c769 100644 --- a/cpu/Cyclone/OpBranch.cpp +++ b/cpu/Cyclone/OpBranch.cpp @@ -1,17 +1,21 @@ #include "app.h" -#if USE_CHECKPC_CALLBACK -static void CheckPc() +static void CheckPc(int reg) { +#if USE_CHECKPC_CALLBACK ot(";@ Check Memory Base+pc (r4)\n"); - ot(" add lr,pc,#4\n"); - ot(" mov r0,r4\n"); + if (reg != 0) + ot(" mov r0,r%i\n", reg); + ot(" mov lr,pc\n"); ot(" ldr pc,[r7,#0x64] ;@ Call checkpc()\n"); ot(" mov r4,r0\n"); +#else + if (reg != 4) + ot(" mov r4,r%i\n", reg); +#endif ot("\n"); } -#endif // Push 32-bit value in r1 - trashes r0-r3,r12,lr void OpPush32() @@ -56,9 +60,9 @@ static void PopPc() ot(" add r1,r0,#4 ;@ Postincrement A7\n"); ot(" str r1,[r7,#0x3c] ;@ Save A7\n"); MemHandler(0,2); - ot(" add r4,r0,r10 ;@ r4=Memory Base+PC\n"); + ot(" add r0,r0,r10 ;@ Memory Base+PC\n"); ot("\n"); - CheckPc(); + CheckPc(0); } int OpTrap(int op) @@ -68,14 +72,14 @@ int OpTrap(int op) use=op&~0xf; if (op!=use) { OpUse(op,use); return 0; } // Use existing handler - OpStart(op); + OpStart(op,0x10); ot(" and r0,r8,#0xf ;@ Get trap number\n"); ot(" orr r0,r0,#0x20\n"); ot(" mov r0,r0,asl #2\n"); ot(" bl Exception\n"); ot("\n"); - Cycles=38; OpEnd(); + Cycles=38; OpEnd(0x10); return 0; } @@ -90,7 +94,7 @@ int OpLink(int op) if (reg==7) use=op; if (op!=use) { OpUse(op,use); return 0; } // Use existing handler - OpStart(op); + OpStart(op,0x10); if(reg!=7) { ot(";@ Get An\n"); @@ -120,7 +124,7 @@ int OpLink(int op) ot("\n"); Cycles=16; - OpEnd(); + OpEnd(0x10); return 0; } @@ -132,11 +136,11 @@ int OpUnlk(int op) use=op&~7; if (op!=use) { OpUse(op,use); return 0; } // Use existing handler - OpStart(op); + OpStart(op,0x10); ot(";@ Get An\n"); - EaCalc(10, 7, 8, 2, 1); - EaRead(10, 0, 8, 2, 7, 1); + EaCalc(10, 0xf, 8, 2, 1); + EaRead(10, 0, 8, 2, 0xf, 1); ot(" add r11,r0,#4 ;@ A7+=4\n"); ot("\n"); @@ -147,9 +151,9 @@ int OpUnlk(int op) ot("\n"); ot(";@ An = value from stack:\n"); EaWrite(10, 0, 8, 2, 7, 1); - + Cycles=12; - OpEnd(); + OpEnd(0x10); return 0; } @@ -168,40 +172,39 @@ int Op4E70(int op) OpEnd(); return 0; - case 3: // rte - OpStart(op); Cycles=20; - SuperCheck(op); + case 3: // rte + OpStart(op,0x10); Cycles=20; + SuperCheck(op); PopSr(1); ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); PopPc(); - SuperChange(op); + SuperChange(op); CheckInterrupt(op); - OpEnd(); - SuperEnd(op); + OpEnd(0x10); return 0; case 5: // rts - OpStart(op); Cycles=16; + OpStart(op,0x10); Cycles=16; ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); PopPc(); - OpEnd(); + OpEnd(0x10); return 0; case 6: // trapv - OpStart(op); Cycles=4; + OpStart(op,0x10); Cycles=4; ot(" tst r9,#0x10000000\n"); ot(" subne r5,r5,#%i\n",30); ot(" movne r0,#0x1c ;@ TRAPV exception\n"); ot(" blne Exception\n"); - OpEnd(); + OpEnd(0x10); return 0; case 7: // rtr - OpStart(op); Cycles=20; + OpStart(op,0x10); Cycles=20; PopSr(0); ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); PopPc(); - OpEnd(); + OpEnd(0x10); return 0; default: @@ -221,27 +224,26 @@ int OpJsr(int op) // See if we can do this opcode: if (EaCanRead(sea,-1)==0) return 1; - use=OpBase(op); + use=OpBase(op,0); if (op!=use) { OpUse(op,use); return 0; } // Use existing handler - OpStart(op); + OpStart(op,(op&0x40)?0:0x10); ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); ot("\n"); - EaCalc(0,0x003f,sea,0); + EaCalc(11,0x003f,sea,0); ot(";@ Jump - Get new PC from r0\n"); if (op&0x40) { // Jmp - Get new PC from r0 - ot(" add r4,r0,r10 ;@ r4 = Memory Base + New PC\n"); + ot(" add r0,r11,r10 ;@ Memory Base + New PC\n"); ot("\n"); } else { ot(";@ Jsr - Push old PC first\n"); ot(" sub r1,r4,r10 ;@ r1 = Old PC\n"); - ot(" add r4,r0,r10 ;@ r4 = Memory Base + New PC\n"); ot(" mov r1,r1,lsl #8\n"); ot(" ldr r0,[r7,#0x3c]\n"); ot(" mov r1,r1,asr #8\n"); @@ -249,17 +251,16 @@ int OpJsr(int op) ot(" sub r0,r0,#4 ;@ Predecrement A7\n"); ot(" str r0,[r7,#0x3c] ;@ Save A7\n"); MemHandler(1,2); + ot(" add r0,r11,r10 ;@ Memory Base + New PC\n"); ot("\n"); } -#if USE_CHECKPC_CALLBACK - CheckPc(); -#endif + CheckPc(0); Cycles=(op&0x40) ? 4 : 12; Cycles+=Ea_add_ns((op&0x40) ? g_jmp_cycle_table : g_jsr_cycle_table, sea); - OpEnd(); + OpEnd((op&0x40)?0:0x10); return 0; } @@ -285,50 +286,61 @@ int OpDbra(int op) if (op!=use) { OpUse(op,use); return 0; } // Use existing handler OpStart(op); - if (cc>=2) + switch (cc) { - ot(";@ Is the condition true?\n"); - if ((cc&~1)==2) ot(" eor r9,r9,#0x20000000 ;@ Invert carry for hi/ls\n"); - ot(" msr cpsr_flg,r9 ;@ ARM flags = 68000 flags\n"); - if ((cc&~1)==2) ot(" eor r9,r9,#0x20000000\n"); - ot(";@ If so, don't dbra\n"); - ot(" b%s DbraTrue%.4x\n",Cond[cc],op); - ot("\n"); + case 0: // T + case 1: // F + break; + case 2: // hi + ot(" tst r9,#0x60000000 ;@ hi: !C && !Z\n"); + ot(" beq DbraTrue\n\n"); + break; + case 3: // ls + ot(" tst r9,#0x60000000 ;@ ls: C || Z\n"); + ot(" bne DbraTrue\n\n"); + break; + default: + ot(";@ Is the condition true?\n"); + ot(" msr cpsr_flg,r9 ;@ ARM flags = 68000 flags\n"); + ot(";@ If so, don't dbra\n"); + ot(" b%s DbraTrue\n\n",Cond[cc]); + break; } - ot(";@ Decrement Dn.w\n"); - ot(" and r1,r8,#0x0007\n"); - ot(" mov r1,r1,lsl #2\n"); - ot(" ldrsh r0,[r7,r1]\n"); - ot(" sub r0,r0,#1\n"); - ot(" strh r0,[r7,r1]\n"); - ot("\n"); + if (cc!=0) + { + ot(";@ Decrement Dn.w\n"); + ot(" and r1,r8,#0x0007\n"); + ot(" mov r1,r1,lsl #2\n"); + ot(" ldrsh r0,[r7,r1]\n"); + ot(" sub r0,r0,#1\n"); + ot(" strh r0,[r7,r1]\n"); + ot("\n"); - ot(";@ Check if Dn.w is -1\n"); - ot(" cmps r0,#-1\n"); - ot(" beq DbraMin1%.4x\n",op); - ot("\n"); + ot(";@ Check if Dn.w is -1\n"); + ot(" cmn r0,#1\n"); + ot("\n"); - ot(";@ Get Branch offset:\n"); - ot(" ldrsh r0,[r4]\n"); - ot(" add r4,r4,r0 ;@ r4 = New PC\n"); - ot("\n"); - Cycles=12-2; - OpEnd(); + ot(";@ Get Branch offset:\n"); + ot(" ldrnesh r0,[r4]\n"); + ot(" addeq r4,r4,#2 ;@ Skip branch offset\n"); + ot(" subeq r5,r5,#4 ;@ additional cycles\n"); + ot(" addne r4,r4,r0 ;@ r4 = New PC\n"); + ot("\n"); + Cycles=12-2; + OpEnd(); + } - ot(";@ Dn.w is -1:\n"); - ot("DbraMin1%.4x%s\n", op, ms?"":":"); - ot(" add r4,r4,#2 ;@ Skip branch offset\n"); - ot("\n"); - Cycles=12+2; - OpEnd(); - - ot(";@ condition true:\n"); - ot("DbraTrue%.4x%s\n", op, ms?"":":"); - ot(" add r4,r4,#2 ;@ Skip branch offset\n"); - ot("\n"); - Cycles=12; - OpEnd(); + //if (cc==0||cc>=2) + if (op==0x50c8) + { + ot(";@ condition true:\n"); + ot("DbraTrue%s\n", ms?"":":"); + ot(" add r4,r4,#2 ;@ Skip branch offset\n"); + ot("\n"); + Cycles=12; + OpEnd(); + } return 0; } @@ -340,6 +352,7 @@ int OpBranch(int op) int size=0,use=0; int offset=0; int cc=0; + char *asr_r11=""; offset=(char)(op&0xff); cc=(op>>8)&15; @@ -352,38 +365,48 @@ int OpBranch(int op) else use=(op&0xff00)+1; // Use same opcode for all 8-bit branches if (op!=use) { OpUse(op,use); return 0; } // Use existing handler - OpStart(op); - - ot(";@ Get Branch offset:\n"); - if (size) - { - EaCalc(0,0,0x3c,size); - EaRead(0,0,0x3c,size,0); - } - - // above code messes cycles + OpStart(op,size?0x10:0); Cycles=10; // Assume branch taken - if (size==0) ot(" mov r0,r8,asl #24 ;@ Shift 8-bit signed offset up...\n\n"); - if (cc==1) ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); - if (cc>=2) + switch (cc) { - ot(";@ Is the condition true?\n"); - if ((cc&~1)==2) ot(" eor r9,r9,#0x20000000 ;@ Invert carry for hi/ls\n"); - ot(" msr cpsr_flg,r9 ;@ ARM flags = 68000 flags\n"); - if ((cc&~1)==2) ot(" eor r9,r9,#0x20000000\n"); - - if (size==0) ot(" mov r0,r0,asr #24 ;@ ...shift down\n\n"); - - ot(" b%s DontBranch%.4x\n",Cond[cc^1],op); + case 0: // T + case 1: // F + break; + case 2: // hi + ot(" tst r9,#0x60000000 ;@ hi: !C && !Z\n"); + ot(" bne BccDontBranch%i\n\n",8<=2) + // since all "DontBranch" code is same for every size, output only once + if (cc>=2&&(op&0xff00)==0x6200) { - ot("DontBranch%.4x%s\n", op, ms?"":":"); - Cycles+=(size==1)? 2 : -2; // Branch not taken - OpEnd(); + ot("BccDontBranch%i%s\n", 8<