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

Fix GBA Flash read/writes and clean up

This commit is contained in:
Raphaël Zumer 2019-12-09 07:06:39 -05:00
parent 8fc9a33a9f
commit 68d3474458
1 changed files with 41 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/GBACart.cpp
View File

@ -46,6 +46,7 @@ struct FlashProperties
}; };
u8* SRAM; u8* SRAM;
FILE* SRAMFile;
u32 SRAMLength; u32 SRAMLength;
SaveType SRAMType; SaveType SRAMType;
FlashProperties SRAMFlash; FlashProperties SRAMFlash;
@ -64,18 +65,23 @@ void Write_Flash(u32 addr, u8 val);
bool Init() bool Init()
{ {
SRAM = NULL; SRAM = NULL;
SRAMFile = NULL;
return true; return true;
} }
void DeInit() void DeInit()
{ {
if (SRAMFile) fclose(SRAMFile);
if (SRAM) delete[] SRAM; if (SRAM) delete[] SRAM;
} }
void Reset() void Reset()
{ {
if (SRAMFile) fclose(SRAMFile);
if (SRAM) delete[] SRAM; if (SRAM) delete[] SRAM;
SRAM = NULL; SRAM = NULL;
SRAMFile = NULL;
SRAMLength = 0; SRAMLength = 0;
SRAMType = S_NULL; SRAMType = S_NULL;
SRAMFlash = {}; SRAMFlash = {};
@ -94,7 +100,7 @@ void LoadSave(const char* path)
SRAMPath[1023] = '\0'; SRAMPath[1023] = '\0';
SRAMLength = 0; SRAMLength = 0;
FILE* f = Platform::OpenFile(path, "rb"); FILE* f = Platform::OpenFile(SRAMPath, "r+b");
if (f) if (f)
{ {
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
@ -104,7 +110,7 @@ void LoadSave(const char* path)
fseek(f, 0, SEEK_SET); fseek(f, 0, SEEK_SET);
fread(SRAM, SRAMLength, 1, f); fread(SRAM, SRAMLength, 1, f);
fclose(f); SRAMFile = f;
} }
switch (SRAMLength) switch (SRAMLength)
@ -162,15 +168,15 @@ void RelocateSave(const char* path, bool write)
strncpy(SRAMPath, path, 1023); strncpy(SRAMPath, path, 1023);
SRAMPath[1023] = '\0'; SRAMPath[1023] = '\0';
FILE* f = Platform::OpenFile(path, "wb"); FILE *f = Platform::OpenFile(path, "r+b");
if (!f) if (!f)
{ {
printf("GBACart_SRAM::RelocateSave: failed to create new file. fuck\n"); printf("GBACart_SRAM::RelocateSave: failed to create new file. fuck\n");
return; return;
} }
fwrite(SRAM, SRAMLength, 1, f); SRAMFile = f;
fclose(f); fwrite(SRAM, SRAMLength, 1, SRAMFile);
} }
u8 Read_Flash(u32 addr) u8 Read_Flash(u32 addr)
@ -190,6 +196,8 @@ u8 Read_Flash(u32 addr)
SRAMFlash.state = 0; SRAMFlash.state = 0;
SRAMFlash.cmd = 0; SRAMFlash.cmd = 0;
break; break;
case 0xA0: // erase command
break; // ignore here, handled during writes
case 0xB0: // bank switching (128K only) case 0xB0: // bank switching (128K only)
break; // ignore here, handled during writes break; // ignore here, handled during writes
default: default:
@ -269,6 +277,7 @@ void Write_Flash(u32 addr, u8 val)
SRAMFlash.cmd = val; SRAMFlash.cmd = val;
return; return;
} }
SRAMFlash.state = 0;
break; break;
// erase // erase
case 0x80: case 0x80:
@ -293,12 +302,10 @@ void Write_Flash(u32 addr, u8 val)
u32 start_addr = addr + 0x10000 * SRAMFlash.bank; u32 start_addr = addr + 0x10000 * SRAMFlash.bank;
memset((u8*)&SRAM[start_addr], 0xFF, 0x1000); memset((u8*)&SRAM[start_addr], 0xFF, 0x1000);
FILE* f = Platform::OpenFile(SRAMPath, "r+b"); if (SRAMFile)
if (f)
{ {
fseek(f, start_addr, SEEK_SET); fseek(SRAMFile, start_addr, SEEK_SET);
fwrite((u8*)&SRAM[start_addr], 1, 0x1000, f); fwrite((u8*)&SRAM[start_addr], 1, 0x1000, SRAMFile);
fclose(f);
} }
} }
SRAMFlash.state = 0; SRAMFlash.state = 0;
@ -343,15 +350,18 @@ void Write_Flash(u32 addr, u8 val)
void Write_SRAM(u32 addr, u8 val) void Write_SRAM(u32 addr, u8 val)
{ {
u8 prev = *(u8*)&SRAM[addr];
// TODO: try not to do this for every byte
if (prev != val)
{
*(u8*)&SRAM[addr] = val; *(u8*)&SRAM[addr] = val;
// bit wasteful to do this for every written byte if (SRAMFile)
FILE* f = Platform::OpenFile(SRAMPath, "r+b");
if (f)
{ {
fseek(f, addr, SEEK_SET); fseek(SRAMFile, addr, SEEK_SET);
fwrite((u8*)&SRAM[addr], 1, 1, f); fwrite((u8*)&SRAM[addr], 1, 1, SRAMFile);
fclose(f); }
} }
} }
@ -379,7 +389,9 @@ u16 Read16(u32 addr)
if (SRAMType == S_FLASH512K || SRAMType == S_FLASH1M) if (SRAMType == S_FLASH512K || SRAMType == S_FLASH1M)
{ {
return Read_Flash(addr) & (Read_Flash(addr + 1) << 8); u16 val = Read_Flash(addr + 0) |
(Read_Flash(addr + 1) << 8);
return val;
} }
return *(u16*)&SRAM[addr]; return *(u16*)&SRAM[addr];
@ -394,10 +406,11 @@ u32 Read32(u32 addr)
if (SRAMType == S_FLASH512K || SRAMType == S_FLASH1M) if (SRAMType == S_FLASH512K || SRAMType == S_FLASH1M)
{ {
return Read_Flash(addr) & u32 val = Read_Flash(addr + 0) |
(Read_Flash(addr + 1) << 8) & (Read_Flash(addr + 1) << 8) |
(Read_Flash(addr + 2) << 16) & (Read_Flash(addr + 2) << 16) |
(Read_Flash(addr + 3) << 24); (Read_Flash(addr + 3) << 24);
return val;
} }
return *(u32*)&SRAM[addr]; return *(u32*)&SRAM[addr];
@ -407,34 +420,25 @@ void Write8(u32 addr, u8 val)
{ {
u8 prev = *(u8*)&SRAM[addr]; u8 prev = *(u8*)&SRAM[addr];
if (prev != val)
{
WriteFunc(addr, val); WriteFunc(addr, val);
}
} }
void Write16(u32 addr, u16 val) void Write16(u32 addr, u16 val)
{ {
u16 prev = *(u16*)&SRAM[addr]; u16 prev = *(u16*)&SRAM[addr];
if (prev != val) WriteFunc(addr + 0, val & 0xFF);
{
WriteFunc(addr, val & 0xFF);
WriteFunc(addr + 1, val >> 8 & 0xFF); WriteFunc(addr + 1, val >> 8 & 0xFF);
}
} }
void Write32(u32 addr, u32 val) void Write32(u32 addr, u32 val)
{ {
u32 prev = *(u32*)&SRAM[addr]; u32 prev = *(u32*)&SRAM[addr];
if (prev != val) WriteFunc(addr + 0, val & 0xFF);
{
WriteFunc(addr, val & 0xFF);
WriteFunc(addr + 1, val >> 8 & 0xFF); WriteFunc(addr + 1, val >> 8 & 0xFF);
WriteFunc(addr + 2, val >> 16 & 0xFF); WriteFunc(addr + 2, val >> 16 & 0xFF);
WriteFunc(addr + 3, val >> 24 & 0xFF); WriteFunc(addr + 3, val >> 24 & 0xFF);
}
} }
} }
@ -512,7 +516,6 @@ bool LoadROM(const char* path, const char* sram)
fread(CartROM, 1, len, f); fread(CartROM, 1, len, f);
fclose(f); fclose(f);
//CartROM = f;
CartCRC = CRC32(CartROM, CartROMSize); CartCRC = CRC32(CartROM, CartROMSize);
printf("ROM CRC32: %08X\n", CartCRC); printf("ROM CRC32: %08X\n", CartCRC);