\r
// opcodes often used by games\r
static const unsigned short hot_opcodes[] = {\r
- 0x6701, // beq $3\r
- 0x6601, // bne $3\r
+ 0x6702, // beq $3\r
+ 0x6602, // bne $3\r
0x51c8, // dbra Dn, $2\r
0x4a38, // tst.b $0.w\r
0xd040, // add.w Dn, Dn\r
0x0240, // andi.w #$0, D0\r
0x2038, // move.l $0.w, D0\r
0xb0b8, // cmp.l $0.w, D0\r
- 0x6001, // bra $3\r
+ 0x6002, // bra $3\r
0x30c0, // move.w D0, (A0)+\r
0x3028, // move.w ($0,A0), D0\r
0x0c40, // cmpi.w #$0, D0\r
0xb038, // cmp.b $0.w, D0\r
0x3039, // move.w $0.l, D0\r
0x4840, // swap D0\r
- 0x6101, // bsr $3\r
+ 0x6102, // bsr $3\r
0x6100, // bsr $2\r
0x5e40, // addq.w #7, D0\r
0x1039, // move.b $0.l, D0\r
0xc040, // and.w D0, D0\r
0x3180, // move.w D0, (A0,D0.w)\r
0x1198, // move.b (A0)+, (A0,D0.w)\r
- 0x6501, // bcs $3\r
+ 0x6502, // bcs $3\r
0x6500, // bcs $2\r
- 0x6401, // bcc $3\r
- 0x6a01, // bpl $3\r
+ 0x6402, // bcc $3\r
+ 0x6a02, // bpl $3\r
0x41f0, // lea (A0,D0.w), A0\r
0x4a28, // tst.b ($0,A0)\r
0x0828, // btst #$0, ($0,A0)\r
}\r
\r
#if (CYCLONE_FOR_GENESIS == 2)\r
-// r12=ptr to tas in table, trashes r0,r1\r
-static void ChangeTAS(int norm)\r
+static const char *tas_ops[] = {\r
+ "Op4ad0", "Op4ad8", "Op4adf",\r
+ "Op4ae0", "Op4ae7", "Op4ae8",\r
+ "Op4af0", "Op4af8", "Op4af9",\r
+};\r
+\r
+// get handler address in r0, OT (offset table) in r2\r
+static void ChangeTASGet(unsigned int i)\r
{\r
- ot(" ldr r0,=Op4ad0%s\n",norm?"_":"");\r
- ot(" mov r1,#8\n");\r
- ot("setrtas_loop%i0%s ;@ 4ad0-4ad7\n",norm,ms?"":":");\r
- ot(" subs r1,r1,#1\n");\r
- ot(" str r0,[r12],#4\n");\r
- ot(" bne setrtas_loop%i0\n",norm);\r
- ot(" ldr r0,=Op4ad8%s\n",norm?"_":"");\r
- ot(" mov r1,#7\n");\r
- ot("setrtas_loop%i1%s ;@ 4ad8-4ade\n",norm,ms?"":":");\r
- ot(" subs r1,r1,#1\n");\r
- ot(" str r0,[r12],#4\n");\r
- ot(" bne setrtas_loop%i1\n",norm);\r
- ot(" ldr r0,=Op4adf%s\n",norm?"_":"");\r
- ot(" str r0,[r12],#4\n");\r
- ot(" ldr r0,=Op4ae0%s\n",norm?"_":"");\r
- ot(" mov r1,#7\n");\r
- ot("setrtas_loop%i2%s ;@ 4ae0-4ae6\n",norm,ms?"":":");\r
- ot(" subs r1,r1,#1\n");\r
- ot(" str r0,[r12],#4\n");\r
- ot(" bne setrtas_loop%i2\n",norm);\r
- ot(" ldr r0,=Op4ae7%s\n",norm?"_":"");\r
- ot(" str r0,[r12],#4\n");\r
- ot(" ldr r0,=Op4ae8%s\n",norm?"_":"");\r
- ot(" mov r1,#8\n");\r
- ot("setrtas_loop%i3%s ;@ 4ae8-4aef\n",norm,ms?"":":");\r
- ot(" subs r1,r1,#1\n");\r
- ot(" str r0,[r12],#4\n");\r
- ot(" bne setrtas_loop%i3\n",norm);\r
- ot(" ldr r0,=Op4af0%s\n",norm?"_":"");\r
- ot(" mov r1,#8\n");\r
- ot("setrtas_loop%i4%s ;@ 4af0-4af7\n",norm,ms?"":":");\r
- ot(" subs r1,r1,#1\n");\r
- ot(" str r0,[r12],#4\n");\r
- ot(" bne setrtas_loop%i4\n",norm);\r
- ot(" ldr r0,=Op4af8%s\n",norm?"_":"");\r
- ot(" str r0,[r12],#4\n");\r
- ot(" ldr r0,=Op4af9%s\n",norm?"_":"");\r
- ot(" str r0,[r12],#4\n");\r
+ if (i >= sizeof(tas_ops) / sizeof(tas_ops[0]))\r
+ abort();\r
+ ot(" ldr r0,[r2,#%d*4] ;@ %s\n",i,tas_ops[i]);\r
+ ot(" add r0,r0,r2\n");\r
}\r
#endif\r
\r
+static void LoadCycloneJumpTab(int reg, int tmp)\r
+{\r
+ ot(" adr r%d,CycloneOT_JT\n", tmp);\r
+ ot(" ldr r%d,[r%d] ;@ CycloneJumpTab-CycloneOT_JT\n", reg, tmp);\r
+ ot(" add r%d,r%d,r%d ;@ =CycloneJumpTab\n", reg, reg, tmp);\r
+}\r
+\r
#if EMULATE_ADDRESS_ERRORS_JUMP || EMULATE_ADDRESS_ERRORS_IO\r
static void AddressErrorWrapper(char rw, const char *dataprg, int iw)\r
{\r
}\r
#endif\r
\r
-void FlushPC(void)\r
+void FlushPC(int force)\r
{\r
#if MEMHANDLERS_NEED_PC\r
- if (pc_dirty)\r
- ot(" str r4,[r7,#0x40] ;@ Save PC\n");\r
-#endif\r
+ force |= pc_dirty;\r
pc_dirty = 0;\r
+#endif\r
+ if (force)\r
+ ot(" str r4,[r7,#0x40] ;@ Save PC\n");\r
}\r
\r
static void PrintFramework()\r
ot(" mov r7,r0 ;@ r7 = Pointer to Cpu Context\n");\r
ot(" ;@ r0-3 = Temporary registers\n");\r
ot(" ldrb r10,[r7,#0x46] ;@ r10 = Flags (NZCV)\n");\r
- ot(" ldr r6,=CycloneJumpTab ;@ r6 = Opcode Jump table\n");\r
+ ot(" ldr r6,[r7,#0x54] ;@ r6 = Opcode Jump table (from reset)\n");\r
ot(" ldr r5,[r7,#0x5c] ;@ r5 = Cycles\n");\r
ot(" ldr r4,[r7,#0x40] ;@ r4 = Current PC + Memory Base\n");\r
ot(" ;@ r8 = Current Opcode\n");\r
ot(" ldr r1,[r7,#0x44] ;@ Get SR high T_S__III and irq level\n");\r
ot(" mov r10,r10,lsl #28;@ r10 = Flags 0xf0000000, cpsr format\n");\r
ot(" ;@ r11 = Source value / Memory Base\n");\r
- ot(" str r6,[r7,#0x54] ;@ make a copy to avoid literal pools\n");\r
ot("\n");\r
#if (CYCLONE_FOR_GENESIS == 2) || EMULATE_TRACE\r
ot(" mov r2,#0\n");\r
ot("CycloneInit%s\n", ms?"":":");\r
#if COMPRESS_JUMPTABLE\r
ot(";@ decompress jump table\n");\r
- ot(" ldr r12,=CycloneJumpTab\n");\r
+ LoadCycloneJumpTab(12, 1);\r
ot(" add r0,r12,#0xe000*4 ;@ ctrl code pointer\n");\r
ot(" ldr r1,[r0,#-4]\n");\r
ot(" tst r1,r1\n");\r
ot(" bgt unc_loop_in\n");\r
ot(" b unc_loop\n");\r
ot("unc_finish%s\n", ms?"":":");\r
- ot(" ldr r12,=CycloneJumpTab\n");\r
+ LoadCycloneJumpTab(12, 1);\r
ot(" ;@ set a-line and f-line handlers\n");\r
ot(" add r0,r12,#0xa000*4\n");\r
ot(" ldr r1,[r0,#4] ;@ a-line handler\n");\r
ot(" bx lr\n");\r
ltorg();\r
#else\r
- ot(";@ do nothing\n");\r
+ ot(";@ fix final jumptable entries\n");\r
+ LoadCycloneJumpTab(12, 0);\r
+ ot(" add r12,r12,#0x10000*4\n");\r
+ ot(" ldr r0,[r12,#-3*4]\n");\r
+ ot(" str r0,[r12,#-2*4]\n");\r
+ ot(" str r0,[r12,#-1*4]\n");\r
ot(" bx lr\n");\r
#endif\r
ot("\n");\r
// --------------\r
ot("CycloneReset%s\n", ms?"":":");\r
ot(" stmfd sp!,{r7,lr}\n");\r
+ LoadCycloneJumpTab(12, 1);\r
ot(" mov r7,r0\n");\r
+ ot(" str r12,[r7,#0x54] ;@ save CycloneJumpTab avoid literal pools\n");\r
ot(" mov r0,#0\n");\r
ot(" str r0,[r7,#0x58] ;@ state_flags\n");\r
ot(" str r0,[r7,#0x48] ;@ OSP\n");\r
ot(" ldmfd sp!,{r7,pc}\n");\r
ot("\n");\r
\r
+ // --------------\r
+ ot("CycloneSetRealTAS%s\n", ms?"":":");\r
+#if (CYCLONE_FOR_GENESIS == 2)\r
+ LoadCycloneJumpTab(12, 1);\r
+ ot(" tst r0,r0\n");\r
+ ot(" add r12,r12,#0x4a00*4\n");\r
+ ot(" add r12,r12,#0x00d0*4\n");\r
+ ot(" adr r2,CycloneOT_TAS_\n");\r
+ ot(" addeq r2,r2,#%lu*4\n", sizeof(tas_ops) / sizeof(tas_ops[0]));\r
+\r
+ ChangeTASGet(0);\r
+ ot(" mov r1,#8\n");\r
+ ot("setrtas_loop0%s ;@ 4ad0-4ad7\n",ms?"":":");\r
+ ot(" subs r1,r1,#1\n");\r
+ ot(" str r0,[r12],#4\n");\r
+ ot(" bne setrtas_loop0\n");\r
+\r
+ ChangeTASGet(1);\r
+ ot(" mov r1,#7\n");\r
+ ot("setrtas_loop1%s ;@ 4ad8-4ade\n",ms?"":":");\r
+ ot(" subs r1,r1,#1\n");\r
+ ot(" str r0,[r12],#4\n");\r
+ ot(" bne setrtas_loop1\n");\r
+\r
+ ChangeTASGet(2);\r
+ ot(" str r0,[r12],#4\n");\r
+ ChangeTASGet(3);\r
+ ot(" mov r1,#7\n");\r
+ ot("setrtas_loop2%s ;@ 4ae0-4ae6\n",ms?"":":");\r
+ ot(" subs r1,r1,#1\n");\r
+ ot(" str r0,[r12],#4\n");\r
+ ot(" bne setrtas_loop2\n");\r
+\r
+ ChangeTASGet(4);\r
+ ot(" str r0,[r12],#4\n");\r
+ ChangeTASGet(5);\r
+ ot(" mov r1,#8\n");\r
+ ot("setrtas_loop3%s ;@ 4ae8-4aef\n",ms?"":":");\r
+ ot(" subs r1,r1,#1\n");\r
+ ot(" str r0,[r12],#4\n");\r
+ ot(" bne setrtas_loop3\n");\r
+\r
+ ChangeTASGet(6);\r
+ ot(" mov r1,#8\n");\r
+ ot("setrtas_loop4%s ;@ 4af0-4af7\n",ms?"":":");\r
+ ot(" subs r1,r1,#1\n");\r
+ ot(" str r0,[r12],#4\n");\r
+ ot(" bne setrtas_loop4\n");\r
+\r
+ ChangeTASGet(7);\r
+ ot(" str r0,[r12],#4\n");\r
+ ChangeTASGet(8);\r
+ ot(" str r0,[r12],#4\n");\r
+#endif\r
+ ot(" bx lr\n");\r
+ ot("\n");\r
+\r
+ // --------------\r
+ // offset table to avoid .text relocations (forbidden by Android and iOS)\r
+ ot("CycloneOT_JT%s\n", ms?"":":");\r
+ ot(" %s %s-CycloneOT_JT\n", ms?"dcd":".long", "CycloneJumpTab");\r
+#if (CYCLONE_FOR_GENESIS == 2)\r
+ ot("CycloneOT_TAS_%s\n", ms?"":":"); // working TAS (no MD bug)\r
+ for (size_t i = 0; i < sizeof(tas_ops) / sizeof(tas_ops[0]); i++)\r
+ ot(" %s %s_-CycloneOT_TAS_\n", ms?"dcd":".long", tas_ops[i]);\r
+ ot("CycloneOT_TAS%s\n", ms?"":":"); // broken TAS\r
+ for (size_t i = 0; i < sizeof(tas_ops) / sizeof(tas_ops[0]); i++)\r
+ ot(" %s %s-CycloneOT_TAS\n", ms?"dcd":".long", tas_ops[i]);\r
+ ot("\n");\r
+#endif\r
+\r
// --------------\r
// 68k: XNZVC, ARM: NZCV\r
ot("CycloneSetSr%s\n", ms?"":":");\r
ot("\n");\r
ot("\n");\r
\r
- // --------------\r
- ot("CycloneSetRealTAS%s\n", ms?"":":");\r
-#if (CYCLONE_FOR_GENESIS == 2)\r
- ot(" ldr r12,=CycloneJumpTab\n");\r
- ot(" tst r0,r0\n");\r
- ot(" add r12,r12,#0x4a00*4\n");\r
- ot(" add r12,r12,#0x00d0*4\n");\r
- ot(" beq setrtas_off\n");\r
- ChangeTAS(1);\r
- ot(" bx lr\n");\r
- ot("setrtas_off%s\n",ms?"":":");\r
- ChangeTAS(0);\r
- ot(" bx lr\n");\r
- ltorg();\r
-#else\r
- ot(" bx lr\n");\r
-#endif\r
- ot("\n");\r
-\r
// --------------\r
ot(";@ DoInterrupt - r0=IRQ level\n");\r
ot("CycloneDoInterruptGoBack%s\n", ms?"":":");\r
ot(" ldr r6,[r7,#0x54]\n");\r
ot(" ldrh r8,[r4],#2 ;@ Fetch next opcode\n");\r
ot(" subs r5,r5,#44 ;@ Subtract cycles\n");\r
- ot(" ldrge pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");\r
+ ot(" ldrgt pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");\r
ot(" b CycloneEnd\n");\r
ot("\n");\r
\r
ot(" ldr r6,[r7,#0x54]\n");\r
ot(" ldrh r8,[r4],#2 ;@ Fetch next opcode\n");\r
ot(" subs r5,r5,#50 ;@ Subtract cycles\n");\r
- ot(" ldrge pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");\r
+ ot(" ldrgt pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");\r
ot(" b CycloneEnd\n");\r
ot("\n");\r
#endif\r
ot(" cmp r5,#0\n");\r
ot(" orr r0,r0,#2 ;@ go to trace mode\n");\r
ot(" str r0,[r7,#0x58]\n");\r
- ot(" blt CycloneEnd\n"); // should take care of situation where we come here when already tracing\r
+ ot(" ble CycloneEnd\n"); // should take care of situation where we come here when already tracing\r
ot(";@ CheckInterrupt:\n");\r
ot(" movs r0,r1,lsr #24 ;@ Get IRQ level\n");\r
ot(" beq CycloneDoTrace\n");\r
ot(" bl Exception\n");\r
ot(" ldrh r8,[r4],#2 ;@ Fetch next opcode\n");\r
ot(" subs r5,r5,#34 ;@ Subtract cycles\n");\r
- ot(" ldrge pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");\r
+ ot(" ldrgt pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");\r
ot(" b CycloneEnd\n");\r
ot("\n");\r
ot("TraceDisabled%s\n", ms?"":":");\r
ot(" ldrh r8,[r4],#2 ;@ Fetch next opcode\n");\r
ot(" cmp r5,#0\n");\r
- ot(" ldrge pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");\r
+ ot(" ldrgt pc,[r6,r8,asl #2] ;@ Jump to opcode handler\n");\r
ot(" b CycloneEnd\n");\r
ot("\n");\r
#endif\r
ot(" %s CycloneDoTrace\n",globl);\r
ot(" %s CycloneJumpTab\n",globl);\r
ot(" %s Op____\n",globl);\r
- ot(" %s Op6001\n",globl);\r
- ot(" %s Op6601\n",globl);\r
- ot(" %s Op6701\n",globl);\r
+ ot(" %s Op6002\n",globl);\r
+ ot(" %s Op6602\n",globl);\r
+ ot(" %s Op6702\n",globl);\r
#endif\r
ot("\n");\r
ot(ms?"CycloneVer dcd 0x":"CycloneVer: .long 0x");\r
notaz.gp2x.de / cyclone68000.git / blobdiff