ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

naomi: align SB_GDSTAR on 32-byte boundary 

Fixes vtennis (Issue #92)
This commit is contained in:
Flyinghead 2020-12-18 13:43:42 +01:00
parent a7a70f9900
commit e94e757743
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
core/hw/naomi/naomi.cpp
View File

@ -435,36 +435,42 @@ void Naomi_DmaStart(u32 addr, u32 data)
return;
}
SB_GDST|=data&1;
SB_GDST |= data & 1;
if (SB_GDST==1)
if (SB_GDST == 0)
return;
if (!m3comm.DmaStart(addr, data) && CurrentCartridge != NULL)
{
if (!m3comm.DmaStart(addr, data) && CurrentCartridge != NULL)
DEBUG_LOG(NAOMI, "NAOMI-DMA start addr %08X len %d", SB_GDSTAR, SB_GDLEN);
verify(1 == SB_GDDIR);
u32 start = SB_GDSTAR & 0x1FFFFFE0;
u32 len = (SB_GDLEN + 31) & ~31;
SB_GDLEND = 0;
while (len > 0)
{
DEBUG_LOG(NAOMI, "NAOMI-DMA start addr %08X len %d", SB_GDSTAR, SB_GDLEN);
verify(1 == SB_GDDIR);
u32 len = (SB_GDLEN + 30) & ~30;
u32 offset = 0;
while (len > 0)
u32 block_len = len;
void* ptr = CurrentCartridge->GetDmaPtr(block_len);
if (block_len == 0)
{
u32 block_len = len;
void* ptr = CurrentCartridge->GetDmaPtr(block_len);
if (block_len == 0)
{
INFO_LOG(NAOMI, "Aborted DMA transfer. Read past end of cart?");
break;
}
WriteMemBlock_nommu_ptr(SB_GDSTAR + offset, (u32*)ptr, block_len);
CurrentCartridge->AdvancePtr(block_len);
len -= block_len;
offset += block_len;
INFO_LOG(NAOMI, "Aborted DMA transfer. Read past end of cart?");
break;
}
WriteMemBlock_nommu_ptr(start, (u32*)ptr, block_len);
CurrentCartridge->AdvancePtr(block_len);
len -= block_len;
start += block_len;
SB_GDLEND += block_len;
}
SB_GDSTARD = start;
}
else
{
SB_GDSTARD = SB_GDSTAR + SB_GDLEN;
SB_GDLEND = SB_GDLEN;
SB_GDST = 0;
asic_RaiseInterrupt(holly_GDROM_DMA);
}
SB_GDST = 0;
asic_RaiseInterrupt(holly_GDROM_DMA);
}