libretro/FBNeo
1
0
Fork 0
mirror of https://github.com/libretro/FBNeo.git synced 2024-11-27 11:00:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

taito f3 scfinals: fix for coin and service mode issues. m68k, fix unaligned accesses

Browse Source
This commit is contained in:
dinkc64 2021-03-22 21:04:58 -04:00
parent 12563c05c9
commit 4c624b4d02
2 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/burn/drv/taito/d_taitof3.cpp
View File

@ -44,7 +44,6 @@ static INT32 sound_cpu_in_reset = 0;
static INT32 watchdog;
INT32 f3_game = 0;
static INT32 supercupkludge = 0;
static struct BurnInputInfo F3InputList[] = {
{"P1 Coin", BIT_DIGITAL, DrvJoy5 + 4, "p1 coin" },
@ -505,13 +504,13 @@ static void DrvPivotExpand(UINT16 offset)
static void __fastcall f3_VRAM_write_long(UINT32 a, UINT32 d)
{
if ((a & 0xffe000) == 0x61c000) {
*((UINT32*)(TaitoVideoRam + (a & 0x1fff))) = BURN_ENDIAN_SWAP_INT32((d << 16) | (d >> 16));
*((UINT32*)(TaitoVideoRam + (a & 0x1ffc))) = BURN_ENDIAN_SWAP_INT32((d << 16) | (d >> 16));
dirty_tile_count[9] = 1;
return;
}
if ((a & 0xffe000) == 0x61e000) {
*((UINT32*)(DrvVRAMRAM + (a & 0x1fff))) = BURN_ENDIAN_SWAP_INT32((d << 16) | (d >> 16));
*((UINT32*)(DrvVRAMRAM + (a & 0x1ffc))) = BURN_ENDIAN_SWAP_INT32((d << 16) | (d >> 16));
DrvVRAMExpand(a);
return;
}
@ -520,13 +519,13 @@ static void __fastcall f3_VRAM_write_long(UINT32 a, UINT32 d)
static void __fastcall f3_VRAM_write_word(UINT32 a, UINT16 d)
{
if ((a & 0xffe000) == 0x61c000) {
*((UINT16*)(TaitoVideoRam + (a & 0x1fff))) = BURN_ENDIAN_SWAP_INT16(d);
*((UINT16*)(TaitoVideoRam + (a & 0x1ffe))) = BURN_ENDIAN_SWAP_INT16(d);
dirty_tile_count[9] = 1;
return;
}
if ((a & 0xffe000) == 0x61e000) {
*((UINT16*)(DrvVRAMRAM + (a & 0x1fff))) = BURN_ENDIAN_SWAP_INT16(d);
*((UINT16*)(DrvVRAMRAM + (a & 0x1ffe))) = BURN_ENDIAN_SWAP_INT16(d);
DrvVRAMExpand(a);
return;
}
@ -1382,7 +1381,6 @@ static INT32 DrvExit()
BurnTrackballExit();
pPaletteUpdateCallback = NULL;
supercupkludge = 0;
return 0;
}
@ -1507,13 +1505,9 @@ static INT32 DrvFrame()
INT32 cur_coin = ((DrvJoy5[4] & 1) << 4) | ((DrvJoy5[5] & 1) << 5) | ((DrvJoy5[6] & 1) << 6) | ((DrvJoy5[7] & 1) << 7);
if (supercupkludge) {
if (cur_coin) DrvInputs[0] = 0xffff & ~0x200;
} else {
for (INT32 i = 0x10; i < 0x100; i <<= 1) {
if ((cur_coin & i) == i && (previous_coin & i) == 0) {
DrvInputs[4] &= ~i;
}
for (INT32 i = 0x10; i < 0x100; i <<= 1) {
if ((cur_coin & i) == i && (previous_coin & i) == 0) {
DrvInputs[4] &= ~i;
}
}
@ -2768,8 +2762,6 @@ static INT32 scfinalsCallback()
ROM[0x5af0/4] = BURN_ENDIAN_SWAP_INT32(0x4e754e71);
ROM[0xdd0/4] = BURN_ENDIAN_SWAP_INT32(0x4e714e75);
supercupkludge = 1;
return 0;
}
@ -2780,7 +2772,7 @@ static INT32 scfinalsInit()
struct BurnDriver BurnDrvScfinals = {
"scfinals", NULL, NULL, NULL, "1993",
"Super Cup Finals (Ver 2.2O 1994/01/13, single PCB)\0", "Use service coin! (game has issues)", "Taito Corporation Japan", "Taito F3 System",
"Super Cup Finals (Ver 2.2O 1994/01/13, single PCB)\0", NULL, "Taito Corporation Japan", "Taito F3 System",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING, 2, HARDWARE_TAITO_MISC, GBF_SPORTSFOOTBALL, 0,
NULL, scfinalsRomInfo, scfinalsRomName, NULL, NULL, NULL, NULL, F3InputInfo, F3DIPInfo,
@ -2823,7 +2815,7 @@ STD_ROM_FN(scfinalso)
struct BurnDriver BurnDrvScfinalso = {
"scfinalso", "scfinals", NULL, NULL, "1993",
"Super Cup Finals (Ver 2.1O 1993/11/19, single PCB)\0", "Use service coin! (game has issues)", "Taito Corporation Japan", "Taito F3 System",
"Super Cup Finals (Ver 2.1O 1993/11/19, single PCB)\0", NULL, "Taito Corporation Japan", "Taito F3 System",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SPORTSFOOTBALL, 0,
NULL, scfinalsoRomInfo, scfinalsoRomName, NULL, NULL, NULL, NULL, F3InputInfo, F3DIPInfo,
@ -2866,7 +2858,7 @@ STD_ROM_FN(scfinalsoc)
struct BurnDriver BurnDrvScfinalsoc = {
"scfinalsoc", "scfinals", NULL, NULL, "1993",
"Super Cup Finals (Ver 2.1O 1993/11/19, F3 Cartridge)\0", "Use service coin! (game has issues)", "Taito Corporation Japan", "Taito F3 System",
"Super Cup Finals (Ver 2.1O 1993/11/19, F3 Cartridge)\0", NULL, "Taito Corporation Japan", "Taito F3 System",
NULL, NULL, NULL, NULL,
BDF_GAME_WORKING | BDF_CLONE, 2, HARDWARE_TAITO_MISC, GBF_SPORTSFOOTBALL, 0,
NULL, scfinalsocRomInfo, scfinalsocRomName, NULL, NULL, NULL, NULL, F3InputInfo, F3DIPInfo,

39
src/cpu/m68000_intf.cpp
View File

@ -351,7 +351,14 @@ inline static UINT16 FetchWord(UINT32 a)
pr = FIND_F(a);
if ((uintptr_t)pr >= SEK_MAXHANDLER) {
return BURN_ENDIAN_SWAP_INT16(*((UINT16*)(pr + (a & SEK_PAGEM))));
if (a & 1)
{
return (ReadByte(a + 0) * 256) + ReadByte(a + 1);
}
else
{
return BURN_ENDIAN_SWAP_INT16(*((UINT16*)(pr + (a & SEK_PAGEM))));
}
}
return pSekExt->ReadWord[(uintptr_t)pr](a);
@ -401,8 +408,9 @@ inline static void WriteWordROM(UINT32 a, UINT16 d)
pSekExt->WriteWord[(uintptr_t)pr](a, d);
}
// [x] byte #
// be [3210] -> (r >> 16) | (r << 16) -> [1032] -> UINT32(le) = -> [0123]
// le [0123]
// mem [0123]
inline static UINT32 ReadLong(UINT32 a)
{
@ -417,7 +425,7 @@ inline static UINT32 ReadLong(UINT32 a)
{
UINT32 r = 0;
if (a & 1)
if (a & 3)
{
r = ReadByte((a + 0)) * 0x1000000;
r += ReadByte((a + 1)) * 0x10000;
@ -446,11 +454,28 @@ inline static UINT32 FetchLong(UINT32 a)
// bprintf(PRINT_NORMAL, _T("fetch32 0x%08X\n"), a);
//if (a&3) bprintf(0, _T("fetchlong offset-read @ %x\n"), a);
pr = FIND_F(a);
if ((uintptr_t)pr >= SEK_MAXHANDLER) {
UINT32 r = *((UINT32*)(pr + (a & SEK_PAGEM)));
r = (r >> 16) | (r << 16);
return BURN_ENDIAN_SWAP_INT32(r);
UINT32 r = 0;
if (a & 3)
{
r = ReadByte((a + 0)) * 0x1000000;
r += ReadByte((a + 1)) * 0x10000;
r += ReadByte((a + 2)) * 0x100;
r += ReadByte((a + 3));
return r;
}
else
{
r = *((UINT32*)(pr + (a & SEK_PAGEM)));
r = (r >> 16) | (r << 16);
return BURN_ENDIAN_SWAP_INT32(r);
}
}
return pSekExt->ReadLong[(uintptr_t)pr](a);
}
@ -466,7 +491,7 @@ inline static void WriteLong(UINT32 a, UINT32 d)
pr = FIND_W(a);
if ((uintptr_t)pr >= SEK_MAXHANDLER)
{
if (a & 1)
if (a & 3)
{
// bprintf(PRINT_NORMAL, _T("write32 0x%08X 0x%8.8x\n"), a,d);