RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

32x, tiny optimization

Browse source
This commit is contained in:
kub 2023-05-10 22:23:32 +00:00
parent 8eeb342641
commit 26d58060f4
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pico/32x/32x.c
View file

@ -55,13 +55,15 @@ void p32x_update_irls(SH2 *active_sh2, unsigned int m68k_cycles)
mrun = sh2_irl_irq(&msh2, mlvl, msh2.state & SH2_STATE_RUN); mrun = sh2_irl_irq(&msh2, mlvl, msh2.state & SH2_STATE_RUN);
if (mrun) { if (mrun) {
p32x_sh2_poll_event(&msh2, SH2_IDLE_STATES & ~SH2_STATE_SLEEP, m68k_cycles); p32x_sh2_poll_event(&msh2, SH2_IDLE_STATES & ~SH2_STATE_SLEEP, m68k_cycles);
p32x_sync_other_sh2(&msh2, m68k_cycles); if (msh2.state & SH2_STATE_RUN)
sh2_end_run(&msh2, 0);
} }
srun = sh2_irl_irq(&ssh2, slvl, ssh2.state & SH2_STATE_RUN); srun = sh2_irl_irq(&ssh2, slvl, ssh2.state & SH2_STATE_RUN);
if (srun) { if (srun) {
p32x_sh2_poll_event(&ssh2, SH2_IDLE_STATES & ~SH2_STATE_SLEEP, m68k_cycles); p32x_sh2_poll_event(&ssh2, SH2_IDLE_STATES & ~SH2_STATE_SLEEP, m68k_cycles);
p32x_sync_other_sh2(&ssh2, m68k_cycles); if (ssh2.state & SH2_STATE_RUN)
sh2_end_run(&ssh2, 0);
} }
elprintf(EL_32X, "update_irls: m %d/%d, s %d/%d", mlvl, mrun, slvl, srun); elprintf(EL_32X, "update_irls: m %d/%d, s %d/%d", mlvl, mrun, slvl, srun);

18
pico/32x/memory.c
View file

@ -1390,8 +1390,7 @@ static void PicoWrite16_bank(u32 a, u32 d)
static void bank_map_handler(void) static void bank_map_handler(void)
{ {
cpu68k_map_set(m68k_read8_map, 0x900000, 0x9fffff, PicoRead8_bank, 1); cpu68k_map_read_funcs(0x900000, 0x9fffff, PicoRead8_bank, PicoRead16_bank, 0);
cpu68k_map_set(m68k_read16_map, 0x900000, 0x9fffff, PicoRead16_bank, 1);
} }
static void bank_switch_rom_68k(int b) static void bank_switch_rom_68k(int b)
@ -1419,18 +1418,15 @@ static void bank_switch_rom_68k(int b)
rs -= bank; rs -= bank;
if (rs > 0x100000) if (rs > 0x100000)
rs = 0x100000; rs = 0x100000;
cpu68k_map_set(m68k_read8_map, 0x900000, 0x900000 + rs - 1, Pico.rom + bank, 0); cpu68k_map_read_mem(0x900000, 0x900000 + rs - 1, Pico.rom + bank, 0);
cpu68k_map_set(m68k_read16_map, 0x900000, 0x900000 + rs - 1, Pico.rom + bank, 0);
elprintf(EL_32X, "bank %06x-%06x -> %06x", 0x900000, 0x900000 + rs - 1, bank); elprintf(EL_32X, "bank %06x-%06x -> %06x", 0x900000, 0x900000 + rs - 1, bank);
} }
else { else {
bank = bank >> 19; bank = bank >> 19;
bank2 = carthw_ssf2_banks[bank + 0] << 19; bank2 = carthw_ssf2_banks[bank + 0] << 19;
cpu68k_map_set(m68k_read8_map, 0x900000, 0x97ffff, Pico.rom + bank2, 0); cpu68k_map_read_mem(0x900000, 0x97ffff, Pico.rom + bank2, 0);
cpu68k_map_set(m68k_read16_map, 0x900000, 0x97ffff, Pico.rom + bank2, 0);
bank2 = carthw_ssf2_banks[bank + 1] << 19; bank2 = carthw_ssf2_banks[bank + 1] << 19;
cpu68k_map_set(m68k_read8_map, 0x980000, 0x9fffff, Pico.rom + bank2, 0); cpu68k_map_read_mem(0x980000, 0x9fffff, Pico.rom + bank2, 0);
cpu68k_map_set(m68k_read16_map, 0x980000, 0x9fffff, Pico.rom + bank2, 0);
} }
} }
@ -2242,10 +2238,8 @@ static sh2_write_handler *ssh2_write8_map[0x80], *ssh2_write16_map[0x80], *ssh2_
void Pico32xSwapDRAM(int b) void Pico32xSwapDRAM(int b)
{ {
cpu68k_map_set(m68k_read8_map, 0x840000, 0x85ffff, Pico32xMem->dram[b], 0); cpu68k_map_read_mem(0x840000, 0x85ffff, Pico32xMem->dram[b], 0);
cpu68k_map_set(m68k_read16_map, 0x840000, 0x85ffff, Pico32xMem->dram[b], 0); cpu68k_map_read_mem(0x860000, 0x87ffff, Pico32xMem->dram[b], 0);
cpu68k_map_set(m68k_read8_map, 0x860000, 0x87ffff, Pico32xMem->dram[b], 0);
cpu68k_map_set(m68k_read16_map, 0x860000, 0x87ffff, Pico32xMem->dram[b], 0);
cpu68k_map_set(m68k_write8_map, 0x840000, 0x87ffff, cpu68k_map_set(m68k_write8_map, 0x840000, 0x87ffff,
b ? m68k_write8_dram1_ow : m68k_write8_dram0_ow, 1); b ? m68k_write8_dram1_ow : m68k_write8_dram0_ow, 1);
cpu68k_map_set(m68k_write16_map, 0x840000, 0x87ffff, cpu68k_map_set(m68k_write16_map, 0x840000, 0x87ffff,