otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Safety check for MSM6295 bankswitched address

Browse source
This commit is contained in:
cam900 2024-08-14 17:54:20 +09:00
parent 34517754ad
commit f906b4ebe4
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/engine/platform/msm6295.cpp
View file

@ -39,14 +39,25 @@ const char** DivPlatformMSM6295::getRegisterSheet() {
} }
u8 DivPlatformMSM6295::read_byte(u32 address) { u8 DivPlatformMSM6295::read_byte(u32 address) {
if (adpcmMem==NULL || address>=getSampleMemCapacity(0)) { if (adpcmMem==NULL) {
return 0; return 0;
} }
if (isBanked) { if (isBanked) {
if (address<0x400) { if (address<0x400) {
return adpcmMem[(bank[(address>>8)&0x3]<<16)|(address&0x3ff)]; unsigned int bankedAddress=(bank[(address>>8)&0x3]<<16)|(address&0x3ff);
if (bankedAddress>=getSampleMemCapacity(0)) {
return 0;
} }
return adpcmMem[(bank[(address>>16)&0x3]<<16)|(address&0xffff)]; return adpcmMem[bankedAddress&0xffffff];
}
unsigned int bankedAddress=(bank[(address>>16)&0x3]<<16)|(address&0xffff);
if (bankedAddress>=getSampleMemCapacity(0)) {
return 0;
}
return adpcmMem[bankedAddress&0xffffff];
}
if (address>=getSampleMemCapacity(0)) {
return 0;
} }
return adpcmMem[address&0x3ffff]; return adpcmMem[address&0x3ffff];
} }