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

Cache the clock rate

Browse Source
This commit is contained in:
Lior Halphon 2021-12-26 15:50:24 +02:00
parent c53d99dbc4
commit 66f7babe86
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Core/gb.c
View File

@ -1591,6 +1591,7 @@ void GB_reset(GB_gameboy_t *gb)
{ {
uint32_t mbc_ram_size = gb->mbc_ram_size; uint32_t mbc_ram_size = gb->mbc_ram_size;
GB_model_t model = gb->model; GB_model_t model = gb->model;
GB_update_clock_rate(gb);
uint8_t rtc_section[GB_SECTION_SIZE(rtc)]; uint8_t rtc_section[GB_SECTION_SIZE(rtc)];
memcpy(rtc_section, GB_GET_SECTION(gb, rtc), sizeof(rtc_section)); memcpy(rtc_section, GB_GET_SECTION(gb, rtc), sizeof(rtc_section));
memset(gb, 0, (size_t)GB_GET_SECTION((GB_gameboy_t *) 0, unsaved)); memset(gb, 0, (size_t)GB_GET_SECTION((GB_gameboy_t *) 0, unsaved));
@ -1756,24 +1757,34 @@ GB_registers_t *GB_get_registers(GB_gameboy_t *gb)
void GB_set_clock_multiplier(GB_gameboy_t *gb, double multiplier) void GB_set_clock_multiplier(GB_gameboy_t *gb, double multiplier)
{ {
gb->clock_multiplier = multiplier; gb->clock_multiplier = multiplier;
GB_update_clock_rate(gb);
} }
uint32_t GB_get_clock_rate(GB_gameboy_t *gb) uint32_t GB_get_clock_rate(GB_gameboy_t *gb)
{ {
return GB_get_unmultiplied_clock_rate(gb) * gb->clock_multiplier; return gb->clock_rate;
} }
uint32_t GB_get_unmultiplied_clock_rate(GB_gameboy_t *gb) uint32_t GB_get_unmultiplied_clock_rate(GB_gameboy_t *gb)
{ {
if (gb->model & GB_MODEL_PAL_BIT) { return gb->unmultiplied_clock_rate;
return SGB_PAL_FREQUENCY;
}
if ((gb->model & ~GB_MODEL_NO_SFC_BIT) == GB_MODEL_SGB) {
return SGB_NTSC_FREQUENCY;
}
return CPU_FREQUENCY;
} }
void GB_update_clock_rate(GB_gameboy_t *gb)
{
if (gb->model & GB_MODEL_PAL_BIT) {
gb->unmultiplied_clock_rate = SGB_PAL_FREQUENCY;
}
else if ((gb->model & ~GB_MODEL_NO_SFC_BIT) == GB_MODEL_SGB) {
gb->unmultiplied_clock_rate = SGB_NTSC_FREQUENCY;
}
else {
gb->unmultiplied_clock_rate = CPU_FREQUENCY;
}
gb->clock_rate = gb->unmultiplied_clock_rate * gb->clock_multiplier;
}
void GB_set_border_mode(GB_gameboy_t *gb, GB_border_mode_t border_mode) void GB_set_border_mode(GB_gameboy_t *gb, GB_border_mode_t border_mode)
{ {
if (gb->border_mode > GB_BORDER_ALWAYS) return; if (gb->border_mode > GB_BORDER_ALWAYS) return;

3
Core/gb.h
View File

@ -667,6 +667,8 @@ struct GB_gameboy_internal_s {
uint64_t cycles_since_last_sync; // In 8MHz units uint64_t cycles_since_last_sync; // In 8MHz units
GB_rtc_mode_t rtc_mode; GB_rtc_mode_t rtc_mode;
uint32_t rtc_second_length; uint32_t rtc_second_length;
uint32_t clock_rate;
uint32_t unmultiplied_clock_rate;
/* Audio */ /* Audio */
GB_apu_output_t apu_output; GB_apu_output_t apu_output;
@ -918,6 +920,7 @@ uint32_t GB_get_rom_crc32(GB_gameboy_t *gb);
#ifdef GB_INTERNAL #ifdef GB_INTERNAL
internal void GB_borrow_sgb_border(GB_gameboy_t *gb); internal void GB_borrow_sgb_border(GB_gameboy_t *gb);
internal void GB_update_clock_rate(GB_gameboy_t *gb);
#endif #endif
#endif /* GB_h */ #endif /* GB_h */

1
Core/save_state.c
View File

@ -383,6 +383,7 @@ static void sanitize_state(GB_gameboy_t *gb)
} }
gb->sgb->current_player &= gb->sgb->player_count - 1; gb->sgb->current_player &= gb->sgb->player_count - 1;
} }
GB_update_clock_rate(gb);
} }
static bool dump_section(virtual_file_t *file, const void *src, uint32_t size) static bool dump_section(virtual_file_t *file, const void *src, uint32_t size)