admin/ci-libretro-fceumm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
twinaphex
2021-06-06 01:53:33 +02:00
parent 36e38000ef
commit 84bb7c4e9d
1 changed files with 193 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/ines.c
View File

@@ -851,7 +851,8 @@ static void rom_load_ines2(void) {
if (head.CHRRAM_size & 0xF0) iNESCart.CHRRamSaveSize = 64 << ((head.CHRRAM_size >> 4) & 0x0F); if (head.CHRRAM_size & 0xF0) iNESCart.CHRRamSaveSize = 64 << ((head.CHRRAM_size >> 4) & 0x0F);
} }
int iNESLoad(const char *name, FCEUFILE *fp) { int iNESLoad(const char *name, FCEUFILE *fp)
{
const char *tv_region[] = { "NTSC", "PAL", "Multi-region", "Dendy" }; const char *tv_region[] = { "NTSC", "PAL", "Multi-region", "Dendy" };
struct md5_context md5; struct md5_context md5;
#ifdef DEBUG #ifdef DEBUG
@@ -869,40 +870,39 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
filesize -= 16; /* remove header size from total size */ filesize -= 16; /* remove header size from total size */
if (memcmp(&head, "NES\x1a", 4)) { if (memcmp(&head, "NES\x1a", 4))
{
FCEU_PrintError("Not an iNES file!\n"); FCEU_PrintError("Not an iNES file!\n");
return 0; return 0;
} }
memset(&iNESCart, 0, sizeof(iNESCart)); memset(&iNESCart, 0, sizeof(iNESCart));
if (!memcmp((char*)(&head) + 0x7, "DiskDude", 8)) { if (!memcmp((char*)(&head) + 0x7, "DiskDude", 8))
memset((char*)(&head) + 0x7, 0, 0x9); memset((char*)(&head) + 0x7, 0, 0x9);
}
if (!memcmp((char*)(&head) + 0x7, "demiforce", 9)) { if (!memcmp((char*)(&head) + 0x7, "demiforce", 9))
memset((char*)(&head) + 0x7, 0, 0x9); memset((char*)(&head) + 0x7, 0, 0x9);
}
if (!memcmp((char*)(&head) + 0xA, "Ni03", 4)) { if (!memcmp((char*)(&head) + 0xA, "Ni03", 4))
{
if (!memcmp((char*)(&head) + 0x7, "Dis", 3)) if (!memcmp((char*)(&head) + 0x7, "Dis", 3))
memset((char*)(&head) + 0x7, 0, 0x9); memset((char*)(&head) + 0x7, 0, 0x9);
else else
memset((char*)(&head) + 0xA, 0, 0x6); memset((char*)(&head) + 0xA, 0, 0x6);
} }
iNESCart.iNES2 = get_ines_version(); if ((iNESCart.iNES2 = get_ines_version()))
if (!iNESCart.iNES2)
rom_load_ines();
else
rom_load_ines2(); rom_load_ines2();
else
rom_load_ines();
if (!ROM_size) if (!ROM_size)
ROM_size = 256; ROM_size = 256;
/* Trainer */ /* Trainer */
if (head.ROM_type & 4) { if (head.ROM_type & 4)
{
trainerpoo = (uint8*)FCEU_gmalloc(512); trainerpoo = (uint8*)FCEU_gmalloc(512);
FCEU_fread(trainerpoo, 512, 1, fp); FCEU_fread(trainerpoo, 512, 1, fp);
filesize -= 512; filesize -= 512;
@@ -910,9 +910,11 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
romSize = (ROM_size * 0x4000) + (VROM_size * 0x2000); romSize = (ROM_size * 0x4000) + (VROM_size * 0x2000);
if (romSize > filesize) { if (romSize > filesize)
{
FCEU_PrintError(" File length is too short to contain all data reported from header by %llu\n", romSize - filesize); FCEU_PrintError(" File length is too short to contain all data reported from header by %llu\n", romSize - filesize);
} else if (romSize < filesize) }
else if (romSize < filesize)
FCEU_PrintError(" File contains %llu bytes of unused data\n", filesize - romSize); FCEU_PrintError(" File contains %llu bytes of unused data\n", filesize - romSize);
rom_size_pow2 = uppow2(ROM_size) * 0x4000; rom_size_pow2 = uppow2(ROM_size) * 0x4000;
@@ -923,10 +925,12 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
memset(ROM, 0xFF, rom_size_pow2); memset(ROM, 0xFF, rom_size_pow2);
FCEU_fread(ROM, 0x4000, ROM_size, fp); FCEU_fread(ROM, 0x4000, ROM_size, fp);
if (VROM_size) { if (VROM_size)
{
vrom_size_pow2 = uppow2(VROM_size) * 0x2000; vrom_size_pow2 = uppow2(VROM_size) * 0x2000;
if ((VROM = (uint8*)FCEU_malloc(vrom_size_pow2)) == NULL) { if ((VROM = (uint8*)FCEU_malloc(vrom_size_pow2)) == NULL)
{
free(ROM); free(ROM);
ROM = NULL; ROM = NULL;
return 0; return 0;
@@ -954,8 +958,10 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
#ifdef DEBUG #ifdef DEBUG
mappername = "Not Listed"; mappername = "Not Listed";
for (mappertest = 0; mappertest < (sizeof bmap / sizeof bmap[0]) - 1; mappertest++) { for (mappertest = 0; mappertest < (sizeof bmap / sizeof bmap[0]) - 1; mappertest++)
if (bmap[mappertest].number == iNESCart.mapper) { {
if (bmap[mappertest].number == iNESCart.mapper)
{
mappername = (char*)bmap[mappertest].name; mappername = (char*)bmap[mappertest].name;
break; break;
} }
@@ -990,24 +996,29 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
FCEU_printf(" Battery: %s\n", (head.ROM_type & 2) ? "Yes" : "No"); FCEU_printf(" Battery: %s\n", (head.ROM_type & 2) ? "Yes" : "No");
FCEU_printf(" System: %s\n", tv_region[iNESCart.region]); FCEU_printf(" System: %s\n", tv_region[iNESCart.region]);
FCEU_printf(" Trained: %s\n", (head.ROM_type & 4) ? "Yes" : "No"); FCEU_printf(" Trained: %s\n", (head.ROM_type & 4) ? "Yes" : "No");
#endif
if (iNESCart.iNES2) { if (iNESCart.iNES2)
{
unsigned PRGRAM = iNESCart.PRGRamSize + iNESCart.PRGRamSaveSize; unsigned PRGRAM = iNESCart.PRGRamSize + iNESCart.PRGRamSaveSize;
unsigned CHRRAM = iNESCart.CHRRamSize + iNESCart.CHRRamSaveSize; unsigned CHRRAM = iNESCart.CHRRamSize + iNESCart.CHRRamSaveSize;
FCEU_printf(" NES 2.0 extended iNES.\n"); FCEU_printf(" NES 2.0 extended iNES.\n");
FCEU_printf(" Sub Mapper #: %3d\n", iNESCart.submapper); FCEU_printf(" Sub Mapper #: %3d\n", iNESCart.submapper);
if (PRGRAM || CHRRAM) { if (PRGRAM || CHRRAM)
if (head.ROM_type & 0x02) { {
if (head.ROM_type & 0x02)
{
FCEU_printf(" PRG RAM: %d KB (%d KB battery-backed)\n", PRGRAM / 1024, iNESCart.PRGRamSaveSize / 1024); FCEU_printf(" PRG RAM: %d KB (%d KB battery-backed)\n", PRGRAM / 1024, iNESCart.PRGRamSaveSize / 1024);
FCEU_printf(" CHR RAM: %d KB (%d KB battery-backed)\n", CHRRAM / 1024, iNESCart.CHRRamSaveSize / 1024); FCEU_printf(" CHR RAM: %d KB (%d KB battery-backed)\n", CHRRAM / 1024, iNESCart.CHRRamSaveSize / 1024);
} else { }
else
{
FCEU_printf(" PRG RAM: %d KB\n", PRGRAM / 1024); FCEU_printf(" PRG RAM: %d KB\n", PRGRAM / 1024);
FCEU_printf(" CHR RAM: %d KB\n", CHRRAM / 1024); FCEU_printf(" CHR RAM: %d KB\n", CHRRAM / 1024);
} }
} }
} }
#endif
ResetCartMapping(); ResetCartMapping();
ResetExState(0, 0); ResetExState(0, 0);
@@ -1028,11 +1039,14 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
FCEU_VSUniCheck(partialmd5, &mapper, &mirroring); FCEU_VSUniCheck(partialmd5, &mapper, &mirroring);
if ((mapper != iNESCart.mapper) || (mirroring != iNESCart.mirror)) { if ((mapper != iNESCart.mapper) || (mirroring != iNESCart.mirror))
{
FCEU_PrintError("\n"); FCEU_PrintError("\n");
FCEU_PrintError(" Incorrect VS-Unisystem header information!\n"); FCEU_PrintError(" Incorrect VS-Unisystem header information!\n");
if (mapper != iNESCart.mapper) FCEU_PrintError(" Mapper: %d\n", mapper); if (mapper != iNESCart.mapper)
if (mirroring != iNESCart.mirror) FCEU_PrintError(" Mirroring: %s\n", FCEU_PrintError(" Mapper: %d\n", mapper);
if (mirroring != iNESCart.mirror)
FCEU_PrintError(" Mirroring: %s\n",
(mirroring == 2) ? "None (Four-screen)" : mirroring ? "Vertical" : "Horizontal"); (mirroring == 2) ? "None (Four-screen)" : mirroring ? "Vertical" : "Horizontal");
iNESCart.mapper = mapper; iNESCart.mapper = mapper;
iNESCart.mirror = mirroring; iNESCart.mirror = mirroring;
@@ -1045,19 +1059,23 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
if (VROM_size) if (VROM_size)
SetupCartCHRMapping(0, VROM, vrom_size_pow2, 0); SetupCartCHRMapping(0, VROM, vrom_size_pow2, 0);
if (iNESCart.mirror == 2) { if (iNESCart.mirror == 2)
{
ExtraNTARAM = (uint8*)FCEU_gmalloc(2048); ExtraNTARAM = (uint8*)FCEU_gmalloc(2048);
SetupCartMirroring(4, 1, ExtraNTARAM); SetupCartMirroring(4, 1, ExtraNTARAM);
} else if (iNESCart.mirror >= 0x10) }
else if (iNESCart.mirror >= 0x10)
SetupCartMirroring(2 + (iNESCart.mirror & 1), 1, 0); SetupCartMirroring(2 + (iNESCart.mirror & 1), 1, 0);
else else
SetupCartMirroring(iNESCart.mirror & 1, (iNESCart.mirror & 4) >> 2, 0); SetupCartMirroring(iNESCart.mirror & 1, (iNESCart.mirror & 4) >> 2, 0);
iNESCart.battery = (head.ROM_type & 2) ? 1 : 0; iNESCart.battery = (head.ROM_type & 2) ? 1 : 0;
if (!iNES_Init(iNESCart.mapper)) { if (!iNES_Init(iNESCart.mapper))
{
FCEU_printf("\n"); FCEU_printf("\n");
FCEU_PrintError(" iNES mapper #%d is not supported at all.\n", iNESCart.mapper); FCEU_PrintError(" iNES mapper #%d is not supported at all.\n",
iNESCart.mapper);
return 0; return 0;
} }
@@ -1067,7 +1085,8 @@ int iNESLoad(const char *name, FCEUFILE *fp) {
* 1: RP2C07 ("Licensed PAL NES") * 1: RP2C07 ("Licensed PAL NES")
* 2: Multiple-region * 2: Multiple-region
* 3: UMC 6527P ("Dendy") */ * 3: UMC 6527P ("Dendy") */
if (iNESCart.region == 3) dendy = 1; if (iNESCart.region == 3)
dendy = 1;
FCEUI_SetVidSystem((iNESCart.region == 1) ? 1 : 0); FCEUI_SetVidSystem((iNESCart.region == 1) ? 1 : 0);
return 1; return 1;