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

Fix mupen64plus breakage after security updates

This commit is contained in:
CasualPokePlayer 2024-05-31 17:28:23 -07:00
parent f16e2107bf
commit d2fe532f6d
4 changed files with 56 additions and 46 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.

27
libmupen64plus/mupen64plus-core/src/main/rom.c
View File

@ -125,7 +125,7 @@ m64p_error open_rom(const unsigned char* romimage, unsigned int size)
char buffer[256];
unsigned char imagetype;
int i;
m64p_handle CoreSection = NULL;
m64p_handle CoreSection = NULL;
/* check input requirements */
if (rom != NULL)
@ -143,7 +143,18 @@ m64p_error open_rom(const unsigned char* romimage, unsigned int size)
g_MemHasBeenBSwapped = 0;
/* allocate new buffer for ROM and copy into this buffer */
rom_size = size;
rom = (unsigned char *) malloc(size);
/* round rom size to the next power of 2 */
while (rom_size & (rom_size - 1))
{
rom_size |= rom_size >> 1;
rom_size++;
}
if (rom_size == 0)
return M64ERR_INPUT_INVALID;
rom = (unsigned char *) calloc(rom_size, sizeof(unsigned char));
if (rom == NULL)
return M64ERR_NO_MEMORY;
memcpy(rom, romimage, size);
@ -170,7 +181,7 @@ m64p_error open_rom(const unsigned char* romimage, unsigned int size)
trim(ROM_PARAMS.headername); /* Remove trailing whitespace from ROM name. */
/* Look up this ROM in the .ini file and fill in goodname, etc */
/*
/*
if ((entry=ini_search_by_md5(digest)) != NULL ||
(entry=ini_search_by_crc(sl(ROM_HEADER.CRC1),sl(ROM_HEADER.CRC2))) != NULL)
{
@ -190,16 +201,16 @@ m64p_error open_rom(const unsigned char* romimage, unsigned int size)
ROM_SETTINGS.players = 0;
ROM_SETTINGS.rumble = 0;
}
*/
*/
strcpy(ROM_SETTINGS.goodname, ROM_PARAMS.headername);
strcpy(ROM_SETTINGS.goodname, ROM_PARAMS.headername);
strcat(ROM_SETTINGS.goodname, " (unknown rom)");
ROM_SETTINGS.savetype = 0;
ROM_SETTINGS.savetype = 0;
if (ConfigOpenSection("Core", &CoreSection) == M64ERR_SUCCESS)
{
ConfigSetDefaultInt(CoreSection, "SaveType", NONE, "The savetype for the game");
ROM_SETTINGS.savetype = ConfigGetParamInt(CoreSection, "SaveType");
ConfigSetDefaultInt(CoreSection, "SaveType", NONE, "The savetype for the game");
ROM_SETTINGS.savetype = ConfigGetParamInt(CoreSection, "SaveType");
}
ROM_SETTINGS.status = 0;

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

@ -205,7 +205,7 @@ void dma_pi_write(void)
unsigned long rdram_address2 = pi_register.pi_dram_addr_reg+i+0xa0000000;
((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)];
if (!invalid_code[rdram_address1>>12])
{

73
libmupen64plus/mupen64plus-core/src/memory/memory.c
View File

@ -139,7 +139,7 @@ void (*traceCB)(void) = NULL;
//#define COUNT_WRITE_RDRAM_CALLS 1
#if defined( COUNT_WRITE_RDRAM_CALLS )
int writerdram_count = 1;
int writerdram_count = 1;
#endif
int init_memory(int DoByteSwap)
@ -1765,8 +1765,8 @@ void read_rdramFBd(void)
void write_rdram(void)
{
#if defined( COUNT_WRITE_RDRAM_CALLS )
printf( "write_rdram, word=%i, count: %i", word, writerdram_count );
writerdram_count++;
printf( "write_rdram, word=%i, count: %i", word, writerdram_count );
writerdram_count++;
#endif
*((unsigned int *)(rdramb + (address & 0xFFFFFF))) = word;
}
@ -1908,13 +1908,13 @@ void write_rdramregd(void)
void read_rsp_mem(void)
{
if (*address_low < 0x1000)
{
{
*rdword = *((unsigned int *)(SP_DMEMb + (*address_low)));
}
}
else if (*address_low < 0x2000)
{
{
*rdword = *((unsigned int *)(SP_IMEMb + (*address_low&0xFFF)));
}
}
else
read_nomem();
}
@ -1922,13 +1922,13 @@ void read_rsp_mem(void)
void read_rsp_memb(void)
{
if (*address_low < 0x1000)
{
{
*rdword = *(SP_DMEMb + (*address_low^S8));
}
}
else if (*address_low < 0x2000)
{
{
*rdword = *(SP_IMEMb + ((*address_low&0xFFF)^S8));
}
}
else
read_nomemb();
}
@ -1936,13 +1936,13 @@ void read_rsp_memb(void)
void read_rsp_memh(void)
{
if (*address_low < 0x1000)
{
{
*rdword = *((unsigned short *)(SP_DMEMb + (*address_low^S16)));
}
}
else if (*address_low < 0x2000)
{
{
*rdword = *((unsigned short *)(SP_IMEMb + ((*address_low&0xFFF)^S16)));
}
}
else
read_nomemh();
}
@ -1966,13 +1966,13 @@ void read_rsp_memd(void)
void write_rsp_mem(void)
{
if (*address_low < 0x1000)
{
{
*((unsigned int *)(SP_DMEMb + (*address_low))) = word;
}
}
else if (*address_low < 0x2000)
{
{
*((unsigned int *)(SP_IMEMb + (*address_low&0xFFF))) = word;
}
}
else
write_nomem();
}
@ -1980,13 +1980,13 @@ void write_rsp_mem(void)
void write_rsp_memb(void)
{
if (*address_low < 0x1000)
{
{
*(SP_DMEMb + (*address_low^S8)) = cpu_byte;
}
}
else if (*address_low < 0x2000)
{
{
*(SP_IMEMb + ((*address_low&0xFFF)^S8)) = cpu_byte;
}
}
else
write_nomemb();
}
@ -1994,13 +1994,13 @@ void write_rsp_memb(void)
void write_rsp_memh(void)
{
if (*address_low < 0x1000)
{
{
*((unsigned short *)(SP_DMEMb + (*address_low^S16))) = hword;
}
}
else if (*address_low < 0x2000)
{
{
*((unsigned short *)(SP_IMEMb + ((*address_low&0xFFF)^S16))) = hword;
}
}
else
write_nomemh();
}
@ -3665,7 +3665,7 @@ void write_pif(void)
void write_pifb(void)
{
if ((*address_low > 0x7FF) || (*address_low < 0x7C0))
if ((*address_low > 0x7FF) || (*address_low < 0x7C0))
{
DebugMessage(M64MSG_ERROR, "writing a byte in PIF at invalid address 0x%x", address);
return;
@ -3741,14 +3741,13 @@ unsigned int *fast_mem_access(unsigned int address)
address = virtual_to_physical_address(address, 2);
if ((address & 0x1FFFFFFF) >= 0x10000000)
{
unsigned int ofs = ((address & 0x1FFFFFFF) - 0x10000000)/4;
if(ofs < rom_size/4)
return (unsigned int *)rom + ofs;
else {
return NULL;
}
}
{
unsigned int ofs = ((address & 0x1FFFFFFF) - 0x10000000)/4;
if (ofs < rom_size/4)
return (unsigned int *)rom + ofs;
else
return NULL;
}
else if ((address & 0x1FFFFFFF) < 0x800000)
return (unsigned int *)rdram + (address & 0x1FFFFFFF)/4;
else if (address >= 0xa4000000 && address <= 0xa4001000)
@ -3761,5 +3760,5 @@ unsigned int *fast_mem_access(unsigned int address)
EXPORT void CALL SetTraceCallback(void (*CB)(void))
{
traceCB = CB;
traceCB = CB;
}