diff options
Diffstat (limited to 'src/mame/drivers/jaguar.cpp')
-rw-r--r-- | src/mame/drivers/jaguar.cpp | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/src/mame/drivers/jaguar.cpp b/src/mame/drivers/jaguar.cpp index 447c2b5fafb..38a880b3c56 100644 --- a/src/mame/drivers/jaguar.cpp +++ b/src/mame/drivers/jaguar.cpp @@ -565,7 +565,7 @@ static NVRAM_HANDLER( jaguar ) } } */ -WRITE32_MEMBER(jaguar_state::eeprom_w) +void jaguar_state::eeprom_w(uint32_t data) { m_eeprom_bit_count++; if (m_eeprom_bit_count != 9) /* kill extra bit at end of address */ @@ -576,7 +576,7 @@ WRITE32_MEMBER(jaguar_state::eeprom_w) } } -READ32_MEMBER(jaguar_state::eeprom_clk) +uint32_t jaguar_state::eeprom_clk() { if (!machine().side_effects_disabled()) { @@ -586,7 +586,7 @@ READ32_MEMBER(jaguar_state::eeprom_clk) return 0; } -READ32_MEMBER(jaguar_state::eeprom_cs) +uint32_t jaguar_state::eeprom_cs() { if (!machine().side_effects_disabled()) { @@ -608,7 +608,7 @@ READ32_MEMBER(jaguar_state::eeprom_cs) * *************************************/ -READ32_MEMBER(jaguar_state::misc_control_r) +uint32_t jaguar_state::misc_control_r() { /* D7 = board reset (low) D6 = audio must & reset (high) @@ -621,7 +621,7 @@ READ32_MEMBER(jaguar_state::misc_control_r) } -WRITE32_MEMBER(jaguar_state::misc_control_w) +void jaguar_state::misc_control_w(offs_t offset, uint32_t data, uint32_t mem_mask) { logerror("%s:misc_control_w(%02X)\n", machine().describe_context(), data); @@ -661,12 +661,12 @@ WRITE32_MEMBER(jaguar_state::misc_control_w) * *************************************/ -READ32_MEMBER(jaguar_state::gpuctrl_r) +uint32_t jaguar_state::gpuctrl_r(offs_t offset, uint32_t mem_mask) { return m_gpu->iobus_r(offset, mem_mask); } -WRITE32_MEMBER(jaguar_state::gpuctrl_w) +void jaguar_state::gpuctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask) { m_gpu->iobus_w(offset, data, mem_mask); } @@ -677,12 +677,12 @@ WRITE32_MEMBER(jaguar_state::gpuctrl_w) * *************************************/ -READ32_MEMBER(jaguar_state::dspctrl_r) +uint32_t jaguar_state::dspctrl_r(offs_t offset, uint32_t mem_mask) { return m_dsp->iobus_r(offset, mem_mask); } -WRITE32_MEMBER(jaguar_state::dspctrl_w) +void jaguar_state::dspctrl_w(offs_t offset, uint32_t data, uint32_t mem_mask) { m_dsp->iobus_w(offset, data, mem_mask); } @@ -696,7 +696,7 @@ WRITE32_MEMBER(jaguar_state::dspctrl_w) * *************************************/ -READ32_MEMBER(jaguar_state::joystick_r) +uint32_t jaguar_state::joystick_r() { uint16_t joystick_result = 0xfffe; uint16_t joybuts_result = 0xffef; @@ -730,7 +730,7 @@ READ32_MEMBER(jaguar_state::joystick_r) return (joystick_result << 16) | joybuts_result; } -WRITE32_MEMBER(jaguar_state::joystick_w) +void jaguar_state::joystick_w(offs_t offset, uint32_t data, uint32_t mem_mask) { /* * 16 12 8 4 0 @@ -788,7 +788,7 @@ WRITE32_MEMBER(jaguar_state::joystick_w) * *************************************/ -WRITE32_MEMBER(jaguar_state::latch_w) +void jaguar_state::latch_w(uint32_t data) { logerror("%08X:latch_w(%X)\n", m_maincpu->pcbase(), data); @@ -811,7 +811,7 @@ WRITE32_MEMBER(jaguar_state::latch_w) * *************************************/ -READ32_MEMBER(jaguar_state::eeprom_data_r) +uint32_t jaguar_state::eeprom_data_r(offs_t offset) { if (m_is_r3000) return m_nvram[offset] | 0xffffff00; @@ -820,13 +820,13 @@ READ32_MEMBER(jaguar_state::eeprom_data_r) } -WRITE32_MEMBER(jaguar_state::eeprom_enable_w) +void jaguar_state::eeprom_enable_w(uint32_t data) { m_eeprom_enable = true; } -WRITE32_MEMBER(jaguar_state::eeprom_data_w) +void jaguar_state::eeprom_data_w(offs_t offset, uint32_t data) { // if (m_eeprom_enable) { @@ -870,7 +870,7 @@ WRITE32_MEMBER(jaguar_state::eeprom_data_w) */ -WRITE32_MEMBER(jaguar_state::gpu_jump_w) +void jaguar_state::gpu_jump_w(offs_t offset, uint32_t data, uint32_t mem_mask) { /* update the data in memory */ COMBINE_DATA(m_gpu_jump_address); @@ -885,7 +885,7 @@ WRITE32_MEMBER(jaguar_state::gpu_jump_w) } -READ32_MEMBER(jaguar_state::gpu_jump_r) +uint32_t jaguar_state::gpu_jump_r() { /* if the current GPU command is just pointing back to the spin loop, and */ /* we're reading it from the spin loop, we can optimize */ @@ -926,7 +926,7 @@ READ32_MEMBER(jaguar_state::gpu_jump_r) #if ENABLE_SPEEDUP_HACKS -READ32_MEMBER(jaguar_state::cojagr3k_main_speedup_r) +uint32_t jaguar_state::cojagr3k_main_speedup_r() { uint64_t curcycles = m_maincpu->total_cycles(); @@ -974,7 +974,7 @@ READ32_MEMBER(jaguar_state::cojagr3k_main_speedup_r) #if ENABLE_SPEEDUP_HACKS -READ32_MEMBER(jaguar_state::main_gpu_wait_r) +uint32_t jaguar_state::main_gpu_wait_r() { if (m_gpu_command_pending) m_maincpu->spin_until_interrupt(); @@ -1000,7 +1000,7 @@ READ32_MEMBER(jaguar_state::main_gpu_wait_r) #if ENABLE_SPEEDUP_HACKS -WRITE32_MEMBER(jaguar_state::area51_main_speedup_w) +void jaguar_state::area51_main_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint64_t curcycles = m_maincpu->total_cycles(); @@ -1034,7 +1034,7 @@ WRITE32_MEMBER(jaguar_state::area51_main_speedup_w) against 0 must handle that explicitly. */ -WRITE32_MEMBER(jaguar_state::area51mx_main_speedup_w) +void jaguar_state::area51mx_main_speedup_w(offs_t offset, uint32_t data, uint32_t mem_mask) { uint64_t curcycles = m_maincpu->total_cycles(); @@ -1072,41 +1072,41 @@ WRITE32_MEMBER(jaguar_state::area51mx_main_speedup_w) // surely these should be 16-bit natively if the standard Jaguar is driven by a plain 68k? // all these trampolines are not good for performance ;-) -READ16_MEMBER(jaguar_state::gpuctrl_r16){ if (!(offset&1)) { return gpuctrl_r(space, offset>>1, mem_mask<<16) >> 16; } else { return gpuctrl_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::gpuctrl_w16){ if (!(offset&1)) { gpuctrl_w(space, offset>>1, data << 16, mem_mask << 16); } else { gpuctrl_w(space, offset>>1, data, mem_mask); } } -READ16_MEMBER(jaguar_state::blitter_r16){ if (!(offset&1)) { return blitter_r(space, offset>>1, mem_mask<<16) >> 16; } else { return blitter_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::blitter_w16){ if (!(offset&1)) { blitter_w(space, offset>>1, data << 16, mem_mask << 16); } else { blitter_w(space, offset>>1, data, mem_mask); } } -READ16_MEMBER(jaguar_state::serial_r16){ if (!(offset&1)) { return serial_r(space, offset>>1, mem_mask<<16) >> 16; } else { return serial_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::serial_w16){ if (!(offset&1)) { serial_w(space, offset>>1, data << 16, mem_mask << 16); } else { serial_w(space, offset>>1, data, mem_mask); } } -READ16_MEMBER(jaguar_state::dspctrl_r16){ if (!(offset&1)) { return dspctrl_r(space, offset>>1, mem_mask<<16) >> 16; } else { return dspctrl_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::dspctrl_w16){ if (!(offset&1)) { dspctrl_w(space, offset>>1, data << 16, mem_mask << 16); } else { dspctrl_w(space, offset>>1, data, mem_mask); } } -READ16_MEMBER(jaguar_state::eeprom_cs16){ if (!(offset&1)) { return eeprom_cs(space, offset>>1, mem_mask<<16) >> 16; } else { return eeprom_cs(space, offset>>1, mem_mask); } } -READ16_MEMBER(jaguar_state::eeprom_clk16){ if (!(offset&1)) { return eeprom_clk(space, offset>>1, mem_mask<<16) >> 16; } else { return eeprom_clk(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::eeprom_w16){ if (!(offset&1)) { eeprom_w(space, offset>>1, data << 16, mem_mask << 16); } else { eeprom_w(space, offset>>1, data, mem_mask); } } -READ16_MEMBER(jaguar_state::joystick_r16){ if (!(offset&1)) { return joystick_r(space, offset>>1, mem_mask<<16) >> 16; } else { return joystick_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::joystick_w16){ if (!(offset&1)) { joystick_w(space, offset>>1, data << 16, mem_mask << 16); } else { joystick_w(space, offset>>1, data, mem_mask); } } - -READ32_MEMBER(jaguar_state::shared_ram_r){ return m_shared_ram[offset]; } -WRITE32_MEMBER(jaguar_state::shared_ram_w){ COMBINE_DATA(&m_shared_ram[offset]); } -READ32_MEMBER(jaguar_state::rom_base_r){ return m_rom_base[offset*2+1] << 16 | m_rom_base[offset*2]; } -READ32_MEMBER(jaguar_state::wave_rom_r){ return m_wave_rom[offset*2+1] << 16 | m_wave_rom[offset*2]; } -READ32_MEMBER(jaguarcd_state::cd_bios_r){ return m_cd_bios[offset*2+1] << 16 | m_cd_bios[offset*2]; } -READ32_MEMBER(jaguar_state::dsp_ram_r){ return m_dsp_ram[offset]; } -WRITE32_MEMBER(jaguar_state::dsp_ram_w){ COMBINE_DATA(&m_dsp_ram[offset]); } -READ32_MEMBER(jaguar_state::gpu_clut_r){ return m_gpu_clut[offset]; } -WRITE32_MEMBER(jaguar_state::gpu_clut_w){ COMBINE_DATA(&m_gpu_clut[offset]); } -READ32_MEMBER(jaguar_state::gpu_ram_r){ return m_gpu_ram[offset]; } -WRITE32_MEMBER(jaguar_state::gpu_ram_w){ COMBINE_DATA(&m_gpu_ram[offset]); } - -READ16_MEMBER(jaguar_state::shared_ram_r16){ if (!(offset&1)) { return shared_ram_r(space, offset>>1, mem_mask<<16) >> 16; } else { return shared_ram_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::shared_ram_w16){ if (!(offset&1)) { shared_ram_w(space, offset>>1, data << 16, mem_mask << 16); } else { shared_ram_w(space, offset>>1, data, mem_mask); } } -READ16_MEMBER(jaguar_state::cart_base_r16){ if (!(offset&1)) { return m_cart_base[offset>>1] >> 16; } else { return m_cart_base[offset>>1] & 0xffff; } } -READ16_MEMBER(jaguar_state::dsp_ram_r16){ if (!(offset&1)) { return dsp_ram_r(space, offset>>1, mem_mask<<16) >> 16; } else { return dsp_ram_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::dsp_ram_w16){ if (!(offset&1)) { dsp_ram_w(space, offset>>1, data << 16, mem_mask << 16); } else { dsp_ram_w(space, offset>>1, data, mem_mask); } } -READ16_MEMBER(jaguar_state::gpu_clut_r16){ if (!(offset&1)) { return gpu_clut_r(space, offset>>1, mem_mask<<16) >> 16; } else { return gpu_clut_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::gpu_clut_w16){ if (!(offset&1)) { gpu_clut_w(space, offset>>1, data << 16, mem_mask << 16); } else { gpu_clut_w(space, offset>>1, data, mem_mask); } } -READ16_MEMBER(jaguar_state::gpu_ram_r16){ if (!(offset&1)) { return gpu_ram_r(space, offset>>1, mem_mask<<16) >> 16; } else { return gpu_ram_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguar_state::gpu_ram_w16){ if (!(offset&1)) { gpu_ram_w(space, offset>>1, data << 16, mem_mask << 16); } else { gpu_ram_w(space, offset>>1, data, mem_mask); } } +uint16_t jaguar_state::gpuctrl_r16(offs_t offset, uint16_t mem_mask){ if (!(offset&1)) { return gpuctrl_r(offset>>1, mem_mask<<16) >> 16; } else { return gpuctrl_r(offset>>1, mem_mask); } } +void jaguar_state::gpuctrl_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { gpuctrl_w(offset>>1, data << 16, mem_mask << 16); } else { gpuctrl_w(offset>>1, data, mem_mask); } } +uint16_t jaguar_state::blitter_r16(offs_t offset, uint16_t mem_mask){ if (!(offset&1)) { return blitter_r(offset>>1, mem_mask<<16) >> 16; } else { return blitter_r(offset>>1, mem_mask); } } +void jaguar_state::blitter_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { blitter_w(offset>>1, data << 16, mem_mask << 16); } else { blitter_w(offset>>1, data, mem_mask); } } +uint16_t jaguar_state::serial_r16(offs_t offset){ if (!(offset&1)) { return serial_r(offset>>1) >> 16; } else { return serial_r(offset>>1); } } +void jaguar_state::serial_w16(offs_t offset, uint16_t data){ if (!(offset&1)) { serial_w(offset>>1, data << 16); } else { serial_w(offset>>1, data); } } +uint16_t jaguar_state::dspctrl_r16(offs_t offset, uint16_t mem_mask){ if (!(offset&1)) { return dspctrl_r(offset>>1, mem_mask<<16) >> 16; } else { return dspctrl_r(offset>>1, mem_mask); } } +void jaguar_state::dspctrl_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { dspctrl_w(offset>>1, data << 16, mem_mask << 16); } else { dspctrl_w(offset>>1, data, mem_mask); } } +uint16_t jaguar_state::eeprom_cs16(offs_t offset){ if (!(offset&1)) { return eeprom_cs() >> 16; } else { return eeprom_cs(); } } +uint16_t jaguar_state::eeprom_clk16(offs_t offset){ if (!(offset&1)) { return eeprom_clk() >> 16; } else { return eeprom_clk(); } } +void jaguar_state::eeprom_w16(offs_t offset, uint16_t data){ if (!(offset&1)) { eeprom_w(data << 16); } else { eeprom_w(data); } } +uint16_t jaguar_state::joystick_r16(offs_t offset){ if (!(offset&1)) { return joystick_r() >> 16; } else { return joystick_r(); } } +void jaguar_state::joystick_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { joystick_w(offset>>1, data << 16, mem_mask << 16); } else { joystick_w(offset>>1, data, mem_mask); } } + +uint32_t jaguar_state::shared_ram_r(offs_t offset){ return m_shared_ram[offset]; } +void jaguar_state::shared_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask){ COMBINE_DATA(&m_shared_ram[offset]); } +uint32_t jaguar_state::rom_base_r(offs_t offset){ return m_rom_base[offset*2+1] << 16 | m_rom_base[offset*2]; } +uint32_t jaguar_state::wave_rom_r(offs_t offset){ return m_wave_rom[offset*2+1] << 16 | m_wave_rom[offset*2]; } +uint32_t jaguarcd_state::cd_bios_r(offs_t offset){ return m_cd_bios[offset*2+1] << 16 | m_cd_bios[offset*2]; } +uint32_t jaguar_state::dsp_ram_r(offs_t offset){ return m_dsp_ram[offset]; } +void jaguar_state::dsp_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask){ COMBINE_DATA(&m_dsp_ram[offset]); } +uint32_t jaguar_state::gpu_clut_r(offs_t offset){ return m_gpu_clut[offset]; } +void jaguar_state::gpu_clut_w(offs_t offset, uint32_t data, uint32_t mem_mask){ COMBINE_DATA(&m_gpu_clut[offset]); } +uint32_t jaguar_state::gpu_ram_r(offs_t offset){ return m_gpu_ram[offset]; } +void jaguar_state::gpu_ram_w(offs_t offset, uint32_t data, uint32_t mem_mask){ COMBINE_DATA(&m_gpu_ram[offset]); } + +uint16_t jaguar_state::shared_ram_r16(offs_t offset){ if (!(offset&1)) { return shared_ram_r(offset>>1) >> 16; } else { return shared_ram_r(offset>>1); } } +void jaguar_state::shared_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { shared_ram_w(offset>>1, data << 16, mem_mask << 16); } else { shared_ram_w(offset>>1, data, mem_mask); } } +uint16_t jaguar_state::cart_base_r16(offs_t offset){ if (!(offset&1)) { return m_cart_base[offset>>1] >> 16; } else { return m_cart_base[offset>>1] & 0xffff; } } +uint16_t jaguar_state::dsp_ram_r16(offs_t offset){ if (!(offset&1)) { return dsp_ram_r(offset>>1) >> 16; } else { return dsp_ram_r(offset>>1); } } +void jaguar_state::dsp_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { dsp_ram_w(offset>>1, data << 16, mem_mask << 16); } else { dsp_ram_w(offset>>1, data, mem_mask); } } +uint16_t jaguar_state::gpu_clut_r16(offs_t offset){ if (!(offset&1)) { return gpu_clut_r(offset>>1) >> 16; } else { return gpu_clut_r(offset>>1); } } +void jaguar_state::gpu_clut_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { gpu_clut_w(offset>>1, data << 16, mem_mask << 16); } else { gpu_clut_w(offset>>1, data, mem_mask); } } +uint16_t jaguar_state::gpu_ram_r16(offs_t offset){ if (!(offset&1)) { return gpu_ram_r(offset>>1) >> 16; } else { return gpu_ram_r(offset>>1); } } +void jaguar_state::gpu_ram_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { gpu_ram_w(offset>>1, data << 16, mem_mask << 16); } else { gpu_ram_w(offset>>1, data, mem_mask); } } void jaguar_state::console_base_map(address_map &map) { @@ -1207,10 +1207,10 @@ TODO: this needs to be device-ized, of course ... */ -READ16_MEMBER(jaguarcd_state::butch_regs_r16){ if (!(offset&1)) { return butch_regs_r(space, offset>>1, mem_mask<<16) >> 16; } else { return butch_regs_r(space, offset>>1, mem_mask); } } -WRITE16_MEMBER(jaguarcd_state::butch_regs_w16){ if (!(offset&1)) { butch_regs_w(space, offset>>1, data << 16, mem_mask << 16); } else { butch_regs_w(space, offset>>1, data, mem_mask); } } +uint16_t jaguarcd_state::butch_regs_r16(offs_t offset){ if (!(offset&1)) { return butch_regs_r(offset>>1) >> 16; } else { return butch_regs_r(offset>>1); } } +void jaguarcd_state::butch_regs_w16(offs_t offset, uint16_t data, uint16_t mem_mask){ if (!(offset&1)) { butch_regs_w(offset>>1, data << 16, mem_mask << 16); } else { butch_regs_w(offset>>1, data, mem_mask); } } -READ32_MEMBER(jaguarcd_state::butch_regs_r) +uint32_t jaguarcd_state::butch_regs_r(offs_t offset) { switch(offset*4) { @@ -1222,7 +1222,7 @@ READ32_MEMBER(jaguarcd_state::butch_regs_r) return m_butch_regs[offset]; } -WRITE32_MEMBER(jaguarcd_state::butch_regs_w) +void jaguarcd_state::butch_regs_w(offs_t offset, uint32_t data, uint32_t mem_mask) { COMBINE_DATA(&m_butch_regs[offset]); @@ -2491,10 +2491,10 @@ void jaguar_state::cojag_common_init(uint16_t gpu_jump_offs, uint16_t spin_pc) /* install synchronization hooks for GPU */ if (m_is_r3000) - m_maincpu->space(AS_PROGRAM).install_write_handler(0x04f0b000 + gpu_jump_offs, 0x04f0b003 + gpu_jump_offs, write32_delegate(*this, FUNC(jaguar_state::gpu_jump_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x04f0b000 + gpu_jump_offs, 0x04f0b003 + gpu_jump_offs, write32s_delegate(*this, FUNC(jaguar_state::gpu_jump_w))); else - m_maincpu->space(AS_PROGRAM).install_write_handler(0xf0b000 + gpu_jump_offs, 0xf0b003 + gpu_jump_offs, write32_delegate(*this, FUNC(jaguar_state::gpu_jump_w))); - m_gpu->space(AS_PROGRAM).install_read_handler(0xf03000 + gpu_jump_offs, 0xf03003 + gpu_jump_offs, read32_delegate(*this, FUNC(jaguar_state::gpu_jump_r))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xf0b000 + gpu_jump_offs, 0xf0b003 + gpu_jump_offs, write32s_delegate(*this, FUNC(jaguar_state::gpu_jump_w))); + m_gpu->space(AS_PROGRAM).install_read_handler(0xf03000 + gpu_jump_offs, 0xf03003 + gpu_jump_offs, read32smo_delegate(*this, FUNC(jaguar_state::gpu_jump_r))); m_gpu_jump_address = &m_gpu_ram[gpu_jump_offs/4]; m_gpu_spin_pc = 0xf03000 + spin_pc; } @@ -2507,7 +2507,7 @@ void jaguar_state::init_area51a() #if ENABLE_SPEEDUP_HACKS /* install speedup for main CPU */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0xa02030, 0xa02033, write32_delegate(*this, FUNC(jaguar_state::area51_main_speedup_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xa02030, 0xa02033, write32s_delegate(*this, FUNC(jaguar_state::area51_main_speedup_w))); m_main_speedup = m_mainram + 0x2030/4; #endif } @@ -2520,7 +2520,7 @@ void jaguar_state::init_area51() #if ENABLE_SPEEDUP_HACKS /* install speedup for main CPU */ m_main_speedup_max_cycles = 120; - m_maincpu->space(AS_PROGRAM).install_read_handler(0x100062e8, 0x100062eb, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x100062e8, 0x100062eb, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); m_main_speedup = m_mainram + 0x62e8/4; #endif } @@ -2536,7 +2536,7 @@ void jaguar_state::init_maxforce() #if ENABLE_SPEEDUP_HACKS /* install speedup for main CPU */ m_main_speedup_max_cycles = 120; - m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000865c, 0x1000865f, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000865c, 0x1000865f, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); m_main_speedup = m_mainram + 0x865c/4; #endif } @@ -2552,7 +2552,7 @@ void jaguar_state::init_area51mx() #if ENABLE_SPEEDUP_HACKS /* install speedup for main CPU */ - m_maincpu->space(AS_PROGRAM).install_write_handler(0xa19550, 0xa19557, write32_delegate(*this, FUNC(jaguar_state::area51mx_main_speedup_w))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xa19550, 0xa19557, write32s_delegate(*this, FUNC(jaguar_state::area51mx_main_speedup_w))); m_main_speedup = m_mainram + 0x19550/4; #endif } @@ -2569,7 +2569,7 @@ void jaguar_state::init_a51mxr3k() #if ENABLE_SPEEDUP_HACKS /* install speedup for main CPU */ m_main_speedup_max_cycles = 120; - m_maincpu->space(AS_PROGRAM).install_read_handler(0x10006f0c, 0x10006f0f, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x10006f0c, 0x10006f0f, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); m_main_speedup = m_mainram + 0x6f0c/4; #endif } @@ -2583,7 +2583,7 @@ void jaguar_state::init_fishfren() #if ENABLE_SPEEDUP_HACKS /* install speedup for main CPU */ m_main_speedup_max_cycles = 200; - m_maincpu->space(AS_PROGRAM).install_read_handler(0x10021b60, 0x10021b63, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x10021b60, 0x10021b63, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); m_main_speedup = m_mainram + 0x21b60/4; #endif } @@ -2597,10 +2597,10 @@ void jaguar_state::init_freeze_common(offs_t main_speedup_addr) /* install speedup for main CPU */ m_main_speedup_max_cycles = 200; if (main_speedup_addr != 0) { - m_maincpu->space(AS_PROGRAM).install_read_handler(main_speedup_addr, main_speedup_addr + 3, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(main_speedup_addr, main_speedup_addr + 3, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); m_main_speedup = m_mainram + (main_speedup_addr - 0x10000000)/4; } - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0400d900, 0x0400d900 + 3, read32_delegate(*this, FUNC(jaguar_state::main_gpu_wait_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0400d900, 0x0400d900 + 3, read32smo_delegate(*this, FUNC(jaguar_state::main_gpu_wait_r))); m_main_gpu_wait = m_shared_ram + 0xd900/4; #endif } @@ -2620,7 +2620,7 @@ void jaguar_state::init_vcircle() #if ENABLE_SPEEDUP_HACKS /* install speedup for main CPU */ m_main_speedup_max_cycles = 50; - m_maincpu->space(AS_PROGRAM).install_read_handler(0x12005b34, 0x12005b37, read32_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x12005b34, 0x12005b37, read32smo_delegate(*this, FUNC(jaguar_state::cojagr3k_main_speedup_r))); m_main_speedup = m_mainram + 0x5b34/4; m_main_speedup = m_mainram2 + 0x5b34/4; #endif |