Update jni/Android.mk

[picodrive.git] / cpu / musashi / m68k_in.c

diff --git a/cpu/musashi/m68k_in.c b/cpu/musashi/m68k_in.c
index 9379643..5c9cc06 100644 (file)
--- a/cpu/musashi/m68k_in.c
+++ b/cpu/musashi/m68k_in.c
@@ -496,9 +496,9 @@ chk2cmp2  32  .     pcdi  0000010011111010  ..........  . . U U   .   .  23  23
 chk2cmp2  32  .     pcix  0000010011111011  ..........  . . U U   .   .  23  23\r
 chk2cmp2  32  .     .     0000010011......  A..DXWL...  . . U U   .   .  18  18\r
 clr        8  .     d     0100001000000...  ..........  U U U U   4   4   2   2\r
-clr        8  .     .     0100001000......  A+-DXWL...  U U U U   6   4   4   4  notaz hack: changed 000 cycles 8 -> 6 like in starscream for Fatal Rewind\r
+clr        8  .     .     0100001000......  A+-DXWL...  U U U U   8   4   4   4\r
 clr       16  .     d     0100001001000...  ..........  U U U U   4   4   2   2\r
-clr       16  .     .     0100001001......  A+-DXWL...  U U U U   6   4   4   4  notaz hack: ditto\r
+clr       16  .     .     0100001001......  A+-DXWL...  U U U U   8   4   4   4\r
 clr       32  .     d     0100001010000...  ..........  U U U U   6   6   2   2\r
 clr       32  .     .     0100001010......  A+-DXWL...  U U U U  12   6   4   4\r
 cmp        8  .     d     1011...000000...  ..........  U U U U   4   4   2   2\r
@@ -1262,8 +1262,9 @@ M68KMAKE_OP(adda, 32, ., a)
 M68KMAKE_OP(adda, 32, ., .)\r
 {\r
        uint* r_dst = &AX;\r
+       uint src = M68KMAKE_GET_OPER_AY_32; // notaz\r
 \r
-       *r_dst = MASK_OUT_ABOVE_32(*r_dst + M68KMAKE_GET_OPER_AY_32);\r
+       *r_dst = MASK_OUT_ABOVE_32(*r_dst + src);\r
 }\r
 \r
 \r
@@ -7132,8 +7133,12 @@ M68KMAKE_OP(movem, 32, re, pd)
                if(register_list & (1 << i))\r
                {\r
                        ea -= 4;\r
+#if 0\r
+                       m68ki_write_32(ea, REG_DA[15-i] ); // notaz Cyclone hack\r
+#else\r
                        m68ki_write_16(ea+2, REG_DA[15-i] & 0xFFFF );\r
                        m68ki_write_16(ea, (REG_DA[15-i] >> 16) & 0xFFFF );\r
+#endif\r
                        count++;\r
                }\r
        AY = ea;\r
@@ -9785,8 +9790,9 @@ M68KMAKE_OP(suba, 32, ., a)
 M68KMAKE_OP(suba, 32, ., .)\r
 {\r
        uint* r_dst = &AX;\r
+       uint src = M68KMAKE_GET_OPER_AY_32; // notaz\r
 \r
-       *r_dst = MASK_OUT_ABOVE_32(*r_dst - M68KMAKE_GET_OPER_AY_32);\r
+       *r_dst = MASK_OUT_ABOVE_32(*r_dst - src);\r
 }\r
 \r
 \r