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

Revert "Revert DMA:Linger last DMA on bus ..." 

This reverts commit 173512f65a.

Include the patch instead with one line removed that @Squall-Leonhart
said fixes the bug in Croket.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
This commit is contained in:
Rafael Kitover 2022-10-15 22:23:01 +00:00
parent 8f27869715
commit 05a69127c4
No known key found for this signature in database
GPG Key ID: 08AB596679D86240
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gba/GBA.cpp
View File

@ -50,8 +50,9 @@ bool busPrefetchEnable = false;
uint32_t busPrefetchCount = 0;
int cpuDmaTicksToUpdate = 0;
int cpuDmaCount = 0;
bool cpuDmaHack = false;
bool cpuDmaRunning = false;
uint32_t cpuDmaLast = 0;
uint32_t cpuDmaPC = 0;
int dummyAddress = 0;
bool cpuBreakLoop = false;
@ -2343,7 +2344,7 @@ void doDMA(uint32_t& s, uint32_t& d, uint32_t si, uint32_t di, uint32_t c, int t
int dw = 0;
int sc = c;
cpuDmaHack = true;
cpuDmaRunning = true;
cpuDmaCount = c;
// This is done to get the correct waitstates.
if (sm > 15)
@ -2408,7 +2409,7 @@ void doDMA(uint32_t& s, uint32_t& d, uint32_t si, uint32_t di, uint32_t c, int t
}
cpuDmaTicksToUpdate += totalTicks;
cpuDmaHack = false;
cpuDmaRunning = false;
}
void CPUCheckDMA(int reason, int dmamask)
@ -3660,7 +3661,7 @@ void CPUReset()
systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
cpuDmaHack = false;
cpuDmaRunning = false;
lastTime = systemGetClock();

9
src/gba/GBAinline.h
View File

@ -23,8 +23,9 @@ extern bool cpuSramEnabled;
extern bool cpuFlashEnabled;
extern bool cpuEEPROMEnabled;
extern bool cpuEEPROMSensorEnabled;
extern bool cpuDmaHack;
extern bool cpuDmaRunning;
extern uint32_t cpuDmaLast;
extern uint32_t cpuDmaPC;
extern bool timer0On;
extern int timer0Ticks;
extern int timer0ClockReload;
@ -165,7 +166,7 @@ static inline uint32_t CPUReadMemory(uint32_t address)
armMode ? armNextPC - 4 : armNextPC - 2);
}
#endif
if (cpuDmaHack) {
if (cpuDmaRunning || ((reg[15].I - cpuDmaPC) == (armState ? 4 : 2))) {
value = cpuDmaLast;
} else {
if (armState) {
@ -309,7 +310,7 @@ static inline uint32_t CPUReadHalfWord(uint32_t address)
// default
default:
unreadable:
if (cpuDmaHack) {
if (cpuDmaRunning || ((reg[15].I - cpuDmaPC) == (armState ? 4 : 2))) {
value = cpuDmaLast & 0xFFFF;
} else {
int param = reg[15].I;
@ -442,7 +443,7 @@ static inline uint8_t CPUReadByte(uint32_t address)
armMode ? armNextPC - 4 : armNextPC - 2);
}
#endif
if (cpuDmaHack) {
if (cpuDmaRunning || ((reg[15].I - cpuDmaPC) == (armState ? 4 : 2))) {
return cpuDmaLast & 0xFF;
} else {
if (armState) {