lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DMA VRAM mirror overflow and small 1-off error 

Seems that this could make VRAM overflow big time and overwrite IWRAM
most of the time (since it lives after that buffer). This causes a
variety of errors, some of them hidden if IWRAM not used.
Most games do not use VRAM mirror so it's not a big deal, but some do
have a off-by-one errors that trigger this.
This commit is contained in:
David Guillen Fandos 2021-07-28 01:26:19 +02:00
parent 5fe5121c81
commit dec6f50d89
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gba_memory.c
View File

@ -619,7 +619,7 @@ u32 function_cc read_eeprom(void)
case 0x06: \
/* VRAM */ \
address &= 0x1FFFF; \
if(address > 0x18000) \
if(address >= 0x18000) \
address -= 0x8000; \
\
value = readaddress##type(vram, address); \
@ -2456,8 +2456,11 @@ dma_region_type dma_region_map[16] =
#define dma_read_iwram(type, transfer_size) \
read_value = readaddress##transfer_size(iwram + 0x8000, type##_ptr & 0x7FFF)\
#define dma_read_vram(type, transfer_size) \
read_value = readaddress##transfer_size(vram, type##_ptr & 0x1FFFF) \
#define dma_read_vram(type, transfer_size) { \
u32 rdaddr = type##_ptr & 0x1FFFF; \
if (rdaddr >= 0x18000) rdaddr -= 0x8000; \
read_value = readaddress##transfer_size(vram, rdaddr); \
}
#define dma_read_io(type, transfer_size) \
read_value = readaddress##transfer_size(io_registers, type##_ptr & 0x7FFF) \
@ -2489,9 +2492,11 @@ dma_region_type dma_region_map[16] =
eswap##transfer_size(read_value); \
smc_trigger |= address##transfer_size(iwram, type##_ptr & 0x7FFF) \
#define dma_write_vram(type, transfer_size) \
address##transfer_size(vram, type##_ptr & 0x1FFFF) = \
eswap##transfer_size(read_value) \
#define dma_write_vram(type, transfer_size) { \
u32 wraddr = type##_ptr & 0x1FFFF; \
if (wraddr >= 0x18000) wraddr -= 0x8000; \
address##transfer_size(vram, wraddr) = eswap##transfer_size(read_value); \
}
#define dma_write_io(type, transfer_size) \
write_io_register##transfer_size(type##_ptr & 0x3FF, read_value) \