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

prevent svp dereferences when not using an svp cart (fixes #3297)

This commit is contained in:
CasualPokePlayer 2022-06-29 13:03:55 -07:00
parent e88fa81358
commit 5875df4b76
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/dll/gpgx.wbx.gz
View File

Binary file not shown.

10
waterbox/gpgx/core/mem68k.c
View File

@ -416,13 +416,13 @@ unsigned int ctrl_io_read_byte(unsigned int address)
case 0x44: /* RADICA */ case 0x44: /* RADICA */
case 0x50: /* SVP */ case 0x50: /* SVP */
{ {
if ((address & 0xFC) == 0x00) if (svp && (address & 0xFC) == 0x00)
{ {
unsigned int data = svp->ssp1601.gr[SSP_XST].byte.h; unsigned int data = svp->ssp1601.gr[SSP_XST].byte.h;
return (address & 1) ? (data & 0xFF) : (data >> 8); return (address & 1) ? (data & 0xFF) : (data >> 8);
} }
if ((address & 0xFE) == 0x04) if (svp && (address & 0xFE) == 0x04)
{ {
unsigned int data = svp->ssp1601.gr[SSP_PM0].byte.h; unsigned int data = svp->ssp1601.gr[SSP_PM0].byte.h;
svp->ssp1601.gr[SSP_PM0].byte.h &= ~1; svp->ssp1601.gr[SSP_PM0].byte.h &= ~1;
@ -544,12 +544,12 @@ unsigned int ctrl_io_read_word(unsigned int address)
case 0x50: /* SVP */ case 0x50: /* SVP */
{ {
if ((address & 0xFC) == 0) if (svp && (address & 0xFC) == 0)
{ {
return svp->ssp1601.gr[SSP_XST].byte.h; return svp->ssp1601.gr[SSP_XST].byte.h;
} }
if ((address & 0xFE) == 4) if (svp && (address & 0xFE) == 4)
{ {
unsigned int data = svp->ssp1601.gr[SSP_PM0].byte.h; unsigned int data = svp->ssp1601.gr[SSP_PM0].byte.h;
svp->ssp1601.gr[SSP_PM0].byte.h &= ~1; svp->ssp1601.gr[SSP_PM0].byte.h &= ~1;
@ -1005,7 +1005,7 @@ void ctrl_io_write_word(unsigned int address, unsigned int data)
case 0x50: /* SVP */ case 0x50: /* SVP */
{ {
if (!(address & 0xFD)) if (svp && !(address & 0xFD))
{ {
svp->ssp1601.gr[SSP_XST].byte.h = data; svp->ssp1601.gr[SSP_XST].byte.h = data;
svp->ssp1601.gr[SSP_PM0].byte.h |= 2; svp->ssp1601.gr[SSP_PM0].byte.h |= 2;