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

fix mupen buffer overflow checks; fix pure interpreter 

resolves #4095
This commit is contained in:
CasualPokePlayer 2024-10-18 15:35:45 -07:00
parent 542f917b1f
commit d3f4c1f441
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/mupen64plus.dll
View File

Binary file not shown.

6
libmupen64plus/mupen64plus-core/src/memory/dma.c
View File

@ -235,7 +235,7 @@ void dma_pi_write(void)
for (i=0; i<(int)longueur; i++)
{
((unsigned char*)rdram)[MASK_ADDR_U8((pi_register.pi_dram_addr_reg+i)^S8, rdram)]=
rom[MASK_ADDR_U8((((pi_register.pi_cart_addr_reg-0x10000000)&0x3FFFFFF)+i)^S8, rom)];
rom[((((pi_register.pi_cart_addr_reg-0x10000000)&0x3FFFFFF)+i)^S8) & (rom_size - 1)];
}
}
@ -300,7 +300,7 @@ void dma_sp_write(void)
for(j=0; j<count; j++) {
for(i=0; i<length; i++) {
spmem[MASK_ADDR_U8(memaddr^S8, SP_DMEM)] = dram[MASK_ADDR_U8(dramaddr^S8, rdram)];
spmem[(memaddr^S8) & 0xFFF] = dram[MASK_ADDR_U8(dramaddr^S8, rdram)];
memaddr++;
dramaddr++;
}
@ -326,7 +326,7 @@ void dma_sp_read(void)
for(j=0; j<count; j++) {
for(i=0; i<length; i++) {
dram[MASK_ADDR_U8(dramaddr^S8, rdram)] = spmem[MASK_ADDR_U8(memaddr^S8, SP_DMEM)];
dram[MASK_ADDR_U8(dramaddr^S8, rdram)] = spmem[(memaddr^S8) & 0xFFF];
memaddr++;
dramaddr++;
}

2
libmupen64plus/mupen64plus-core/src/memory/flashram.c
View File

@ -187,7 +187,7 @@ void dma_read_flashram(void)
for (i=0; i<(pi_register.pi_wr_len_reg & 0x0FFFFFF)+1; i++)
{
((unsigned char*)rdram)[MASK_ADDR_U8((pi_register.pi_dram_addr_reg+i)^S8, rdram)]=
flashram[MASK_ADDR_U8((((pi_register.pi_cart_addr_reg-0x08000000)&0xFFFF)*2+i)^S8, rdram)];
flashram[MASK_ADDR_U8((((pi_register.pi_cart_addr_reg-0x08000000)&0xFFFF)*2+i)^S8, flashram)];
}
break;
default: