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

(finally) axe trainwreck savetype-autodetect code. 

pull that from ROM database.
for now, assume EEPROM 64k if not found, or null for homebrew.
This commit is contained in:
StapleButter 2018-12-11 20:39:07 +01:00
parent f03828f7b9
commit 9a0bf912d9
2 changed files with 34 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
romlist.bin Normal file
View File

Binary file not shown.

308
src/NDSCart.cpp
View File

@ -29,11 +29,6 @@
namespace NDSCart_SRAM
{
// BIG SRAM TODO!!!!
// USE A DATABASE TO IDENTIFY SAVE MEMORY TYPE
// (and maybe keep autodetect as a last resort??)
// AUTODETECT IS BLARGY AND IS A MESS
u8* SRAM;
u32 SRAMLength;
@ -41,15 +36,6 @@ char SRAMPath[1024];
void (*WriteFunc)(u8 val, bool islast);
u32 Discover_MemoryType;
u32 Discover_Likeliness;
u8* Discover_Buffer;
u32 Discover_DataPos;
u32 Discover_LastPC;
u32 Discover_AddrLength;
u32 Discover_Addr;
u32 Discover_LikelySize;
u32 Hold;
u8 CurCmd;
u32 DataPos;
@ -69,37 +55,25 @@ void Write_Discover(u8 val, bool islast);
bool Init()
{
SRAM = NULL;
Discover_Buffer = NULL;
return true;
}
void DeInit()
{
if (SRAM) delete[] SRAM;
if (Discover_Buffer) delete[] Discover_Buffer;
}
void Reset()
{
if (SRAM) delete[] SRAM;
if (Discover_Buffer) delete[] Discover_Buffer;
SRAM = NULL;
Discover_Buffer = NULL;
}
void DoSavestate(Savestate* file)
{
file->Section("NDCS");
// CHECKME/TODO/whatever
// should the autodetect status shit go in the savestate???
// I don't think so.
// worst case is that the savestate was taken before autodetect took place completely
// and that causes it to yield a different result, fucking things up
// but that is unlikely
// and we should just use a goddamn database anyway, this is a trainwreck
// we reload the SRAM contents, tho.
// we reload the SRAM contents.
// it should be the same file (as it should be the same ROM, duh)
// but the contents may change
// TODO maybe: possibility to save to a separate file when using savestates????
@ -139,15 +113,9 @@ void DoSavestate(Savestate* file)
file->Var32(&Addr);
}
void LoadSave(const char* path)
void LoadSave(const char* path, u32 type)
{
if (SRAM) delete[] SRAM;
if (Discover_Buffer) delete[] Discover_Buffer;
Discover_Buffer = NULL;
Discover_LastPC = 0;
Discover_AddrLength = 0x7FFFFFFF;
Discover_LikelySize = 0;
strncpy(SRAMPath, path, 1023);
SRAMPath[1023] = '\0';
@ -163,6 +131,18 @@ void LoadSave(const char* path)
fread(SRAM, SRAMLength, 1, f);
fclose(f);
}
else
{
int sramlen[] = {0, 512, 8192, 65536, 256*1024, 512*1024, 1024*1024, 8192*1024, 32768*1024};
SRAMLength = sramlen[type];
if (SRAMLength)
{
SRAM = new u8[SRAMLength];
memset(SRAM, 0, SRAMLength);
}
}
switch (SRAMLength)
{
@ -172,24 +152,14 @@ void LoadSave(const char* path)
case 256*1024:
case 512*1024:
case 1024*1024:
case 8192*1024: WriteFunc = Write_Flash; break;
case 8192*1024:
case 32768*1024: WriteFunc = Write_Flash; break;
default:
printf("!! BAD SAVE LENGTH %d\n", SRAMLength);
case 0:
WriteFunc = Write_Null;
break;
}
}
else
{
SRAMLength = 0;
WriteFunc = Write_Discover;
Discover_MemoryType = 2;
Discover_Likeliness = 0;
Discover_DataPos = 0;
Discover_Buffer = new u8[256*1024];
memset(Discover_Buffer, 0, 256*1024);
}
Hold = 0;
CurCmd = 0;
@ -201,7 +171,7 @@ void RelocateSave(const char* path, bool write)
{
if (!write)
{
LoadSave(path); // lazy
LoadSave(path, 0); // lazy
return;
}
@ -224,240 +194,6 @@ u8 Read()
return Data;
}
void SetMemoryType()
{
SRAMLength = 0;
if (Discover_LikelySize)
{
if (Discover_LikelySize >= 0x40000)
{
Discover_MemoryType = 4; // FLASH
SRAMLength = Discover_LikelySize;
}
else if (Discover_LikelySize == 0x10000 || Discover_MemoryType == 3)
{
if (Discover_MemoryType > 3)
printf("incoherent detection result: type=%d size=%X\n", Discover_MemoryType, Discover_LikelySize);
Discover_MemoryType = 3;
}
else if (Discover_LikelySize == 0x2000)
{
if (Discover_MemoryType > 3)
printf("incoherent detection result: type=%d size=%X\n", Discover_MemoryType, Discover_LikelySize);
Discover_MemoryType = 2;
}
else if (Discover_LikelySize == 0x200 || Discover_MemoryType == 1)
{
if (Discover_MemoryType > 1)
printf("incoherent detection result: type=%d size=%X\n", Discover_MemoryType, Discover_LikelySize);
Discover_MemoryType = 1;
}
else
{
printf("bad save size %X. assuming EEPROM 64K\n", Discover_LikelySize);
Discover_MemoryType = 2;
}
}
switch (Discover_MemoryType)
{
case 1:
printf("Save memory type: EEPROM 4k\n");
WriteFunc = Write_EEPROMTiny;
SRAMLength = 512;
break;
case 2:
printf("Save memory type: EEPROM 64k\n");
WriteFunc = Write_EEPROM;
SRAMLength = 8192;
break;
case 3:
printf("Save memory type: EEPROM 512k\n");
WriteFunc = Write_EEPROM;
SRAMLength = 65536;
break;
case 4:
if (!SRAMLength) SRAMLength = 256*1024;
printf("Save memory type: Flash %dk\n", SRAMLength/1024);
WriteFunc = Write_Flash;
break;
case 5:
printf("Save memory type: ...something else\n");
WriteFunc = Write_Null;
SRAMLength = 0;
break;
}
if (!SRAMLength)
return;
SRAM = new u8[SRAMLength];
// replay writes that occured during discovery
u8 prev_cmd = CurCmd;
u32 pos = 0;
while (pos < 256*1024)
{
u32 len = *(u32*)&Discover_Buffer[pos];
pos += 4;
if (len == 0) break;
CurCmd = Discover_Buffer[pos++];
DataPos = 0;
Addr = 0;
Data = 0;
for (u32 i = 1; i < len; i++)
{
WriteFunc(Discover_Buffer[pos++], (i==(len-1)));
DataPos++;
}
}
CurCmd = prev_cmd;
delete[] Discover_Buffer;
Discover_Buffer = NULL;
}
void Write_Discover(u8 val, bool islast)
{
// attempt at autodetecting the type of save memory.
// we basically hope the game will be nice and clear whole pages of memory.
if (CurCmd == 0x03 || CurCmd == 0x0B)
{
if (Discover_Likeliness) // writes have occured before this read
{
// apply. and pray.
SetMemoryType();
DataPos = 0;
Addr = 0;
Data = 0;
return WriteFunc(val, islast);
}
else
{
if (DataPos == 0)
{
Discover_LastPC = NDS::GetPC((NDS::ExMemCnt[0] >> 11) & 0x1);
Discover_Addr = val;
}
else
{
bool addrlenchange = false;
Discover_Addr <<= 8;
Discover_Addr |= val;
u32 pc = NDS::GetPC((NDS::ExMemCnt[0] >> 11) & 0x1);
if ((pc != Discover_LastPC) || islast)
{
if (DataPos < Discover_AddrLength)
{
Discover_AddrLength = DataPos;
addrlenchange = true;
}
}
if (DataPos == Discover_AddrLength)
{
Discover_Addr >>= 8;
// determine the address for this read
// the idea is to see how far the game reads
// but we need margins for games that have antipiracy
// as those will generally read just past the limit
// and expect it to wrap to zero
u32 likelysize = 0;
if (DataPos == 3) // FLASH
{
if (Discover_Addr >= 0x101000)
likelysize = 0x800000; // 8M
else if (Discover_Addr >= 0x81000)
likelysize = 0x100000; // 1M
else if (Discover_Addr >= 0x41000)
likelysize = 0x80000; // 512K
else
likelysize = 0x40000; // 256K
}
else if (DataPos == 2) // EEPROM
{
if (Discover_Addr >= 0x3000)
likelysize = 0x10000; // 64K
else
likelysize = 0x2000; // 8K
}
else if (DataPos == 1) // tiny EEPROM
{
likelysize = 0x200; // always 4K
}
if ((likelysize > Discover_LikelySize) || addrlenchange)
Discover_LikelySize = likelysize;
}
}
Data = 0;
return;
}
}
if (CurCmd == 0x02 || CurCmd == 0x0A)
{
if (DataPos == 0)
Discover_Buffer[Discover_DataPos + 4] = CurCmd;
Discover_Buffer[Discover_DataPos + 5 + DataPos] = val;
if (islast)
{
u32 len = DataPos+1;
*(u32*)&Discover_Buffer[Discover_DataPos] = len+1;
Discover_DataPos += 5+len;
if (Discover_Likeliness <= len)
{
Discover_Likeliness = len;
if (len > 3+256) // bigger Flash, FRAM, whatever
{
Discover_MemoryType = 5;
}
else if ((len > 2+128) || (len > 1+16 && CurCmd == 0xA)) // Flash
{
Discover_MemoryType = 4;
}
else if (len > 2+32) // EEPROM 512k
{
Discover_MemoryType = 3;
}
else if (len > 1+16 || (len != 1+16 && CurCmd != 0x0A)) // EEPROM 64k
{
Discover_MemoryType = 2;
}
else // EEPROM 4k
{
Discover_MemoryType = 1;
}
}
printf("discover: type=%d likeliness=%d\n", Discover_MemoryType, Discover_Likeliness);
}
}
}
void Write_Null(u8 val, bool islast) {}
void Write_EEPROMTiny(u8 val, bool islast)
@ -1161,6 +897,12 @@ bool LoadROM(const char* path, const char* sram, bool direct)
{
// set defaults
printf("ROM entry not found\n");
romparams[0] = CartROMSize;
if (*(u32*)&CartROM[0x20] < 0x4000)
romparams[1] = 0; // no saveRAM for homebrew
else
romparams[1] = 2; // assume EEPROM 64k (TODO FIXME)
}
else
printf("ROM entry: %08X %08X %08X\n", romparams[0], romparams[1], romparams[2]);
@ -1215,7 +957,7 @@ bool LoadROM(const char* path, const char* sram, bool direct)
// save
printf("Save file: %s\n", sram);
NDSCart_SRAM::LoadSave(sram);
NDSCart_SRAM::LoadSave(sram, romparams[1]);
return true;
}