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

Clean up endian-related code

Browse Source
This commit is contained in:
Lior Halphon 2021-11-07 13:57:43 +02:00
parent 18e7a3f4fa
commit 1650820edb
4 changed files with 41 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/cheats.c
View File

@ -250,7 +250,7 @@ void GB_load_cheats(GB_gameboy_t *gb, const char *path)
uint32_t struct_size = 0; uint32_t struct_size = 0;
fread(&magic, sizeof(magic), 1, f); fread(&magic, sizeof(magic), 1, f);
fread(&struct_size, sizeof(struct_size), 1, f); fread(&struct_size, sizeof(struct_size), 1, f);
if (magic != CHEAT_MAGIC && magic != __builtin_bswap32(CHEAT_MAGIC)) { if (magic != LE32(CHEAT_MAGIC) && magic != BE32(CHEAT_MAGIC)) {
GB_log(gb, "The file is not a SameBoy cheat database"); GB_log(gb, "The file is not a SameBoy cheat database");
return; return;
} }
@ -267,7 +267,7 @@ void GB_load_cheats(GB_gameboy_t *gb, const char *path)
GB_cheat_t cheat; GB_cheat_t cheat;
while (fread(&cheat, sizeof(cheat), 1, f)) { while (fread(&cheat, sizeof(cheat), 1, f)) {
if (magic == __builtin_bswap32(CHEAT_MAGIC)) { if (magic != CHEAT_MAGIC) {
cheat.address = __builtin_bswap16(cheat.address); cheat.address = __builtin_bswap16(cheat.address);
cheat.bank = __builtin_bswap16(cheat.bank); cheat.bank = __builtin_bswap16(cheat.bank);
} }

1
Core/defs.h
View File

@ -17,7 +17,6 @@
#define unrolled #define unrolled
#endif #endif
/* Todo: similar macros are everywhere, clean this up and remove direct calls to bswap */
#ifdef GB_BIG_ENDIAN #ifdef GB_BIG_ENDIAN
#define LE16(x) __builtin_bswap16(x) #define LE16(x) __builtin_bswap16(x)
#define LE32(x) __builtin_bswap32(x) #define LE32(x) __builtin_bswap32(x)

156
Core/gb.c
View File

@ -496,11 +496,8 @@ int GB_load_isx(GB_gameboy_t *gb, const char *path)
#define READ(x) if (fread(&x, sizeof(x), 1, f) != 1) goto error #define READ(x) if (fread(&x, sizeof(x), 1, f) != 1) goto error
fread(magic, 1, sizeof(magic), f); fread(magic, 1, sizeof(magic), f);
#ifdef GB_BIG_ENDIAN
bool extended = *(uint32_t *)&magic == 'ISX '; bool extended = *(uint32_t *)&magic == BE32('ISX ');
#else
bool extended = *(uint32_t *)&magic == __builtin_bswap32('ISX ');
#endif
fseek(f, extended? 0x20 : 0, SEEK_SET); fseek(f, extended? 0x20 : 0, SEEK_SET);
@ -527,15 +524,11 @@ int GB_load_isx(GB_gameboy_t *gb, const char *path)
} }
READ(address); READ(address);
#ifdef GB_BIG_ENDIAN address = LE16(address);
address = __builtin_bswap16(address);
#endif
address &= 0x3FFF; address &= 0x3FFF;
READ(length); READ(length);
#ifdef GB_BIG_ENDIAN length = LE16(length);
length = __builtin_bswap16(length);
#endif
size_t needed_size = bank * 0x4000 + address + length; size_t needed_size = bank * 0x4000 + address + length;
if (needed_size > 1024 * 1024 * 32) goto error; if (needed_size > 1024 * 1024 * 32) goto error;
@ -556,14 +549,10 @@ int GB_load_isx(GB_gameboy_t *gb, const char *path)
uint32_t length; uint32_t length;
READ(address); READ(address);
#ifdef GB_BIG_ENDIAN address = LE32(address);
address = __builtin_bswap32(address);
#endif
READ(length); READ(length);
#ifdef GB_BIG_ENDIAN length = LE32(length);
length = __builtin_bswap32(length);
#endif
size_t needed_size = address + length; size_t needed_size = address + length;
if (needed_size > 1024 * 1024 * 32) goto error; if (needed_size > 1024 * 1024 * 32) goto error;
@ -587,9 +576,7 @@ int GB_load_isx(GB_gameboy_t *gb, const char *path)
uint16_t address; uint16_t address;
uint8_t byte; uint8_t byte;
READ(count); READ(count);
#ifdef GB_BIG_ENDIAN count = LE16(count);
count = __builtin_bswap16(count);
#endif
while (count--) { while (count--) {
READ(length); READ(length);
if (fread(name, length, 1, f) != 1) goto error; if (fread(name, length, 1, f) != 1) goto error;
@ -604,9 +591,7 @@ int GB_load_isx(GB_gameboy_t *gb, const char *path)
} }
READ(address); READ(address);
#ifdef GB_BIG_ENDIAN address = LE16(address);
address = __builtin_bswap16(address);
#endif
GB_debugger_add_symbol(gb, bank, address, name); GB_debugger_add_symbol(gb, bank, address, name);
} }
break; break;
@ -619,9 +604,7 @@ int GB_load_isx(GB_gameboy_t *gb, const char *path)
uint8_t flag; uint8_t flag;
uint32_t address; uint32_t address;
READ(count); READ(count);
#ifdef GB_BIG_ENDIAN count = LE16(count);
count = __builtin_bswap16(count);
#endif
while (count--) { while (count--) {
READ(length); READ(length);
if (fread(name, length + 1, 1, f) != 1) goto error; if (fread(name, length + 1, 1, f) != 1) goto error;
@ -629,9 +612,7 @@ int GB_load_isx(GB_gameboy_t *gb, const char *path)
READ(flag); // unused READ(flag); // unused
READ(address); READ(address);
#ifdef GB_BIG_ENDIAN address = LE32(address);
address = __builtin_bswap32(address);
#endif
// TODO: How to convert 32-bit addresses to Bank:Address? Needs to tell RAM and ROM apart // TODO: How to convert 32-bit addresses to Bank:Address? Needs to tell RAM and ROM apart
} }
break; break;
@ -831,25 +812,14 @@ int GB_save_battery_to_buffer(GB_gameboy_t *gb, uint8_t *buffer, size_t size)
else if (gb->cartridge_type->mbc_type == GB_HUC3) { else if (gb->cartridge_type->mbc_type == GB_HUC3) {
buffer += gb->mbc_ram_size; buffer += gb->mbc_ram_size;
#ifdef GB_BIG_ENDIAN
GB_huc3_rtc_time_t rtc_save = { GB_huc3_rtc_time_t rtc_save = {
__builtin_bswap64(gb->last_rtc_second), LE64(gb->last_rtc_second),
__builtin_bswap16(gb->huc3.minutes), LE16(gb->huc3.minutes),
__builtin_bswap16(gb->huc3.days), LE16(gb->huc3.days),
__builtin_bswap16(gb->huc3.alarm_minutes), LE16(gb->huc3.alarm_minutes),
__builtin_bswap16(gb->huc3.alarm_days), LE16(gb->huc3.alarm_days),
gb->huc3.alarm_enabled, gb->huc3.alarm_enabled,
}; };
#else
GB_huc3_rtc_time_t rtc_save = {
gb->last_rtc_second,
gb->huc3.minutes,
gb->huc3.days,
gb->huc3.alarm_minutes,
gb->huc3.alarm_days,
gb->huc3.alarm_enabled,
};
#endif
memcpy(buffer, &rtc_save, sizeof(rtc_save)); memcpy(buffer, &rtc_save, sizeof(rtc_save));
} }
else if (gb->cartridge_type->has_rtc) { else if (gb->cartridge_type->has_rtc) {
@ -864,11 +834,7 @@ int GB_save_battery_to_buffer(GB_gameboy_t *gb, uint8_t *buffer, size_t size)
rtc_save.vba64.rtc_latched.hours = gb->rtc_latched.hours; rtc_save.vba64.rtc_latched.hours = gb->rtc_latched.hours;
rtc_save.vba64.rtc_latched.days = gb->rtc_latched.days; rtc_save.vba64.rtc_latched.days = gb->rtc_latched.days;
rtc_save.vba64.rtc_latched.high = gb->rtc_latched.high; rtc_save.vba64.rtc_latched.high = gb->rtc_latched.high;
#ifdef GB_BIG_ENDIAN rtc_save.vba64.last_rtc_second = LE64(time(NULL));
rtc_save.vba64.last_rtc_second = __builtin_bswap64(time(NULL));
#else
rtc_save.vba64.last_rtc_second = time(NULL);
#endif
memcpy(buffer + gb->mbc_ram_size, &rtc_save.vba64, sizeof(rtc_save.vba64)); memcpy(buffer + gb->mbc_ram_size, &rtc_save.vba64, sizeof(rtc_save.vba64));
} }
@ -901,25 +867,14 @@ int GB_save_battery(GB_gameboy_t *gb, const char *path)
} }
} }
else if (gb->cartridge_type->mbc_type == GB_HUC3) { else if (gb->cartridge_type->mbc_type == GB_HUC3) {
#ifdef GB_BIG_ENDIAN
GB_huc3_rtc_time_t rtc_save = { GB_huc3_rtc_time_t rtc_save = {
__builtin_bswap64(gb->last_rtc_second), LE64(gb->last_rtc_second),
__builtin_bswap16(gb->huc3.minutes), LE16(gb->huc3.minutes),
__builtin_bswap16(gb->huc3.days), LE16(gb->huc3.days),
__builtin_bswap16(gb->huc3.alarm_minutes), LE16(gb->huc3.alarm_minutes),
__builtin_bswap16(gb->huc3.alarm_days), LE16(gb->huc3.alarm_days),
gb->huc3.alarm_enabled, gb->huc3.alarm_enabled,
}; };
#else
GB_huc3_rtc_time_t rtc_save = {
gb->last_rtc_second,
gb->huc3.minutes,
gb->huc3.days,
gb->huc3.alarm_minutes,
gb->huc3.alarm_days,
gb->huc3.alarm_enabled,
};
#endif
if (fwrite(&rtc_save, sizeof(rtc_save), 1, f) != 1) { if (fwrite(&rtc_save, sizeof(rtc_save), 1, f) != 1) {
fclose(f); fclose(f);
@ -938,11 +893,7 @@ int GB_save_battery(GB_gameboy_t *gb, const char *path)
rtc_save.vba64.rtc_latched.hours = gb->rtc_latched.hours; rtc_save.vba64.rtc_latched.hours = gb->rtc_latched.hours;
rtc_save.vba64.rtc_latched.days = gb->rtc_latched.days; rtc_save.vba64.rtc_latched.days = gb->rtc_latched.days;
rtc_save.vba64.rtc_latched.high = gb->rtc_latched.high; rtc_save.vba64.rtc_latched.high = gb->rtc_latched.high;
#ifdef GB_BIG_ENDIAN rtc_save.vba64.last_rtc_second = LE64(time(NULL));
rtc_save.vba64.last_rtc_second = __builtin_bswap64(time(NULL));
#else
rtc_save.vba64.last_rtc_second = time(NULL);
#endif
if (fwrite(&rtc_save.vba64, 1, sizeof(rtc_save.vba64), f) != sizeof(rtc_save.vba64)) { if (fwrite(&rtc_save.vba64, 1, sizeof(rtc_save.vba64), f) != sizeof(rtc_save.vba64)) {
fclose(f); fclose(f);
return EIO; return EIO;
@ -992,21 +943,12 @@ void GB_load_battery_from_buffer(GB_gameboy_t *gb, const uint8_t *buffer, size_t
goto reset_rtc; goto reset_rtc;
} }
memcpy(&rtc_save, buffer + gb->mbc_ram_size, sizeof(rtc_save)); memcpy(&rtc_save, buffer + gb->mbc_ram_size, sizeof(rtc_save));
#ifdef GB_BIG_ENDIAN gb->last_rtc_second = LE64(rtc_save.last_rtc_second);
gb->last_rtc_second = __builtin_bswap64(rtc_save.last_rtc_second); gb->huc3.minutes = LE16(rtc_save.minutes);
gb->huc3.minutes = __builtin_bswap16(rtc_save.minutes); gb->huc3.days = LE16(rtc_save.days);
gb->huc3.days = __builtin_bswap16(rtc_save.days); gb->huc3.alarm_minutes = LE16(rtc_save.alarm_minutes);
gb->huc3.alarm_minutes = __builtin_bswap16(rtc_save.alarm_minutes); gb->huc3.alarm_days = LE16(rtc_save.alarm_days);
gb->huc3.alarm_days = __builtin_bswap16(rtc_save.alarm_days);
gb->huc3.alarm_enabled = rtc_save.alarm_enabled; gb->huc3.alarm_enabled = rtc_save.alarm_enabled;
#else
gb->last_rtc_second = rtc_save.last_rtc_second;
gb->huc3.minutes = rtc_save.minutes;
gb->huc3.days = rtc_save.days;
gb->huc3.alarm_minutes = rtc_save.alarm_minutes;
gb->huc3.alarm_days = rtc_save.alarm_days;
gb->huc3.alarm_enabled = rtc_save.alarm_enabled;
#endif
if (gb->last_rtc_second > time(NULL)) { if (gb->last_rtc_second > time(NULL)) {
/* We must reset RTC here, or it will not advance. */ /* We must reset RTC here, or it will not advance. */
goto reset_rtc; goto reset_rtc;
@ -1034,11 +976,7 @@ void GB_load_battery_from_buffer(GB_gameboy_t *gb, const uint8_t *buffer, size_t
gb->rtc_latched.hours = rtc_save.vba32.rtc_latched.hours; gb->rtc_latched.hours = rtc_save.vba32.rtc_latched.hours;
gb->rtc_latched.days = rtc_save.vba32.rtc_latched.days; gb->rtc_latched.days = rtc_save.vba32.rtc_latched.days;
gb->rtc_latched.high = rtc_save.vba32.rtc_latched.high; gb->rtc_latched.high = rtc_save.vba32.rtc_latched.high;
#ifdef GB_BIG_ENDIAN gb->last_rtc_second = LE32(rtc_save.vba32.last_rtc_second);
gb->last_rtc_second = __builtin_bswap32(rtc_save.vba32.last_rtc_second);
#else
gb->last_rtc_second = rtc_save.vba32.last_rtc_second;
#endif
break; break;
case sizeof(rtc_save.vba64): case sizeof(rtc_save.vba64):
@ -1052,11 +990,7 @@ void GB_load_battery_from_buffer(GB_gameboy_t *gb, const uint8_t *buffer, size_t
gb->rtc_latched.hours = rtc_save.vba64.rtc_latched.hours; gb->rtc_latched.hours = rtc_save.vba64.rtc_latched.hours;
gb->rtc_latched.days = rtc_save.vba64.rtc_latched.days; gb->rtc_latched.days = rtc_save.vba64.rtc_latched.days;
gb->rtc_latched.high = rtc_save.vba64.rtc_latched.high; gb->rtc_latched.high = rtc_save.vba64.rtc_latched.high;
#ifdef GB_BIG_ENDIAN gb->last_rtc_second = LE64(rtc_save.vba64.last_rtc_second);
gb->last_rtc_second = __builtin_bswap64(rtc_save.vba64.last_rtc_second);
#else
gb->last_rtc_second = rtc_save.vba64.last_rtc_second;
#endif
break; break;
default: default:
@ -1115,21 +1049,13 @@ void GB_load_battery(GB_gameboy_t *gb, const char *path)
if (fread(&rtc_save, sizeof(rtc_save), 1, f) != 1) { if (fread(&rtc_save, sizeof(rtc_save), 1, f) != 1) {
goto reset_rtc; goto reset_rtc;
} }
#ifdef GB_BIG_ENDIAN gb->last_rtc_second = LE64(rtc_save.last_rtc_second);
gb->last_rtc_second = __builtin_bswap64(rtc_save.last_rtc_second); gb->huc3.minutes = LE16(rtc_save.minutes);
gb->huc3.minutes = __builtin_bswap16(rtc_save.minutes); gb->huc3.days = LE16(rtc_save.days);
gb->huc3.days = __builtin_bswap16(rtc_save.days); gb->huc3.alarm_minutes = LE16(rtc_save.alarm_minutes);
gb->huc3.alarm_minutes = __builtin_bswap16(rtc_save.alarm_minutes); gb->huc3.alarm_days = LE16(rtc_save.alarm_days);
gb->huc3.alarm_days = __builtin_bswap16(rtc_save.alarm_days);
gb->huc3.alarm_enabled = rtc_save.alarm_enabled; gb->huc3.alarm_enabled = rtc_save.alarm_enabled;
#else
gb->last_rtc_second = rtc_save.last_rtc_second;
gb->huc3.minutes = rtc_save.minutes;
gb->huc3.days = rtc_save.days;
gb->huc3.alarm_minutes = rtc_save.alarm_minutes;
gb->huc3.alarm_days = rtc_save.alarm_days;
gb->huc3.alarm_enabled = rtc_save.alarm_enabled;
#endif
if (gb->last_rtc_second > time(NULL)) { if (gb->last_rtc_second > time(NULL)) {
/* We must reset RTC here, or it will not advance. */ /* We must reset RTC here, or it will not advance. */
goto reset_rtc; goto reset_rtc;
@ -1156,11 +1082,7 @@ void GB_load_battery(GB_gameboy_t *gb, const char *path)
gb->rtc_latched.hours = rtc_save.vba32.rtc_latched.hours; gb->rtc_latched.hours = rtc_save.vba32.rtc_latched.hours;
gb->rtc_latched.days = rtc_save.vba32.rtc_latched.days; gb->rtc_latched.days = rtc_save.vba32.rtc_latched.days;
gb->rtc_latched.high = rtc_save.vba32.rtc_latched.high; gb->rtc_latched.high = rtc_save.vba32.rtc_latched.high;
#ifdef GB_BIG_ENDIAN gb->last_rtc_second = LE32(rtc_save.vba32.last_rtc_second);
gb->last_rtc_second = __builtin_bswap32(rtc_save.vba32.last_rtc_second);
#else
gb->last_rtc_second = rtc_save.vba32.last_rtc_second;
#endif
break; break;
case sizeof(rtc_save.vba64): case sizeof(rtc_save.vba64):
@ -1174,11 +1096,7 @@ void GB_load_battery(GB_gameboy_t *gb, const char *path)
gb->rtc_latched.hours = rtc_save.vba64.rtc_latched.hours; gb->rtc_latched.hours = rtc_save.vba64.rtc_latched.hours;
gb->rtc_latched.days = rtc_save.vba64.rtc_latched.days; gb->rtc_latched.days = rtc_save.vba64.rtc_latched.days;
gb->rtc_latched.high = rtc_save.vba64.rtc_latched.high; gb->rtc_latched.high = rtc_save.vba64.rtc_latched.high;
#ifdef GB_BIG_ENDIAN gb->last_rtc_second = LE64(rtc_save.vba64.last_rtc_second);
gb->last_rtc_second = __builtin_bswap64(rtc_save.vba64.last_rtc_second);
#else
gb->last_rtc_second = rtc_save.vba64.last_rtc_second;
#endif
break; break;
default: default:

8
Core/sgb.c
View File

@ -262,9 +262,7 @@ static void command_ready(GB_gameboy_t *gb)
} *command = (void *)(gb->sgb->command + 1); } *command = (void *)(gb->sgb->command + 1);
uint16_t count = command->length; uint16_t count = command->length;
#ifdef GB_BIG_ENDIAN count = LE16(count);
count = __builtin_bswap16(count);
#endif
uint8_t x = command->x; uint8_t x = command->x;
uint8_t y = command->y; uint8_t y = command->y;
if (x >= 20 || y >= 18) { if (x >= 20 || y >= 18) {
@ -641,9 +639,7 @@ void GB_sgb_render(GB_gameboy_t *gb)
for (unsigned x = 0; x < 8; x++) { for (unsigned x = 0; x < 8; x++) {
*data |= pixel_to_bits[gb->sgb->screen_buffer[(tile_x + x) + (tile_y + y) * 160] & 3] >> x; *data |= pixel_to_bits[gb->sgb->screen_buffer[(tile_x + x) + (tile_y + y) * 160] & 3] >> x;
} }
#ifdef GB_BIG_ENDIAN *data = LE16(*data);
*data = __builtin_bswap16(*data);
#endif
data++; data++;
} }
} }