Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better errnos

Browse Source
This commit is contained in:
Lior Halphon 2021-03-22 00:18:49 +02:00
parent da1003263f
commit 925bd863c0
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Core/save_state.c
View File

@ -308,14 +308,14 @@ static int load_state_internal(GB_gameboy_t *gb, virtual_file_t *file)
return false; return false;
} }
#define READ_SECTION(gb, file, section) read_section(file, GB_GET_SECTION(gb, section), GB_SECTION_SIZE(section), fix_broken_windows_saves) #define READ_SECTION(gb, file, section) read_section(file, GB_GET_SECTION(gb, section), GB_SECTION_SIZE(section), fix_broken_windows_saves)
if (!READ_SECTION(&save, file, core_state)) return errno; if (!READ_SECTION(&save, file, core_state)) return errno ?: EIO;
if (!READ_SECTION(&save, file, dma )) return errno; if (!READ_SECTION(&save, file, dma )) return errno ?: EIO;
if (!READ_SECTION(&save, file, mbc )) return errno; if (!READ_SECTION(&save, file, mbc )) return errno ?: EIO;
if (!READ_SECTION(&save, file, hram )) return errno; if (!READ_SECTION(&save, file, hram )) return errno ?: EIO;
if (!READ_SECTION(&save, file, timing )) return errno; if (!READ_SECTION(&save, file, timing )) return errno ?: EIO;
if (!READ_SECTION(&save, file, apu )) return errno; if (!READ_SECTION(&save, file, apu )) return errno ?: EIO;
if (!READ_SECTION(&save, file, rtc )) return errno; if (!READ_SECTION(&save, file, rtc )) return errno ?: EIO;
if (!READ_SECTION(&save, file, video )) return errno; if (!READ_SECTION(&save, file, video )) return errno ?: EIO;
#undef READ_SECTION #undef READ_SECTION
@ -324,31 +324,29 @@ static int load_state_internal(GB_gameboy_t *gb, virtual_file_t *file)
} }
if (GB_is_hle_sgb(gb)) { if (GB_is_hle_sgb(gb)) {
if (!read_section(file, gb->sgb, sizeof(*gb->sgb), false)) return errno; if (!read_section(file, gb->sgb, sizeof(*gb->sgb), false)) return errno ?: EIO;
} }
memset(gb->mbc_ram + save.mbc_ram_size, 0xFF, gb->mbc_ram_size - save.mbc_ram_size); memset(gb->mbc_ram + save.mbc_ram_size, 0xFF, gb->mbc_ram_size - save.mbc_ram_size);
if (file->read(file, gb->mbc_ram, save.mbc_ram_size) != save.mbc_ram_size) { if (file->read(file, gb->mbc_ram, save.mbc_ram_size) != save.mbc_ram_size) {
return errno; return errno ?: EIO;
} }
if (file->read(file, gb->ram, gb->ram_size) != gb->ram_size) { if (file->read(file, gb->ram, gb->ram_size) != gb->ram_size) {
return errno; return errno ?: EIO;
} }
/* Fix for 0.11 save states that allocate twice the amount of RAM in CGB instances */ /* Fix for 0.11 save states that allocate twice the amount of RAM in CGB instances */
file->seek(file, save.ram_size - gb->ram_size, SEEK_CUR); file->seek(file, save.ram_size - gb->ram_size, SEEK_CUR);
if (file->read(file, gb->vram, gb->vram_size) != gb->vram_size) { if (file->read(file, gb->vram, gb->vram_size) != gb->vram_size) {
return errno; return errno ?: EIO;
} }
size_t orig_ram_size = gb->ram_size; size_t orig_ram_size = gb->ram_size;
memcpy(gb, &save, sizeof(save)); memcpy(gb, &save, sizeof(save));
gb->ram_size = orig_ram_size; gb->ram_size = orig_ram_size;
errno = 0;
sanitize_state(gb); sanitize_state(gb);
return 0; return 0;