RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

68k cores: fix bcd instructions

Browse source 
passing flamewing's test now
This commit is contained in:
notaz 2017-09-20 23:37:58 +03:00
parent f6aa2456a4
commit c6e1e9779a
4 changed files with 263 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -217,7 +217,9 @@ pico/cd/gfx_cd.o: CFLAGS += -fno-strict-aliasing
# on x86, this is reduced by ~300MB when debug info is off (but not on ARM) # on x86, this is reduced by ~300MB when debug info is off (but not on ARM)
# not using O3 and -fno-expensive-optimizations seems to also help, but you may # not using O3 and -fno-expensive-optimizations seems to also help, but you may
# want to remove this stuff for better performance if your compiler can handle it # want to remove this stuff for better performance if your compiler can handle it
ifndef DEBUG
cpu/fame/famec.o: CFLAGS += -g0 -O2 -fno-expensive-optimizations cpu/fame/famec.o: CFLAGS += -g0 -O2 -fno-expensive-optimizations
endif
# random deps # random deps
pico/carthw/svp/compiler.o : cpu/drc/emit_$(ARCH).c pico/carthw/svp/compiler.o : cpu/drc/emit_$(ARCH).c

2
cpu/cyclone

@ -1 +1 @@
Subproject commit 66dda842eae01f47f5389b931ec9567fb0bbb6a1 Subproject commit b889883d36b2d247488c82d79d1eaab4dd41d236

280
cpu/fame/famec_opcodes.h
View file

@ -16936,18 +16936,20 @@ OPCODE(0x4800)
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
res = DREGu8((Opcode >> 0) & 7); dst = DREGu8((Opcode >> 0) & 7);
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
DREGu8((Opcode >> 0) & 7) = res; res = (res + 0x9a) & 0xFF;
DREGu8((Opcode >> 0) & 7) = res;
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
RET(6) RET(6)
} }
@ -16960,18 +16962,20 @@ OPCODE(0x4810)
adr = AREG((Opcode >> 0) & 7); adr = AREG((Opcode >> 0) & 7);
PRE_IO PRE_IO
READ_BYTE_F(adr, res) READ_BYTE_F(adr, dst)
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
WRITE_BYTE_F(adr, res) res = (res + 0x9a) & 0xFF;
WRITE_BYTE_F(adr, res)
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
POST_IO POST_IO
RET(12) RET(12)
@ -16986,18 +16990,20 @@ OPCODE(0x4818)
adr = AREG((Opcode >> 0) & 7); adr = AREG((Opcode >> 0) & 7);
AREG((Opcode >> 0) & 7) += 1; AREG((Opcode >> 0) & 7) += 1;
PRE_IO PRE_IO
READ_BYTE_F(adr, res) READ_BYTE_F(adr, dst)
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
WRITE_BYTE_F(adr, res) res = (res + 0x9a) & 0xFF;
WRITE_BYTE_F(adr, res)
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
POST_IO POST_IO
RET(12) RET(12)
@ -17012,18 +17018,20 @@ OPCODE(0x4820)
adr = AREG((Opcode >> 0) & 7) - 1; adr = AREG((Opcode >> 0) & 7) - 1;
AREG((Opcode >> 0) & 7) = adr; AREG((Opcode >> 0) & 7) = adr;
PRE_IO PRE_IO
READ_BYTE_F(adr, res) READ_BYTE_F(adr, dst)
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
WRITE_BYTE_F(adr, res) res = (res + 0x9a) & 0xFF;
WRITE_BYTE_F(adr, res)
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
POST_IO POST_IO
RET(14) RET(14)
@ -17038,18 +17046,20 @@ OPCODE(0x4828)
FETCH_SWORD(adr); FETCH_SWORD(adr);
adr += AREG((Opcode >> 0) & 7); adr += AREG((Opcode >> 0) & 7);
PRE_IO PRE_IO
READ_BYTE_F(adr, res) READ_BYTE_F(adr, dst)
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
WRITE_BYTE_F(adr, res) res = (res + 0x9a) & 0xFF;
WRITE_BYTE_F(adr, res)
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
POST_IO POST_IO
RET(16) RET(16)
@ -17064,18 +17074,20 @@ OPCODE(0x4830)
adr = AREG((Opcode >> 0) & 7); adr = AREG((Opcode >> 0) & 7);
DECODE_EXT_WORD DECODE_EXT_WORD
PRE_IO PRE_IO
READ_BYTE_F(adr, res) READ_BYTE_F(adr, dst)
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
WRITE_BYTE_F(adr, res) res = (res + 0x9a) & 0xFF;
WRITE_BYTE_F(adr, res)
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
POST_IO POST_IO
RET(18) RET(18)
@ -17089,18 +17101,20 @@ OPCODE(0x4838)
FETCH_SWORD(adr); FETCH_SWORD(adr);
PRE_IO PRE_IO
READ_BYTE_F(adr, res) READ_BYTE_F(adr, dst)
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
WRITE_BYTE_F(adr, res) res = (res + 0x9a) & 0xFF;
WRITE_BYTE_F(adr, res)
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
POST_IO POST_IO
RET(16) RET(16)
@ -17114,18 +17128,20 @@ OPCODE(0x4839)
FETCH_LONG(adr); FETCH_LONG(adr);
PRE_IO PRE_IO
READ_BYTE_F(adr, res) READ_BYTE_F(adr, dst)
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
WRITE_BYTE_F(adr, res) res = (res + 0x9a) & 0xFF;
WRITE_BYTE_F(adr, res)
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
POST_IO POST_IO
RET(20) RET(20)
@ -17140,18 +17156,20 @@ OPCODE(0x481F)
adr = AREG(7); adr = AREG(7);
AREG(7) += 2; AREG(7) += 2;
PRE_IO PRE_IO
READ_BYTE_F(adr, res) READ_BYTE_F(adr, dst)
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
WRITE_BYTE_F(adr, res) res = (res + 0x9a) & 0xFF;
WRITE_BYTE_F(adr, res)
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
POST_IO POST_IO
RET(12) RET(12)
@ -17166,18 +17184,20 @@ OPCODE(0x4827)
adr = AREG(7) - 2; adr = AREG(7) - 2;
AREG(7) = adr; AREG(7) = adr;
PRE_IO PRE_IO
READ_BYTE_F(adr, res) READ_BYTE_F(adr, dst)
res = 0x9a - res - ((flag_X >> M68K_SR_X_SFT) & 1); res = -dst - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res != 0x9a) if (res != 0)
{ {
if ((res & 0x0f) == 0xa) res = (res & 0xf0) + 0x10; flag_V = res;
res &= 0xFF; if (((res|dst) & 0x0f) == 0) res = (res & 0xf0) + 6;
WRITE_BYTE_F(adr, res) res = (res + 0x9a) & 0xFF;
WRITE_BYTE_F(adr, res)
flag_V &= ~res;
flag_NotZ |= res; flag_NotZ |= res;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_V = flag_X = flag_C = 0;
flag_N = res; flag_N = res;
POST_IO POST_IO
RET(14) RET(14)
@ -26933,19 +26953,19 @@ OPCODE(0x8100)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
src = DREGu8((Opcode >> 0) & 7); src = DREGu8((Opcode >> 0) & 7);
dst = DREGu8((Opcode >> 9) & 7); dst = DREGu8((Opcode >> 9) & 7);
res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res -= 6; if (res > 0xF) corf = 6;
res += (dst & 0xF0) - (src & 0xF0); res += (dst & 0xF0) - (src & 0xF0);
if (res > 0x99) flag_V = res;
{ flag_X = flag_C = (s32)res < (s32)corf ? M68K_SR_C : 0;
res += 0xA0; if (res > 0xff) res += 0xA0;
flag_X = flag_C = M68K_SR_C; res = (res - corf) & 0xFF;
} flag_V &= ~res;
else flag_X = flag_C = 0; flag_NotZ |= res;
flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
DREGu8((Opcode >> 9) & 7) = res; DREGu8((Opcode >> 9) & 7) = res;
RET(6) RET(6)
@ -26956,6 +26976,7 @@ OPCODE(0x8108)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
adr = AREG((Opcode >> 0) & 7) - 1; adr = AREG((Opcode >> 0) & 7) - 1;
AREG((Opcode >> 0) & 7) = adr; AREG((Opcode >> 0) & 7) = adr;
@ -26965,15 +26986,14 @@ OPCODE(0x8108)
AREG((Opcode >> 9) & 7) = adr; AREG((Opcode >> 9) & 7) = adr;
READ_BYTE_F(adr, dst) READ_BYTE_F(adr, dst)
res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res -= 6; if (res > 0xF) corf = 6;
res += (dst & 0xF0) - (src & 0xF0); res += (dst & 0xF0) - (src & 0xF0);
if (res > 0x99) flag_V = res;
{ flag_X = flag_C = (s32)res < (s32)corf ? M68K_SR_C : 0;
res += 0xA0; if (res > 0xff) res += 0xA0;
flag_X = flag_C = M68K_SR_C; res = (res - corf) & 0xFF;
} flag_V &= ~res;
else flag_X = flag_C = 0; flag_NotZ |= res;
flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
WRITE_BYTE_F(adr, res) WRITE_BYTE_F(adr, res)
POST_IO POST_IO
@ -26985,6 +27005,7 @@ OPCODE(0x810F)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
adr = AREG(7) - 2; adr = AREG(7) - 2;
AREG(7) = adr; AREG(7) = adr;
@ -26994,15 +27015,14 @@ OPCODE(0x810F)
AREG((Opcode >> 9) & 7) = adr; AREG((Opcode >> 9) & 7) = adr;
READ_BYTE_F(adr, dst) READ_BYTE_F(adr, dst)
res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res -= 6; if (res > 0xF) corf = 6;
res += (dst & 0xF0) - (src & 0xF0); res += (dst & 0xF0) - (src & 0xF0);
if (res > 0x99) flag_V = res;
{ flag_X = flag_C = (s32)res < (s32)corf ? M68K_SR_C : 0;
res += 0xA0; if (res > 0xff) res += 0xA0;
flag_X = flag_C = M68K_SR_C; res = (res - corf) & 0xFF;
} flag_V &= ~res;
else flag_X = flag_C = 0; flag_NotZ |= res;
flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
WRITE_BYTE_F(adr, res) WRITE_BYTE_F(adr, res)
POST_IO POST_IO
@ -27014,6 +27034,7 @@ OPCODE(0x8F08)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
adr = AREG((Opcode >> 0) & 7) - 1; adr = AREG((Opcode >> 0) & 7) - 1;
AREG((Opcode >> 0) & 7) = adr; AREG((Opcode >> 0) & 7) = adr;
@ -27023,15 +27044,14 @@ OPCODE(0x8F08)
AREG(7) = adr; AREG(7) = adr;
READ_BYTE_F(adr, dst) READ_BYTE_F(adr, dst)
res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res -= 6; if (res > 0xF) corf = 6;
res += (dst & 0xF0) - (src & 0xF0); res += (dst & 0xF0) - (src & 0xF0);
if (res > 0x99) flag_V = res;
{ flag_X = flag_C = (s32)res < (s32)corf ? M68K_SR_C : 0;
res += 0xA0; if (res > 0xff) res += 0xA0;
flag_X = flag_C = M68K_SR_C; res = (res - corf) & 0xFF;
} flag_V &= ~res;
else flag_X = flag_C = 0; flag_NotZ |= res;
flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
WRITE_BYTE_F(adr, res) WRITE_BYTE_F(adr, res)
POST_IO POST_IO
@ -27043,6 +27063,7 @@ OPCODE(0x8F0F)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
adr = AREG(7) - 2; adr = AREG(7) - 2;
AREG(7) = adr; AREG(7) = adr;
@ -27052,15 +27073,14 @@ OPCODE(0x8F0F)
AREG(7) = adr; AREG(7) = adr;
READ_BYTE_F(adr, dst) READ_BYTE_F(adr, dst)
res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) - (src & 0xF) - ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res -= 6; if (res > 0xF) corf = 6;
res += (dst & 0xF0) - (src & 0xF0); res += (dst & 0xF0) - (src & 0xF0);
if (res > 0x99) flag_V = res;
{ flag_X = flag_C = (s32)res < (s32)corf ? M68K_SR_C : 0;
res += 0xA0; if (res > 0xff) res += 0xA0;
flag_X = flag_C = M68K_SR_C; res = (res - corf) & 0xFF;
} flag_V &= ~res;
else flag_X = flag_C = 0; flag_NotZ |= res;
flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
WRITE_BYTE_F(adr, res) WRITE_BYTE_F(adr, res)
POST_IO POST_IO
@ -34120,18 +34140,22 @@ OPCODE(0xC100)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
src = DREGu8((Opcode >> 0) & 7); src = DREGu8((Opcode >> 0) & 7);
dst = DREGu8((Opcode >> 9) & 7); dst = DREGu8((Opcode >> 9) & 7);
res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res += 6; if (res > 9) corf = 6;
res += (dst & 0xF0) + (src & 0xF0); res += (dst & 0xF0) + (src & 0xF0);
if (res > 0x99) flag_V = ~res;
res += corf;
if (res > 0x9F)
{ {
res -= 0xA0; res -= 0xA0;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_X = flag_C = 0;
flag_V &= res;
flag_NotZ |= res & 0xFF; flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
DREGu8((Opcode >> 9) & 7) = res; DREGu8((Opcode >> 9) & 7) = res;
@ -34143,6 +34167,7 @@ OPCODE(0xC108)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
adr = AREG((Opcode >> 0) & 7) - 1; adr = AREG((Opcode >> 0) & 7) - 1;
AREG((Opcode >> 0) & 7) = adr; AREG((Opcode >> 0) & 7) = adr;
@ -34152,14 +34177,17 @@ OPCODE(0xC108)
AREG((Opcode >> 9) & 7) = adr; AREG((Opcode >> 9) & 7) = adr;
READ_BYTE_F(adr, dst) READ_BYTE_F(adr, dst)
res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res += 6; if (res > 9) corf = 6;
res += (dst & 0xF0) + (src & 0xF0); res += (dst & 0xF0) + (src & 0xF0);
if (res > 0x99) flag_V = ~res;
res += corf;
if (res > 0x9F)
{ {
res -= 0xA0; res -= 0xA0;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_X = flag_C = 0;
flag_V &= res;
flag_NotZ |= res & 0xFF; flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
WRITE_BYTE_F(adr, res) WRITE_BYTE_F(adr, res)
@ -34172,6 +34200,7 @@ OPCODE(0xC10F)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
adr = AREG(7) - 2; adr = AREG(7) - 2;
AREG(7) = adr; AREG(7) = adr;
@ -34181,14 +34210,17 @@ OPCODE(0xC10F)
AREG((Opcode >> 9) & 7) = adr; AREG((Opcode >> 9) & 7) = adr;
READ_BYTE_F(adr, dst) READ_BYTE_F(adr, dst)
res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res += 6; if (res > 9) corf = 6;
res += (dst & 0xF0) + (src & 0xF0); res += (dst & 0xF0) + (src & 0xF0);
if (res > 0x99) flag_V = ~res;
res += corf;
if (res > 0x9F)
{ {
res -= 0xA0; res -= 0xA0;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_X = flag_C = 0;
flag_V &= res;
flag_NotZ |= res & 0xFF; flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
WRITE_BYTE_F(adr, res) WRITE_BYTE_F(adr, res)
@ -34201,6 +34233,7 @@ OPCODE(0xCF08)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
adr = AREG((Opcode >> 0) & 7) - 1; adr = AREG((Opcode >> 0) & 7) - 1;
AREG((Opcode >> 0) & 7) = adr; AREG((Opcode >> 0) & 7) = adr;
@ -34210,14 +34243,17 @@ OPCODE(0xCF08)
AREG(7) = adr; AREG(7) = adr;
READ_BYTE_F(adr, dst) READ_BYTE_F(adr, dst)
res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res += 6; if (res > 9) corf = 6;
res += (dst & 0xF0) + (src & 0xF0); res += (dst & 0xF0) + (src & 0xF0);
if (res > 0x99) flag_V = ~res;
res += corf;
if (res > 0x9F)
{ {
res -= 0xA0; res -= 0xA0;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_X = flag_C = 0;
flag_V &= res;
flag_NotZ |= res & 0xFF; flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
WRITE_BYTE_F(adr, res) WRITE_BYTE_F(adr, res)
@ -34230,6 +34266,7 @@ OPCODE(0xCF0F)
{ {
u32 adr, res; u32 adr, res;
u32 src, dst; u32 src, dst;
u32 corf = 0;
adr = AREG(7) - 2; adr = AREG(7) - 2;
AREG(7) = adr; AREG(7) = adr;
@ -34239,14 +34276,17 @@ OPCODE(0xCF0F)
AREG(7) = adr; AREG(7) = adr;
READ_BYTE_F(adr, dst) READ_BYTE_F(adr, dst)
res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1); res = (dst & 0xF) + (src & 0xF) + ((flag_X >> M68K_SR_X_SFT) & 1);
if (res > 9) res += 6; if (res > 9) corf = 6;
res += (dst & 0xF0) + (src & 0xF0); res += (dst & 0xF0) + (src & 0xF0);
if (res > 0x99) flag_V = ~res;
res += corf;
if (res > 0x9F)
{ {
res -= 0xA0; res -= 0xA0;
flag_X = flag_C = M68K_SR_C; flag_X = flag_C = M68K_SR_C;
} }
else flag_X = flag_C = 0; else flag_X = flag_C = 0;
flag_V &= res;
flag_NotZ |= res & 0xFF; flag_NotZ |= res & 0xFF;
flag_N = res; flag_N = res;
WRITE_BYTE_F(adr, res) WRITE_BYTE_F(adr, res)

190
cpu/musashi/m68k_in.c
View file

@ -918,13 +918,15 @@ M68KMAKE_OP(abcd, 8, rr, .)
uint src = DY; uint src = DY;
uint dst = *r_dst; uint dst = *r_dst;
uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(); uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
uint corf = 0;
FLAG_V = ~res; /* Undefined V behavior */
if(res > 9) if(res > 9)
res += 6; corf = 6;
res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst); res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
FLAG_X = FLAG_C = (res > 0x99) << 8; FLAG_V = ~res; /* Undefined V behavior */
res += corf;
FLAG_X = FLAG_C = (res > 0x9f) << 8;
if(FLAG_C) if(FLAG_C)
res -= 0xa0; res -= 0xa0;
@ -944,13 +946,15 @@ M68KMAKE_OP(abcd, 8, mm, ax7)
uint ea = EA_A7_PD_8(); uint ea = EA_A7_PD_8();
uint dst = m68ki_read_8(ea); uint dst = m68ki_read_8(ea);
uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(); uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
uint corf = 0;
FLAG_V = ~res; /* Undefined V behavior */
if(res > 9) if(res > 9)
res += 6; corf = 6;
res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst); res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
FLAG_X = FLAG_C = (res > 0x99) << 8; FLAG_V = ~res; /* Undefined V behavior */
res += corf;
FLAG_X = FLAG_C = (res > 0x9f) << 8;
if(FLAG_C) if(FLAG_C)
res -= 0xa0; res -= 0xa0;
@ -970,13 +974,15 @@ M68KMAKE_OP(abcd, 8, mm, ay7)
uint ea = EA_AX_PD_8(); uint ea = EA_AX_PD_8();
uint dst = m68ki_read_8(ea); uint dst = m68ki_read_8(ea);
uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(); uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
uint corf = 0;
FLAG_V = ~res; /* Undefined V behavior */
if(res > 9) if(res > 9)
res += 6; corf = 6;
res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst); res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
FLAG_X = FLAG_C = (res > 0x99) << 8; FLAG_V = ~res; /* Undefined V behavior */
res += corf;
FLAG_X = FLAG_C = (res > 0x9f) << 8;
if(FLAG_C) if(FLAG_C)
res -= 0xa0; res -= 0xa0;
@ -996,13 +1002,15 @@ M68KMAKE_OP(abcd, 8, mm, axy7)
uint ea = EA_A7_PD_8(); uint ea = EA_A7_PD_8();
uint dst = m68ki_read_8(ea); uint dst = m68ki_read_8(ea);
uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(); uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
uint corf = 0;
FLAG_V = ~res; /* Undefined V behavior */
if(res > 9) if(res > 9)
res += 6; corf = 6;
res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst); res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
FLAG_X = FLAG_C = (res > 0x99) << 8; FLAG_V = ~res; /* Undefined V behavior */
res += corf;
FLAG_X = FLAG_C = (res > 0x9f) << 8;
if(FLAG_C) if(FLAG_C)
res -= 0xa0; res -= 0xa0;
@ -1022,13 +1030,15 @@ M68KMAKE_OP(abcd, 8, mm, .)
uint ea = EA_AX_PD_8(); uint ea = EA_AX_PD_8();
uint dst = m68ki_read_8(ea); uint dst = m68ki_read_8(ea);
uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1(); uint res = LOW_NIBBLE(src) + LOW_NIBBLE(dst) + XFLAG_AS_1();
uint corf = 0;
FLAG_V = ~res; /* Undefined V behavior */
if(res > 9) if(res > 9)
res += 6; corf = 6;
res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst); res += HIGH_NIBBLE(src) + HIGH_NIBBLE(dst);
FLAG_X = FLAG_C = (res > 0x99) << 8; FLAG_V = ~res; /* Undefined V behavior */
res += corf;
FLAG_X = FLAG_C = (res > 0x9f) << 8;
if(FLAG_C) if(FLAG_C)
res -= 0xa0; res -= 0xa0;
@ -7794,19 +7804,19 @@ M68KMAKE_OP(mull, 32, ., .)
M68KMAKE_OP(nbcd, 8, ., d) M68KMAKE_OP(nbcd, 8, ., d)
{ {
uint* r_dst = &DY; uint* r_dst = &DY;
uint dst = *r_dst; uint dst = MASK_OUT_ABOVE_8(*r_dst);
uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1()); uint res = -dst - XFLAG_AS_1();
if(res != 0x9a) if(res != 0)
{ {
FLAG_V = ~res; /* Undefined V behavior */ FLAG_V = res; /* Undefined V behavior */
if((res & 0x0f) == 0xa) if(((res|dst) & 0x0f) == 0)
res = (res & 0xf0) + 0x10; res = (res & 0xf0) + 6;
res = MASK_OUT_ABOVE_8(res); res = MASK_OUT_ABOVE_8(res + 0x9a);
FLAG_V &= res; /* Undefined V behavior part II */ FLAG_V &= ~res; /* Undefined V behavior part II */
*r_dst = MASK_OUT_BELOW_8(*r_dst) | res; *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
@ -7828,18 +7838,18 @@ M68KMAKE_OP(nbcd, 8, ., .)
{ {
uint ea = M68KMAKE_GET_EA_AY_8; uint ea = M68KMAKE_GET_EA_AY_8;
uint dst = m68ki_read_8(ea); uint dst = m68ki_read_8(ea);
uint res = MASK_OUT_ABOVE_8(0x9a - dst - XFLAG_AS_1()); uint res = -dst - XFLAG_AS_1();
if(res != 0x9a) if(res != 0)
{ {
FLAG_V = ~res; /* Undefined V behavior */ FLAG_V = res; /* Undefined V behavior */
if((res & 0x0f) == 0xa) if(((res|dst) & 0x0f) == 0)
res = (res & 0xf0) + 0x10; res = (res & 0xf0) + 6;
res = MASK_OUT_ABOVE_8(res); res = MASK_OUT_ABOVE_8(res + 0x9a);
FLAG_V &= res; /* Undefined V behavior part II */ FLAG_V &= ~res; /* Undefined V behavior part II */
m68ki_write_8(ea, MASK_OUT_ABOVE_8(res)); m68ki_write_8(ea, MASK_OUT_ABOVE_8(res));
@ -9359,26 +9369,26 @@ M68KMAKE_OP(sbcd, 8, rr, .)
uint src = DY; uint src = DY;
uint dst = *r_dst; uint dst = *r_dst;
uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(); uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
uint corf = 0;
// FLAG_V = ~res; /* Undefined V behavior */ if(res > 0xf)
FLAG_V = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to assume cleared. */ corf = 6;
if(res > 9)
res -= 6;
res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src); res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
if(res > 0x99) FLAG_V = res; /* Undefined V behavior */
if(res > 0xff)
{ {
res += 0xa0; res += 0xa0;
FLAG_X = FLAG_C = CFLAG_SET; FLAG_X = FLAG_C = CFLAG_SET;
FLAG_N = NFLAG_SET; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
} }
else if(res < corf)
FLAG_X = FLAG_C = CFLAG_SET;
else else
FLAG_N = FLAG_X = FLAG_C = 0; FLAG_X = FLAG_C = 0;
res = MASK_OUT_ABOVE_8(res); res = MASK_OUT_ABOVE_8(res - corf);
// FLAG_V &= res; /* Undefined V behavior part II */ FLAG_V &= ~res; /* Undefined V behavior part II */
// FLAG_N = NFLAG_8(res); /* Undefined N behavior */ FLAG_N = NFLAG_8(res); /* Undefined N behavior */
FLAG_Z |= res; FLAG_Z |= res;
*r_dst = MASK_OUT_BELOW_8(*r_dst) | res; *r_dst = MASK_OUT_BELOW_8(*r_dst) | res;
@ -9391,26 +9401,26 @@ M68KMAKE_OP(sbcd, 8, mm, ax7)
uint ea = EA_A7_PD_8(); uint ea = EA_A7_PD_8();
uint dst = m68ki_read_8(ea); uint dst = m68ki_read_8(ea);
uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(); uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
uint corf = 0;
// FLAG_V = ~res; /* Undefined V behavior */ if(res > 0xf)
FLAG_V = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */ corf = 6;
if(res > 9)
res -= 6;
res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src); res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
if(res > 0x99) FLAG_V = res; /* Undefined V behavior */
if(res > 0xff)
{ {
res += 0xa0; res += 0xa0;
FLAG_X = FLAG_C = CFLAG_SET; FLAG_X = FLAG_C = CFLAG_SET;
FLAG_N = NFLAG_SET; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
} }
else if(res < corf)
FLAG_X = FLAG_C = CFLAG_SET;
else else
FLAG_N = FLAG_X = FLAG_C = 0; FLAG_X = FLAG_C = 0;
res = MASK_OUT_ABOVE_8(res); res = MASK_OUT_ABOVE_8(res - corf);
// FLAG_V &= res; /* Undefined V behavior part II */ FLAG_V &= ~res; /* Undefined V behavior part II */
// FLAG_N = NFLAG_8(res); /* Undefined N behavior */ FLAG_N = NFLAG_8(res); /* Undefined N behavior */
FLAG_Z |= res; FLAG_Z |= res;
m68ki_write_8(ea, res); m68ki_write_8(ea, res);
@ -9423,26 +9433,26 @@ M68KMAKE_OP(sbcd, 8, mm, ay7)
uint ea = EA_AX_PD_8(); uint ea = EA_AX_PD_8();
uint dst = m68ki_read_8(ea); uint dst = m68ki_read_8(ea);
uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(); uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
uint corf = 0;
// FLAG_V = ~res; /* Undefined V behavior */ if(res > 0xf)
FLAG_V = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */ corf = 6;
if(res > 9)
res -= 6;
res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src); res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
if(res > 0x99) FLAG_V = res; /* Undefined V behavior */
if(res > 0xff)
{ {
res += 0xa0; res += 0xa0;
FLAG_X = FLAG_C = CFLAG_SET; FLAG_X = FLAG_C = CFLAG_SET;
FLAG_N = NFLAG_SET; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
} }
else if(res < corf)
FLAG_X = FLAG_C = CFLAG_SET;
else else
FLAG_N = FLAG_X = FLAG_C = 0; FLAG_X = FLAG_C = 0;
res = MASK_OUT_ABOVE_8(res); res = MASK_OUT_ABOVE_8(res - corf);
// FLAG_V &= res; /* Undefined V behavior part II */ FLAG_V &= ~res; /* Undefined V behavior part II */
// FLAG_N = NFLAG_8(res); /* Undefined N behavior */ FLAG_N = NFLAG_8(res); /* Undefined N behavior */
FLAG_Z |= res; FLAG_Z |= res;
m68ki_write_8(ea, res); m68ki_write_8(ea, res);
@ -9455,26 +9465,26 @@ M68KMAKE_OP(sbcd, 8, mm, axy7)
uint ea = EA_A7_PD_8(); uint ea = EA_A7_PD_8();
uint dst = m68ki_read_8(ea); uint dst = m68ki_read_8(ea);
uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(); uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
uint corf = 0;
// FLAG_V = ~res; /* Undefined V behavior */ if(res > 0xf)
FLAG_V = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */ corf = 6;
if(res > 9)
res -= 6;
res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src); res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
if(res > 0x99) FLAG_V = res; /* Undefined V behavior */
if(res > 0xff)
{ {
res += 0xa0; res += 0xa0;
FLAG_X = FLAG_C = CFLAG_SET; FLAG_X = FLAG_C = CFLAG_SET;
FLAG_N = NFLAG_SET; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
} }
else if(res < corf)
FLAG_X = FLAG_C = CFLAG_SET;
else else
FLAG_N = FLAG_X = FLAG_C = 0; FLAG_X = FLAG_C = 0;
res = MASK_OUT_ABOVE_8(res); res = MASK_OUT_ABOVE_8(res - corf);
// FLAG_V &= res; /* Undefined V behavior part II */ FLAG_V &= ~res; /* Undefined V behavior part II */
// FLAG_N = NFLAG_8(res); /* Undefined N behavior */ FLAG_N = NFLAG_8(res); /* Undefined N behavior */
FLAG_Z |= res; FLAG_Z |= res;
m68ki_write_8(ea, res); m68ki_write_8(ea, res);
@ -9487,26 +9497,26 @@ M68KMAKE_OP(sbcd, 8, mm, .)
uint ea = EA_AX_PD_8(); uint ea = EA_AX_PD_8();
uint dst = m68ki_read_8(ea); uint dst = m68ki_read_8(ea);
uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1(); uint res = LOW_NIBBLE(dst) - LOW_NIBBLE(src) - XFLAG_AS_1();
uint corf = 0;
// FLAG_V = ~res; /* Undefined V behavior */ if(res > 0xf)
FLAG_V = VFLAG_CLEAR; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to return zero. */ corf = 6;
if(res > 9)
res -= 6;
res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src); res += HIGH_NIBBLE(dst) - HIGH_NIBBLE(src);
if(res > 0x99) FLAG_V = res; /* Undefined V behavior */
if(res > 0xff)
{ {
res += 0xa0; res += 0xa0;
FLAG_X = FLAG_C = CFLAG_SET; FLAG_X = FLAG_C = CFLAG_SET;
FLAG_N = NFLAG_SET; /* Undefined in Motorola's M68000PM/AD rev.1 and safer to follow carry. */
} }
else if(res < corf)
FLAG_X = FLAG_C = CFLAG_SET;
else else
FLAG_N = FLAG_X = FLAG_C = 0; FLAG_X = FLAG_C = 0;
res = MASK_OUT_ABOVE_8(res); res = MASK_OUT_ABOVE_8(res - corf);
// FLAG_V &= res; /* Undefined V behavior part II */ FLAG_V &= ~res; /* Undefined V behavior part II */
// FLAG_N = NFLAG_8(res); /* Undefined N behavior */ FLAG_N = NFLAG_8(res); /* Undefined N behavior */
FLAG_Z |= res; FLAG_Z |= res;
m68ki_write_8(ea, res); m68ki_write_8(ea, res);