X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FCyclone%2FOpBranch.cpp;h=63569da199b82b39bfcdadee16fc1019f36974d4;hb=e743be2070a13d14cae39a55b815b62b0edb6776;hp=5d132cf5add8beeb72797430000c084768dd124f;hpb=03c5768cb5cb2cd8a7ea3e4383fd10065d27970e;p=picodrive.git diff --git a/cpu/Cyclone/OpBranch.cpp b/cpu/Cyclone/OpBranch.cpp index 5d132cf..63569da 100644 --- a/cpu/Cyclone/OpBranch.cpp +++ b/cpu/Cyclone/OpBranch.cpp @@ -1,20 +1,19 @@ #include "app.h" -static void CheckPc(int reg) +// in/out address in r0, trashes all temp regs +static void CheckPc(void) { #if USE_CHECKPC_CALLBACK - ot(";@ Check Memory Base+pc (r4)\n"); - if (reg != 0) - ot(" mov r0,r%i\n", reg); + #ifdef MEMHANDLERS_DIRECT_PREFIX + ot(" bl %scheckpc ;@ Call checkpc()\n", MEMHANDLERS_DIRECT_PREFIX); + #else + ot(";@ Check Memory Base+pc\n"); 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 +#endif } // Push 32-bit value in r1 - trashes r0-r3,r12,lr @@ -52,7 +51,7 @@ static void PopSr(int high) OpRegToFlags(high); } -// Pop PC - assumes r10=Memory Base - trashes r0-r3 +// Pop PC - trashes r0-r3 static void PopPc() { ot(";@ Pop PC:\n"); @@ -60,9 +59,15 @@ static void PopPc() ot(" add r1,r0,#4 ;@ Postincrement A7\n"); ot(" str r1,[r7,#0x3c] ;@ Save A7\n"); MemHandler(0,2); - ot(" add r0,r0,r10 ;@ Memory Base+PC\n"); + ot(" ldr r1,[r7,#0x60] ;@ Get Memory base\n"); + ot(" add r0,r0,r1 ;@ Memory Base+PC\n"); ot("\n"); - CheckPc(0); + CheckPc(); +#if EMULATE_ADDRESS_ERRORS_JUMP + ot(" mov r4,r0\n"); +#else + ot(" bic r4,r0,#1\n"); +#endif } int OpTrap(int op) @@ -74,8 +79,7 @@ int OpTrap(int 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(" orr r0,r0,#0x20 ;@ 32+n\n"); ot(" bl Exception\n"); ot("\n"); @@ -98,13 +102,13 @@ int OpLink(int op) if(reg!=7) { ot(";@ Get An\n"); - EaCalc(10, 7, 8, 2, 1); - EaRead(10, 1, 8, 2, 7, 1); + EaCalc(11, 7, 8, 2, 1); + EaRead(11, 1, 8, 2, 7, 1); } ot(" ldr r0,[r7,#0x3c] ;@ Get A7\n"); ot(" sub r0,r0,#4 ;@ A7-=4\n"); - ot(" mov r11,r0\n"); + ot(" mov r8,r0 ;@ abuse r8\n"); if(reg==7) ot(" mov r1,r0\n"); ot("\n"); @@ -113,14 +117,14 @@ int OpLink(int op) ot(";@ Save to An\n"); if(reg!=7) - EaWrite(10,11, 8, 2, 7, 1); + EaWrite(11,8, 8, 2, 7, 1); ot(";@ Get offset:\n"); - EaCalc(0,0,0x3c,1); + EaCalc(0,0,0x3c,1); // abused r8 is ok because of imm EA EaRead(0,0,0x3c,1,0); - ot(" add r11,r11,r0 ;@ Add offset to A7\n"); - ot(" str r11,[r7,#0x3c]\n"); + ot(" add r8,r8,r0 ;@ Add offset to A7\n"); + ot(" str r8,[r7,#0x3c]\n"); ot("\n"); Cycles=16; @@ -139,18 +143,18 @@ int OpUnlk(int op) OpStart(op,0x10); ot(";@ Get An\n"); - EaCalc(10, 0xf, 8, 2, 1); - EaRead(10, 0, 8, 2, 0xf, 1); + EaCalc(11, 0xf, 8, 2, 1); + EaRead(11, 0, 8, 2, 0xf, 1); - ot(" add r11,r0,#4 ;@ A7+=4\n"); + ot(" add r8,r0,#4 ;@ A7+=4, abuse r8\n"); ot("\n"); ot(";@ Pop An from stack:\n"); MemHandler(0,2); ot("\n"); - ot(" str r11,[r7,#0x3c] ;@ Save A7\n"); + ot(" str r8,[r7,#0x3c] ;@ Save A7\n"); ot("\n"); ot(";@ An = value from stack:\n"); - EaWrite(10, 0, 8, 2, 7, 1); + EaWrite(11, 0, 8, 2, 7, 1); Cycles=12; OpEnd(0x10); @@ -174,37 +178,53 @@ int Op4E70(int op) return 0; case 3: // rte - OpStart(op,0x10); Cycles=20; - SuperCheck(op); + OpStart(op,0x10,0,0,1); Cycles=20; PopSr(1); - ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); PopPc(); - SuperChange(op); - CheckInterrupt(op); - OpEnd(0x10); + ot(" ldr r1,[r7,#0x44] ;@ reload SR high\n"); + SuperChange(op,1); +#if EMULATE_ADDRESS_ERRORS_JUMP || EMULATE_ADDRESS_ERRORS_IO || EMULATE_HALT + ot(" ldr r1,[r7,#0x58]\n"); + ot(" bic r1,r1,#0x0c ;@ clear 'not processing instruction' and 'doing addr error' bits\n"); + ot(" str r1,[r7,#0x58]\n"); +#endif +#if EMULATE_ADDRESS_ERRORS_JUMP + ot(" tst r4,#1 ;@ address error?\n"); + ot(" bne ExceptionAddressError_r_prg_r4\n"); +#endif + opend_check_interrupt = 1; + opend_check_trace = 1; + OpEnd(0x10,0); return 0; case 5: // rts OpStart(op,0x10); Cycles=16; - ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); PopPc(); +#if EMULATE_ADDRESS_ERRORS_JUMP + ot(" tst r4,#1 ;@ address error?\n"); + ot(" bne ExceptionAddressError_r_prg_r4\n"); +#endif OpEnd(0x10); return 0; case 6: // trapv - OpStart(op,0x10); Cycles=4; - ot(" tst r9,#0x10000000\n"); - ot(" subne r5,r5,#%i\n",30); - ot(" movne r0,#0x1c ;@ TRAPV exception\n"); + OpStart(op,0x10,0,1); Cycles=4; + ot(" tst r10,#0x10000000\n"); + ot(" subne r5,r5,#%i\n",34); + ot(" movne r0,#7 ;@ TRAPV exception\n"); ot(" blne Exception\n"); - OpEnd(0x10); + opend_op_changes_cycles = 1; + OpEnd(0x10,0); return 0; case 7: // rtr OpStart(op,0x10); Cycles=20; PopSr(0); - ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); PopPc(); +#if EMULATE_ADDRESS_ERRORS_JUMP + ot(" tst r4,#1 ;@ address error?\n"); + ot(" bne ExceptionAddressError_r_prg_r4\n"); +#endif OpEnd(0x10); return 0; @@ -230,34 +250,37 @@ int OpJsr(int op) OpStart(op,(op&0x40)?0:0x10); - ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); + ot(" ldr r11,[r7,#0x60] ;@ Get Memory base\n"); ot("\n"); - EaCalc(11,0x003f,sea,0); + EaCalc(12,0x003f,sea,0); - ot(";@ Jump - Get new PC from r0\n"); - if (op&0x40) + ot(";@ Jump - Get new PC from r12\n"); + ot(" add r0,r12,r11 ;@ Memory Base + New PC\n"); + ot("\n"); + CheckPc(); + if (!(op&0x40)) { - // Jmp - Get new PC from r11 - ot(" add r0,r11,r10 ;@ Memory Base + New PC\n"); - ot("\n"); + ot(" ldr r2,[r7,#0x3c]\n"); + ot(" sub r1,r4,r11 ;@ r1 = Old PC\n"); } - else +#if EMULATE_ADDRESS_ERRORS_JUMP + // jsr prefetches next instruction before pushing old PC, + // according to http://pasti.fxatari.com/68kdocs/68kPrefetch.html + ot(" mov r4,r0\n"); + ot(" tst r4,#1 ;@ address error?\n"); + ot(" bne ExceptionAddressError_r_prg_r4\n"); +#else + ot(" bic r4,r0,#1\n"); +#endif + + if (!(op&0x40)) { - ot(";@ Jsr - Push old PC first\n"); - ot(" sub r1,r4,r10 ;@ r1 = Old PC\n"); - ot(" mov r1,r1,lsl #8\n"); - ot(" ldr r0,[r7,#0x3c]\n"); - ot(" mov r1,r1,asr #8\n"); - ot(";@ Push r1 onto stack\n"); - ot(" sub r0,r0,#4 ;@ Predecrement A7\n"); + ot(";@ Push old PC onto stack\n"); + ot(" sub r0,r2,#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"); } - CheckPc(0); - Cycles=(op&0x40) ? 4 : 12; Cycles+=Ea_add_ns((op&0x40) ? g_jmp_cycle_table : g_jsr_cycle_table, sea); @@ -269,7 +292,7 @@ int OpJsr(int op) // --------------------- Opcodes 0x50c8+ --------------------- // ARM version of 68000 condition codes: -static char *Cond[16]= +static const char * const Cond[16]= { "", "", "hi","ls","cc","cs","ne","eq", "vc","vs","pl","mi","ge","lt","gt","le" @@ -293,16 +316,16 @@ int OpDbra(int op) case 1: // F break; case 2: // hi - ot(" tst r9,#0x60000000 ;@ hi: !C && !Z\n"); + ot(" tst r10,#0x60000000 ;@ hi: !C && !Z\n"); ot(" beq DbraTrue\n\n"); break; case 3: // ls - ot(" tst r9,#0x60000000 ;@ ls: C || Z\n"); + ot(" tst r10,#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(" msr cpsr_flg,r10 ;@ ARM flags = 68000 flags\n"); ot(";@ If so, don't dbra\n"); ot(" b%s DbraTrue\n\n",Cond[cc]); break; @@ -321,14 +344,21 @@ int OpDbra(int op) ot(";@ Check if Dn.w is -1\n"); ot(" cmn r0,#1\n"); -#if USE_CHECKPC_CALLBACK && USE_CHECKPC_DBRA +#if (USE_CHECKPC_CALLBACK && USE_CHECKPC_DBRA) || EMULATE_ADDRESS_ERRORS_JUMP ot(" beq DbraMin1\n"); ot("\n"); ot(";@ Get Branch offset:\n"); ot(" ldrsh r0,[r4]\n"); - ot(" add r0,r4,r0 ;@ r4 = New PC\n"); - CheckPc(0); + ot(" add r0,r4,r0 ;@ r0 = New PC\n"); + CheckPc(); +#if EMULATE_ADDRESS_ERRORS_JUMP + ot(" mov r4,r0\n"); + ot(" tst r4,#1 ;@ address error?\n"); + ot(" bne ExceptionAddressError_r_prg_r4\n"); +#else + ot(" bic r4,r0,#1\n"); +#endif #else ot("\n"); ot(";@ Get Branch offset:\n"); @@ -336,6 +366,7 @@ int OpDbra(int op) 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(" bic r4,r4,#1\n"); // we do not emulate address errors ot("\n"); #endif Cycles=12-2; @@ -353,7 +384,7 @@ int OpDbra(int op) OpEnd(); } -#if USE_CHECKPC_CALLBACK && USE_CHECKPC_DBRA +#if (USE_CHECKPC_CALLBACK && USE_CHECKPC_DBRA) || EMULATE_ADDRESS_ERRORS_JUMP if (op==0x51c8) { ot(";@ Dn.w is -1:\n"); @@ -375,7 +406,7 @@ int OpBranch(int op) int size=0,use=0,checkpc=0; int offset=0; int cc=0; - char *asr_r11=""; + const char *asr_r11=""; offset=(char)(op&0xff); cc=(op>>8)&15; @@ -384,6 +415,7 @@ int OpBranch(int op) if (offset==0) size=1; if (offset==-1) size=2; + if (size==2) size=0; // 000 model does not support long displacement if (size) use=op; // 16-bit or 32-bit else use=(op&0xff00)+1; // Use same opcode for all 8-bit branches @@ -391,24 +423,22 @@ int OpBranch(int op) OpStart(op,size?0x10:0); Cycles=10; // Assume branch taken - if (cc==1) ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); - switch (cc) { case 0: // T case 1: // F break; case 2: // hi - ot(" tst r9,#0x60000000 ;@ hi: !C && !Z\n"); + ot(" tst r10,#0x60000000 ;@ hi: !C && !Z\n"); ot(" bne BccDontBranch%i\n\n",8<=2&&(op&0xff00)==0x6200) + if (cc>=2&&(op&0xff00)==0x6700) { ot("BccDontBranch%i%s\n", 8<