X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=cpu%2FCyclone%2FOpBranch.cpp;h=061fe01041c7f2d9b103c223c710d8742a701079;hb=fcf94fcc20e7bdd527a28fe8e1b265862b616016;hp=d29ed031f715952c02516acbd29c86f1817ba824;hpb=0e11c502b05a9ccd67d34d1f0975852d8c3d4232;p=picodrive.git diff --git a/cpu/Cyclone/OpBranch.cpp b/cpu/Cyclone/OpBranch.cpp index d29ed03..061fe01 100644 --- a/cpu/Cyclone/OpBranch.cpp +++ b/cpu/Cyclone/OpBranch.cpp @@ -47,7 +47,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"); @@ -55,7 +55,8 @@ 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(); #if EMULATE_ADDRESS_ERRORS_JUMP @@ -97,13 +98,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"); @@ -112,14 +113,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; @@ -138,18 +139,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); @@ -175,7 +176,6 @@ int Op4E70(int op) case 3: // rte OpStart(op,0x10,0,0,1); Cycles=20; PopSr(1); - ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n"); PopPc(); ot(" ldr r1,[r7,#0x44] ;@ reload SR high\n"); SuperChange(op,1); @@ -195,7 +195,6 @@ int Op4E70(int op) 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"); @@ -206,7 +205,7 @@ int Op4E70(int op) case 6: // trapv OpStart(op,0x10,0,1); Cycles=4; - ot(" tst r9,#0x10000000\n"); + ot(" tst r10,#0x10000000\n"); ot(" subne r5,r5,#%i\n",34); ot(" movne r0,#7 ;@ TRAPV exception\n"); ot(" blne Exception\n"); @@ -217,7 +216,6 @@ int Op4E70(int op) 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"); @@ -248,18 +246,18 @@ 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 r11\n"); - ot(" add r0,r11,r10 ;@ Memory Base + New PC\n"); + ot(";@ Jump - Get new PC from r12\n"); + ot(" add r0,r12,r11 ;@ Memory Base + New PC\n"); ot("\n"); CheckPc(); if (!(op&0x40)) { ot(" ldr r2,[r7,#0x3c]\n"); - ot(" sub r1,r4,r10 ;@ r1 = Old PC\n"); + ot(" sub r1,r4,r11 ;@ r1 = Old PC\n"); } #if EMULATE_ADDRESS_ERRORS_JUMP // jsr prefetches next instruction before pushing old PC, @@ -290,7 +288,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" @@ -314,16 +312,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; @@ -404,7 +402,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; @@ -421,24 +419,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<