\r
#include "app.h"\r
\r
-static void CheckPc(int reg)\r
+// in/out address in r0, trashes all temp regs\r
+static void CheckPc(void)\r
{\r
#if USE_CHECKPC_CALLBACK\r
- ot(";@ Check Memory Base+pc (r4)\n");\r
- if (reg != 0)\r
- ot(" mov r0,r%i\n", reg);\r
+ ot(";@ Check Memory Base+pc\n");\r
ot(" mov lr,pc\n");\r
ot(" ldr pc,[r7,#0x64] ;@ Call checkpc()\n");\r
- ot(" mov r4,r0\n");\r
-#else\r
- if (reg != 4)\r
- ot(" mov r4,r%i\n", reg);\r
-#endif\r
ot("\n");\r
+#endif\r
}\r
\r
// Push 32-bit value in r1 - trashes r0-r3,r12,lr\r
MemHandler(0,2);\r
ot(" add r0,r0,r10 ;@ Memory Base+PC\n");\r
ot("\n");\r
- CheckPc(0);\r
+ CheckPc();\r
+#if EMULATE_ADDRESS_ERRORS_JUMP\r
+ ot(" mov r4,r0\n");\r
+#else\r
+ ot(" bic r4,r0,#1\n");\r
+#endif\r
}\r
\r
int OpTrap(int op)\r
\r
OpStart(op,0x10);\r
ot(" and r0,r8,#0xf ;@ Get trap number\n");\r
- ot(" orr r0,r0,#0x20\n");\r
- ot(" mov r0,r0,asl #2\n");\r
+ ot(" orr r0,r0,#0x20 ;@ 32+n\n");\r
ot(" bl Exception\n");\r
ot("\n");\r
\r
}\r
\r
// --------------------- Opcodes 0x4e70+ ---------------------\r
+// 01001110 01110ttt\r
int Op4E70(int op)\r
{\r
int type=0;\r
\r
- type=op&7; // 01001110 01110ttt, reset/nop/stop/rte/rtd/rts/trapv/rtr\r
+ type=op&7; // reset/nop/stop/rte/rtd/rts/trapv/rtr\r
\r
switch (type)\r
{\r
return 0;\r
\r
case 3: // rte\r
- OpStart(op,0x10); Cycles=20;\r
- SuperCheck(op);\r
+ OpStart(op,0x10,0,0,1); Cycles=20;\r
PopSr(1);\r
ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n");\r
PopPc();\r
- SuperChange(op);\r
- CheckInterrupt(op);\r
- OpEnd(0x10);\r
+ ot(" ldr r1,[r7,#0x44] ;@ reload SR high\n");\r
+ SuperChange(op,1);\r
+#if EMULATE_ADDRESS_ERRORS_JUMP || EMULATE_ADDRESS_ERRORS_IO || EMULATE_HALT\r
+ ot(" ldr r1,[r7,#0x58]\n");\r
+ ot(" bic r1,r1,#0x0c ;@ clear 'not processing instruction' and 'doing addr error' bits\n");\r
+ ot(" str r1,[r7,#0x58]\n");\r
+#endif\r
+#if EMULATE_ADDRESS_ERRORS_JUMP\r
+ ot(" tst r4,#1 ;@ address error?\n");\r
+ ot(" bne ExceptionAddressError_r_prg_r4\n");\r
+#endif\r
+ opend_check_interrupt = 1;\r
+ opend_check_trace = 1;\r
+ OpEnd(0x10,0);\r
return 0;\r
\r
case 5: // rts\r
OpStart(op,0x10); Cycles=16;\r
ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n");\r
PopPc();\r
+#if EMULATE_ADDRESS_ERRORS_JUMP\r
+ ot(" tst r4,#1 ;@ address error?\n");\r
+ ot(" bne ExceptionAddressError_r_prg_r4\n");\r
+#endif\r
OpEnd(0x10);\r
return 0;\r
\r
case 6: // trapv\r
- OpStart(op,0x10); Cycles=4;\r
+ OpStart(op,0x10,0,1); Cycles=4;\r
ot(" tst r9,#0x10000000\n");\r
- ot(" subne r5,r5,#%i\n",30);\r
- ot(" movne r0,#0x1c ;@ TRAPV exception\n");\r
+ ot(" subne r5,r5,#%i\n",34);\r
+ ot(" movne r0,#7 ;@ TRAPV exception\n");\r
ot(" blne Exception\n");\r
- OpEnd(0x10);\r
+ opend_op_changes_cycles = 1;\r
+ OpEnd(0x10,0);\r
return 0;\r
\r
case 7: // rtr\r
PopSr(0);\r
ot(" ldr r10,[r7,#0x60] ;@ Get Memory base\n");\r
PopPc();\r
+#if EMULATE_ADDRESS_ERRORS_JUMP\r
+ ot(" tst r4,#1 ;@ address error?\n");\r
+ ot(" bne ExceptionAddressError_r_prg_r4\n");\r
+#endif\r
OpEnd(0x10);\r
return 0;\r
\r
ot("\n");\r
EaCalc(11,0x003f,sea,0);\r
\r
- ot(";@ Jump - Get new PC from r0\n");\r
- if (op&0x40)\r
+ ot(";@ Jump - Get new PC from r11\n");\r
+ ot(" add r0,r11,r10 ;@ Memory Base + New PC\n");\r
+ ot("\n");\r
+ CheckPc();\r
+ if (!(op&0x40))\r
{\r
- // Jmp - Get new PC from r0\r
- ot(" add r0,r11,r10 ;@ Memory Base + New PC\n");\r
- ot("\n");\r
+ ot(" ldr r2,[r7,#0x3c]\n");\r
+ ot(" sub r1,r4,r10 ;@ r1 = Old PC\n");\r
}\r
- else\r
+#if EMULATE_ADDRESS_ERRORS_JUMP\r
+ // jsr prefetches next instruction before pushing old PC,\r
+ // according to http://pasti.fxatari.com/68kdocs/68kPrefetch.html\r
+ ot(" mov r4,r0\n");\r
+ ot(" tst r4,#1 ;@ address error?\n");\r
+ ot(" bne ExceptionAddressError_r_prg_r4\n");\r
+#else\r
+ ot(" bic r4,r0,#1\n");\r
+#endif\r
+\r
+ if (!(op&0x40))\r
{\r
- ot(";@ Jsr - Push old PC first\n");\r
- ot(" sub r1,r4,r10 ;@ r1 = Old PC\n");\r
- ot(" mov r1,r1,lsl #8\n");\r
- ot(" ldr r0,[r7,#0x3c]\n");\r
- ot(" mov r1,r1,asr #8\n");\r
- ot(";@ Push r1 onto stack\n");\r
- ot(" sub r0,r0,#4 ;@ Predecrement A7\n");\r
+ ot(";@ Push old PC onto stack\n");\r
+ ot(" sub r0,r2,#4 ;@ Predecrement A7\n");\r
ot(" str r0,[r7,#0x3c] ;@ Save A7\n");\r
MemHandler(1,2);\r
- ot(" add r0,r11,r10 ;@ Memory Base + New PC\n");\r
- ot("\n");\r
}\r
\r
- CheckPc(0);\r
-\r
Cycles=(op&0x40) ? 4 : 12;\r
Cycles+=Ea_add_ns((op&0x40) ? g_jmp_cycle_table : g_jsr_cycle_table, sea);\r
\r
\r
ot(";@ Check if Dn.w is -1\n");\r
ot(" cmn r0,#1\n");\r
+\r
+#if (USE_CHECKPC_CALLBACK && USE_CHECKPC_DBRA) || EMULATE_ADDRESS_ERRORS_JUMP\r
+ ot(" beq DbraMin1\n");\r
ot("\n");\r
\r
+ ot(";@ Get Branch offset:\n");\r
+ ot(" ldrsh r0,[r4]\n");\r
+ ot(" add r0,r4,r0 ;@ r0 = New PC\n");\r
+ CheckPc();\r
+#if EMULATE_ADDRESS_ERRORS_JUMP\r
+ ot(" mov r4,r0\n");\r
+ ot(" tst r4,#1 ;@ address error?\n");\r
+ ot(" bne ExceptionAddressError_r_prg_r4\n");\r
+#else\r
+ ot(" bic r4,r0,#1\n");\r
+#endif\r
+#else\r
+ ot("\n");\r
ot(";@ Get Branch offset:\n");\r
ot(" ldrnesh r0,[r4]\n");\r
ot(" addeq r4,r4,#2 ;@ Skip branch offset\n");\r
ot(" subeq r5,r5,#4 ;@ additional cycles\n");\r
ot(" addne r4,r4,r0 ;@ r4 = New PC\n");\r
+ ot(" bic r4,r4,#1\n"); // we do not emulate address errors\r
ot("\n");\r
+#endif\r
Cycles=12-2;\r
OpEnd();\r
}\r
OpEnd();\r
}\r
\r
+#if (USE_CHECKPC_CALLBACK && USE_CHECKPC_DBRA) || EMULATE_ADDRESS_ERRORS_JUMP\r
+ if (op==0x51c8)\r
+ {\r
+ ot(";@ Dn.w is -1:\n");\r
+ ot("DbraMin1%s\n", ms?"":":");\r
+ ot(" add r4,r4,#2 ;@ Skip branch offset\n");\r
+ ot("\n");\r
+ Cycles=12+2;\r
+ OpEnd();\r
+ }\r
+#endif\r
+\r
return 0;\r
}\r
\r
// Emit a Branch opcode 0110cccc nn (cccc=condition)\r
int OpBranch(int op)\r
{\r
- int size=0,use=0;\r
+ int size=0,use=0,checkpc=0;\r
int offset=0;\r
int cc=0;\r
char *asr_r11="";\r
if (offset==0) size=1;\r
if (offset==-1) size=2;\r
\r
+ if (size==2) size=0; // 000 model does not support long displacement\r
if (size) use=op; // 16-bit or 32-bit\r
else use=(op&0xff00)+1; // Use same opcode for all 8-bit branches\r
\r
if (cc==1)\r
{\r
ot(";@ Bsr - remember old PC\n");\r
+ ot(" ldr r2,[r7,#0x3c]\n");\r
ot(" sub r1,r4,r10 ;@ r1 = Old PC\n");\r
if (size) ot(" add r1,r1,#%d\n",1<<size);\r
- ot(" mov r1,r1, lsl #8\n");\r
- ot(" ldr r2,[r7,#0x3c]\n");\r
- ot(" mov r1,r1, asr #8\n");\r
ot("\n");\r
ot(";@ Push r1 onto stack\n");\r
ot(" sub r0,r2,#4 ;@ Predecrement A7\n");\r
MemHandler(1,2);\r
ot("\n");\r
Cycles=18; // always 18\r
- if (offset==0 || offset==-1)\r
- {\r
- ot(";@ Branch is quite far, so may be a good idea to check Memory Base+pc\n");\r
- ot(" add r0,r4,r11%s ;@ r4 = New PC\n",asr_r11);\r
- CheckPc(0);\r
- }\r
- else\r
- ot(" add r4,r4,r11%s ;@ r4 = New PC\n",asr_r11);\r
- }\r
- else\r
- {\r
- if (offset==0 || offset==-1)\r
- {\r
- ot(" add r0,r4,r11%s ;@ r4 = New PC\n",asr_r11);\r
- ot(";@ Branch is quite far, so may be a good idea to check Memory Base+pc\n");\r
- CheckPc(0);\r
- }\r
- else\r
- {\r
- ot(" add r4,r4,r11%s ;@ r4 = New PC\n",asr_r11);\r
- ot("\n");\r
- }\r
}\r
\r
+ ot(" add r0,r4,r11%s ;@ r4 = New PC\n",asr_r11);\r
+\r
+#if USE_CHECKPC_CALLBACK && USE_CHECKPC_OFFSETBITS_8\r
+ if (offset!=0 && offset!=-1) checkpc=1;\r
+#endif\r
+#if USE_CHECKPC_CALLBACK && USE_CHECKPC_OFFSETBITS_16\r
+ if (offset==0) checkpc=1;\r
+#endif\r
+#if USE_CHECKPC_CALLBACK\r
+ if (offset==-1) checkpc=1;\r
+#endif\r
+ if (checkpc) CheckPc();\r
+#if EMULATE_ADDRESS_ERRORS_JUMP\r
+ ot(" mov r4,r0\n");\r
+ ot(" tst r4,#1 ;@ address error?\n");\r
+ ot(" bne ExceptionAddressError_r_prg_r4\n");\r
+#else\r
+ ot(" bic r4,r0,#1\n");\r
+#endif\r
+ ot("\n");\r
+\r
OpEnd(size?0x10:0);\r
\r
// since all "DontBranch" code is same for every size, output only once\r
if (cc>=2&&(op&0xff00)==0x6200)\r
{\r
ot("BccDontBranch%i%s\n", 8<<size, ms?"":":");\r
- if (size) ot(" add r4,r4,#%d\n",8<<size);\r
+ if (size) ot(" add r4,r4,#%d\n",1<<size);\r
Cycles+=(size==1) ? 2 : -2; // Branch not taken\r
OpEnd(0);\r
}\r
notaz.gp2x.de / picodrive.git / blobdiff