ot(" bx lr\n");\r
ot("\n");\r
#endif\r
+ // 68k: XNZVC, ARM: NZCV\r
if (ms) ot("CycloneSetSr\n");\r
else ot("CycloneSetSr:\n");\r
ot(" mov r2,r1,lsr #8\n");\r
ot(" str r3,[r0,#0x3C]\n");\r
ot(" str r2,[r0,#0x48]\n");\r
ot("setsr_noswap%s\n",ms?"":":");\r
- ot(" mov r2,r1,lsr #3\n");\r
- ot(" strb r2,[r0,#0x45] ;@ the X flag\n");\r
+ ot(" mov r2,r1,lsl #25\n");\r
+ ot(" str r2,[r0,#0x4c] ;@ the X flag\n");\r
ot(" bic r2,r1,#0xf3\n");\r
ot(" tst r1,#1\n");\r
ot(" orrne r2,r2,#2\n");\r
ot(" orrne r2,r2,#2\n");\r
ot(" tst r1,#2\n");\r
ot(" orrne r2,r2,#1\n");\r
- ot(" ldrb r1,[r0,#0x45] ;@ the X flag\n");\r
- ot(" tst r1,#2\n");\r
+ ot(" ldr r1,[r0,#0x4c] ;@ the X flag\n");\r
+ ot(" tst r1,#0x20000000\n");\r
ot(" orrne r2,r2,#0x10\n");\r
ot(" ldrb r1,[r0,#0x44] ;@ the SR high\n");\r
ot(" orr r0,r2,r1,lsl #8\n");\r
addrreg=0;\r
#endif\r
if (addrreg != 0)\r
+ {\r
+ ot(" add lr,pc,#4\n"); // helps to prevent interlocks\r
ot(" mov r0,r%i\n", addrreg);\r
- ot(" mov lr,pc\n");\r
+ }\r
+ else\r
+ ot(" mov lr,pc\n");\r
ot(" ldr pc,[r7,#0x%x] ;@ Call ",func);\r
\r
// Document what we are calling:\r
ot(" mov r0,#0x10\n");\r
ot(" bl Exception\n");\r
#endif\r
+ ot("\n");\r
Cycles=34;\r
OpEnd();\r
\r
ot(" mov r0,#0x28\n");\r
ot(" bl Exception\n");\r
#endif\r
+ ot("\n");\r
Cycles=4;\r
OpEnd();\r
\r
ot(" mov r0,#0x2c\n");\r
ot(" bl Exception\n");\r
#endif\r
+ ot("\n");\r
Cycles=4;\r
OpEnd();\r
\r