Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-26 02:07:14 +03:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

replaced more machine().firstcpu with m_maincpu [smf]

Browse Source
This commit is contained in:
smf- 2014-01-23 01:01:24 +00:00
parent c2158d2c10
commit 9244b6baff
29 changed files with 83 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/sound/disc_inp.c
View File

@ -23,14 +23,14 @@
READ8_DEVICE_HANDLER(discrete_sound_r) READ8_DEVICE_HANDLER(discrete_sound_r)
{ {
discrete_device *disc_device = downcast<discrete_device *>(device); discrete_device *disc_device = downcast<discrete_device *>(device);
return disc_device->read( disc_device->machine().firstcpu->space(), offset, 0xff); return disc_device->read( space, offset, 0xff);
} }
WRITE8_DEVICE_HANDLER(discrete_sound_w) WRITE8_DEVICE_HANDLER(discrete_sound_w)
{ {
discrete_device *disc_device = downcast<discrete_device *>(device); discrete_device *disc_device = downcast<discrete_device *>(device);
disc_device->write(disc_device->machine().firstcpu->space(), offset, data, 0xff); disc_device->write(space, offset, data, 0xff);
} }
/************************************************************************ /************************************************************************

19
src/mame/drivers/chihiro.c
View File

@ -861,7 +861,8 @@ static void jamtable_disasm(running_machine &machine, address_space &space,UINT3
static void jamtable_disasm_command(running_machine &machine, int ref, int params, const char **param) static void jamtable_disasm_command(running_machine &machine, int ref, int params, const char **param)
{ {
address_space &space=machine.firstcpu->space(); chihiro_state *state = machine.driver_data<chihiro_state>();
address_space &space=state->m_maincpu->space();
UINT64 addr,size; UINT64 addr,size;
if (params < 2) if (params < 2)
@ -875,7 +876,8 @@ static void jamtable_disasm_command(running_machine &machine, int ref, int param
static void dump_string_command(running_machine &machine, int ref, int params, const char **param) static void dump_string_command(running_machine &machine, int ref, int params, const char **param)
{ {
address_space &space=machine.firstcpu->space(); chihiro_state *state = machine.driver_data<chihiro_state>();
address_space &space=state->m_maincpu->space();
UINT64 addr; UINT64 addr;
offs_t address; offs_t address;
UINT32 length,maximumlength; UINT32 length,maximumlength;
@ -914,7 +916,8 @@ static void dump_string_command(running_machine &machine, int ref, int params, c
static void dump_process_command(running_machine &machine, int ref, int params, const char **param) static void dump_process_command(running_machine &machine, int ref, int params, const char **param)
{ {
address_space &space=machine.firstcpu->space(); chihiro_state *state = machine.driver_data<chihiro_state>();
address_space &space=state->m_maincpu->space();
UINT64 addr; UINT64 addr;
offs_t address; offs_t address;
@ -940,7 +943,8 @@ static void dump_process_command(running_machine &machine, int ref, int params,
static void dump_list_command(running_machine &machine, int ref, int params, const char **param) static void dump_list_command(running_machine &machine, int ref, int params, const char **param)
{ {
address_space &space=machine.firstcpu->space(); chihiro_state *state = machine.driver_data<chihiro_state>();
address_space &space=state->m_maincpu->space();
UINT64 addr,offs,start,old; UINT64 addr,offs,start,old;
offs_t address,offset; offs_t address,offset;
@ -987,14 +991,13 @@ static void dump_list_command(running_machine &machine, int ref, int params, con
static void curthread_command(running_machine &machine, int ref, int params, const char **param) static void curthread_command(running_machine &machine, int ref, int params, const char **param)
{ {
address_space &space=machine.firstcpu->space(); chihiro_state *state = machine.driver_data<chihiro_state>();
address_space &space=state->m_maincpu->space();
UINT64 fsbase; UINT64 fsbase;
UINT32 kthrd,topstack,tlsdata; UINT32 kthrd,topstack,tlsdata;
offs_t address; offs_t address;
cpuinfo cpu_info;
fsbase = machine.firstcpu->state_int(44); fsbase = state->m_maincpu->state_int(44);
fsbase=cpu_info.i;
address=(offs_t)fsbase+0x28; address=(offs_t)fsbase+0x28;
if (!debug_cpu_translate(space,TRANSLATE_READ_DEBUG,&address)) if (!debug_cpu_translate(space,TRANSLATE_READ_DEBUG,&address))
{ {

16
src/mame/drivers/limenko.c
View File

@ -1076,9 +1076,9 @@ ROM_END
READ32_MEMBER(limenko_state::dynabomb_speedup_r) READ32_MEMBER(limenko_state::dynabomb_speedup_r)
{ {
if(machine().firstcpu->pc() == 0xc25b8) if(m_maincpu->pc() == 0xc25b8)
{ {
machine().firstcpu->eat_cycles(50); m_maincpu->eat_cycles(50);
} }
return m_mainram[0xe2784/4]; return m_mainram[0xe2784/4];
@ -1086,9 +1086,9 @@ READ32_MEMBER(limenko_state::dynabomb_speedup_r)
READ32_MEMBER(limenko_state::legendoh_speedup_r) READ32_MEMBER(limenko_state::legendoh_speedup_r)
{ {
if(machine().firstcpu->pc() == 0x23e32) if(m_maincpu->pc() == 0x23e32)
{ {
machine().firstcpu->eat_cycles(50); m_maincpu->eat_cycles(50);
} }
return m_mainram[0x32ab0/4]; return m_mainram[0x32ab0/4];
@ -1096,9 +1096,9 @@ READ32_MEMBER(limenko_state::legendoh_speedup_r)
READ32_MEMBER(limenko_state::sb2003_speedup_r) READ32_MEMBER(limenko_state::sb2003_speedup_r)
{ {
if(machine().firstcpu->pc() == 0x26da4) if(m_maincpu->pc() == 0x26da4)
{ {
machine().firstcpu->eat_cycles(50); m_maincpu->eat_cycles(50);
} }
return m_mainram[0x135800/4]; return m_mainram[0x135800/4];
@ -1106,9 +1106,9 @@ READ32_MEMBER(limenko_state::sb2003_speedup_r)
READ32_MEMBER(limenko_state::spotty_speedup_r) READ32_MEMBER(limenko_state::spotty_speedup_r)
{ {
if(machine().firstcpu->pc() == 0x8560) if(m_maincpu->pc() == 0x8560)
{ {
machine().firstcpu->eat_cycles(50); m_maincpu->eat_cycles(50);
} }
return m_mainram[0x6626c/4]; return m_mainram[0x6626c/4];

4
src/mame/drivers/m90.c
View File

@ -681,7 +681,7 @@ GFXDECODE_END
INTERRUPT_GEN_MEMBER(m90_state::fake_nmi) INTERRUPT_GEN_MEMBER(m90_state::fake_nmi)
{ {
address_space &space = machine().firstcpu->space(AS_PROGRAM); address_space &space = m_maincpu->space(AS_PROGRAM);
int sample = m_audio->sample_r(space,0); int sample = m_audio->sample_r(space,0);
if (sample) if (sample)
m_audio->sample_w(space,0,sample); m_audio->sample_w(space,0,sample);
@ -689,7 +689,7 @@ INTERRUPT_GEN_MEMBER(m90_state::fake_nmi)
INTERRUPT_GEN_MEMBER(m90_state::bomblord_fake_nmi) INTERRUPT_GEN_MEMBER(m90_state::bomblord_fake_nmi)
{ {
address_space &space = machine().firstcpu->space(AS_PROGRAM); address_space &space = m_maincpu->space(AS_PROGRAM);
int sample = m_audio->sample_r(space,0); int sample = m_audio->sample_r(space,0);
if (sample != 0x80) if (sample != 0x80)
m_audio->sample_w(space,0,sample); m_audio->sample_w(space,0,sample);

2
src/mame/drivers/midqslvr.c
View File

@ -214,8 +214,8 @@ static void intel82439tx_pci_w(device_t *busdevice, device_t *device, int functi
static UINT8 piix4_config_r(device_t *busdevice, device_t *device, int function, int reg) static UINT8 piix4_config_r(device_t *busdevice, device_t *device, int function, int reg)
{ {
address_space &space = busdevice->machine().firstcpu->space( AS_PROGRAM );
midqslvr_state *state = busdevice->machine().driver_data<midqslvr_state>(); midqslvr_state *state = busdevice->machine().driver_data<midqslvr_state>();
address_space &space = state->m_maincpu->space( AS_PROGRAM );
function &= 3; function &= 3;

12
src/mame/drivers/peplus.c
View File

@ -647,7 +647,7 @@ READ8_MEMBER(peplus_state::peplus_input0_r)
833.3 cycles per millisecond 833.3 cycles per millisecond
10 ms = 8333 cycles 10 ms = 8333 cycles
*/ */
UINT64 curr_cycles = machine().firstcpu->total_cycles(); UINT64 curr_cycles = m_maincpu->total_cycles();
// Allow Bill Insert if DBV Enabled // Allow Bill Insert if DBV Enabled
if (m_bv_enable_state == 0x01 && ((ioport("DBV")->read_safe(0xff) & 0x01) == 0x00)) { if (m_bv_enable_state == 0x01 && ((ioport("DBV")->read_safe(0xff) & 0x01) == 0x00)) {
@ -865,7 +865,7 @@ READ8_MEMBER(peplus_state::peplus_input_bank_a_r)
UINT8 bank_a = 0x50; // Turn Off Low Battery and Hopper Full Statuses UINT8 bank_a = 0x50; // Turn Off Low Battery and Hopper Full Statuses
UINT8 coin_optics = 0x00; UINT8 coin_optics = 0x00;
UINT8 coin_out = 0x00; UINT8 coin_out = 0x00;
UINT64 curr_cycles = machine().firstcpu->total_cycles(); UINT64 curr_cycles = m_maincpu->total_cycles();
UINT16 door_wait = 500; UINT16 door_wait = 500;
UINT8 sda = 0; UINT8 sda = 0;
@ -876,14 +876,14 @@ READ8_MEMBER(peplus_state::peplus_input_bank_a_r)
if ((ioport("SENSOR")->read_safe(0x00) & 0x01) == 0x01 && m_coin_state == 0) { if ((ioport("SENSOR")->read_safe(0x00) & 0x01) == 0x01 && m_coin_state == 0) {
m_coin_state = 1; // Start Coin Cycle m_coin_state = 1; // Start Coin Cycle
m_last_cycles = machine().firstcpu->total_cycles(); m_last_cycles = m_maincpu->total_cycles();
} else { } else {
/* Process Next Coin Optic State */ /* Process Next Coin Optic State */
if (curr_cycles - m_last_cycles > 600000/6 && m_coin_state != 0) { if (curr_cycles - m_last_cycles > 600000/6 && m_coin_state != 0) {
m_coin_state++; m_coin_state++;
if (m_coin_state > 5) if (m_coin_state > 5)
m_coin_state = 0; m_coin_state = 0;
m_last_cycles = machine().firstcpu->total_cycles(); m_last_cycles = m_maincpu->total_cycles();
} }
} }
@ -918,7 +918,7 @@ READ8_MEMBER(peplus_state::peplus_input_bank_a_r)
} else { } else {
m_door_open = 1; m_door_open = 1;
} }
m_last_door = machine().firstcpu->total_cycles(); m_last_door = m_maincpu->total_cycles();
} }
if (curr_cycles - m_last_coin_out > 600000/12 && m_coin_out_state != 0) { // Guessing with 600000 if (curr_cycles - m_last_coin_out > 600000/12 && m_coin_out_state != 0) { // Guessing with 600000
@ -928,7 +928,7 @@ READ8_MEMBER(peplus_state::peplus_input_bank_a_r)
m_coin_out_state = 3; // Coin-Out On m_coin_out_state = 3; // Coin-Out On
} }
m_last_coin_out = machine().firstcpu->total_cycles(); m_last_coin_out = m_maincpu->total_cycles();
} }
switch (m_coin_out_state) switch (m_coin_out_state)

2
src/mame/drivers/policetr.c
View File

@ -213,7 +213,7 @@ WRITE32_MEMBER(policetr_state::speedup_w)
/* see if the PC matches */ /* see if the PC matches */
if ((space.device().safe_pcbase() & 0x1fffffff) == m_speedup_pc) if ((space.device().safe_pcbase() & 0x1fffffff) == m_speedup_pc)
{ {
UINT64 curr_cycles = machine().firstcpu->total_cycles(); UINT64 curr_cycles = m_maincpu->total_cycles();
/* if less than 50 cycles from the last time, count it */ /* if less than 50 cycles from the last time, count it */
if (curr_cycles - m_last_cycles < 50) if (curr_cycles - m_last_cycles < 50)

2
src/mame/drivers/seattle.c
View File

@ -1418,7 +1418,7 @@ WRITE_LINE_MEMBER(seattle_state::voodoo_stall)
/* if the CPU had a pending write, do it now */ /* if the CPU had a pending write, do it now */
if (m_cpu_stalled_on_voodoo) if (m_cpu_stalled_on_voodoo)
{ {
address_space &space = machine().firstcpu->space(AS_PROGRAM); address_space &space = m_maincpu->space(AS_PROGRAM);
voodoo_w(m_voodoo, space, m_cpu_stalled_offset, m_cpu_stalled_data, m_cpu_stalled_mem_mask); voodoo_w(m_voodoo, space, m_cpu_stalled_offset, m_cpu_stalled_data, m_cpu_stalled_mem_mask);
} }
m_cpu_stalled_on_voodoo = FALSE; m_cpu_stalled_on_voodoo = FALSE;

2
src/mame/drivers/skydiver.c
View File

@ -148,7 +148,7 @@ WRITE8_MEMBER(skydiver_state::skydiver_nmion_w)
INTERRUPT_GEN_MEMBER(skydiver_state::skydiver_interrupt) INTERRUPT_GEN_MEMBER(skydiver_state::skydiver_interrupt)
{ {
/* Convert range data to divide value and write to sound */ /* Convert range data to divide value and write to sound */
address_space &space = machine().firstcpu->space(AS_PROGRAM); address_space &space = m_maincpu->space(AS_PROGRAM);
discrete_sound_w(m_discrete, space, SKYDIVER_RANGE_DATA, (0x01 << (~m_videoram[0x394] & 0x07)) & 0xff); // Range 0-2 discrete_sound_w(m_discrete, space, SKYDIVER_RANGE_DATA, (0x01 << (~m_videoram[0x394] & 0x07)) & 0xff); // Range 0-2
discrete_sound_w(m_discrete, space, SKYDIVER_RANGE3_EN, m_videoram[0x394] & 0x08); // Range 3 - note disable discrete_sound_w(m_discrete, space, SKYDIVER_RANGE3_EN, m_videoram[0x394] & 0x08); // Range 3 - note disable

8
src/mame/drivers/splus.c
View File

@ -366,7 +366,7 @@ READ8_MEMBER(splus_state::splus_serial_r)
UINT8 coin_out = 0x00; UINT8 coin_out = 0x00;
UINT8 coin_optics = 0x00; UINT8 coin_optics = 0x00;
UINT8 door_optics = 0x00; UINT8 door_optics = 0x00;
UINT32 curr_cycles = machine().firstcpu->total_cycles(); UINT32 curr_cycles = m_maincpu->total_cycles();
UINT8 in = 0x00; UINT8 in = 0x00;
UINT8 val = 0x00; UINT8 val = 0x00;
@ -389,7 +389,7 @@ READ8_MEMBER(splus_state::splus_serial_r)
// Test for Coin-In // Test for Coin-In
if ((ioport("SENSOR")->read_safe(0x00) & 0x01) == 0x01 && m_coin_state == 0) { if ((ioport("SENSOR")->read_safe(0x00) & 0x01) == 0x01 && m_coin_state == 0) {
m_coin_state = 1; // Start Coin Cycle m_coin_state = 1; // Start Coin Cycle
m_last_cycles = machine().firstcpu->total_cycles(); m_last_cycles = m_maincpu->total_cycles();
#if DEBUG_OUTPUT #if DEBUG_OUTPUT
mame_printf_info("coin=%02X\n", m_coin_state); mame_printf_info("coin=%02X\n", m_coin_state);
#endif #endif
@ -399,7 +399,7 @@ READ8_MEMBER(splus_state::splus_serial_r)
m_coin_state++; m_coin_state++;
if (m_coin_state > 5) if (m_coin_state > 5)
m_coin_state = 0; m_coin_state = 0;
m_last_cycles = machine().firstcpu->total_cycles(); m_last_cycles = m_maincpu->total_cycles();
#if DEBUG_OUTPUT #if DEBUG_OUTPUT
mame_printf_info("coin=%02X\n", m_coin_state); mame_printf_info("coin=%02X\n", m_coin_state);
#endif #endif
@ -451,7 +451,7 @@ READ8_MEMBER(splus_state::splus_serial_r)
m_coin_out_state = 3; // Coin-Out On m_coin_out_state = 3; // Coin-Out On
} }
m_last_coin_out = machine().firstcpu->total_cycles(); m_last_coin_out = m_maincpu->total_cycles();
} }
// Set Coin Out State // Set Coin Out State

2
src/mame/drivers/sprint2.c
View File

@ -93,7 +93,7 @@ INTERRUPT_GEN_MEMBER(sprint2_state::sprint2)
} }
} }
address_space &space = machine().firstcpu->space(AS_PROGRAM); address_space &space = m_maincpu->space(AS_PROGRAM);
discrete_sound_w(m_discrete, space, SPRINT2_MOTORSND1_DATA, m_video_ram[0x394] & 15); // also DOMINOS_FREQ_DATA discrete_sound_w(m_discrete, space, SPRINT2_MOTORSND1_DATA, m_video_ram[0x394] & 15); // also DOMINOS_FREQ_DATA
discrete_sound_w(m_discrete, space, SPRINT2_MOTORSND2_DATA, m_video_ram[0x395] & 15); discrete_sound_w(m_discrete, space, SPRINT2_MOTORSND2_DATA, m_video_ram[0x395] & 15);
discrete_sound_w(m_discrete, space, SPRINT2_CRASHSND_DATA, m_video_ram[0x396] & 15); // also DOMINOS_AMP_DATA discrete_sound_w(m_discrete, space, SPRINT2_CRASHSND_DATA, m_video_ram[0x396] & 15); // also DOMINOS_AMP_DATA

2
src/mame/machine/balsente.c
View File

@ -251,7 +251,7 @@ READ8_MEMBER(balsente_state::balsente_random_num_r)
UINT32 cc; UINT32 cc;
/* CPU runs at 1.25MHz, noise source at 100kHz --> multiply by 12.5 */ /* CPU runs at 1.25MHz, noise source at 100kHz --> multiply by 12.5 */
cc = machine().firstcpu->total_cycles(); cc = m_maincpu->total_cycles();
/* 12.5 = 8 + 4 + 0.5 */ /* 12.5 = 8 + 4 + 0.5 */
cc = (cc << 3) + (cc << 2) + (cc >> 1); cc = (cc << 3) + (cc << 2) + (cc >> 1);

11
src/mame/machine/galaxold.c
View File

@ -13,16 +13,7 @@
IRQ_CALLBACK_MEMBER(galaxold_state::hunchbkg_irq_callback) IRQ_CALLBACK_MEMBER(galaxold_state::hunchbkg_irq_callback)
{ {
//galaxold_state *state = device->machine().driver_data<galaxold_state>(); m_maincpu->set_input_line(0, CLEAR_LINE);
/* for some reason a call to cputag_set_input_line
* is significantly delayed ....
*
* state->m_maincpu->set_input_line(0, CLEAR_LINE);
*
* Therefore we reset the line without any detour ....
*/
device.machine().firstcpu->set_input_line(0, CLEAR_LINE);
//cpu_set_info(device->machine().firstcpu, CPUINFO_INT_INPUT_STATE + state->m_irq_line, CLEAR_LINE);
return 0x03; return 0x03;
} }

4
src/mame/video/system1.c
View File

@ -255,7 +255,7 @@ inline void system1_state::videoram_wait_states(cpu_device *cpu)
READ8_MEMBER(system1_state::system1_videoram_r) READ8_MEMBER(system1_state::system1_videoram_r)
{ {
UINT8 *videoram = m_videoram; UINT8 *videoram = m_videoram;
videoram_wait_states(machine().firstcpu); videoram_wait_states(m_maincpu);
offset |= 0x1000 * ((m_videoram_bank >> 1) % (m_tilemap_pages / 2)); offset |= 0x1000 * ((m_videoram_bank >> 1) % (m_tilemap_pages / 2));
return videoram[offset]; return videoram[offset];
} }
@ -263,7 +263,7 @@ READ8_MEMBER(system1_state::system1_videoram_r)
WRITE8_MEMBER(system1_state::system1_videoram_w) WRITE8_MEMBER(system1_state::system1_videoram_w)
{ {
UINT8 *videoram = m_videoram; UINT8 *videoram = m_videoram;
videoram_wait_states(machine().firstcpu); videoram_wait_states(m_maincpu);
offset |= 0x1000 * ((m_videoram_bank >> 1) % (m_tilemap_pages / 2)); offset |= 0x1000 * ((m_videoram_bank >> 1) % (m_tilemap_pages / 2));
videoram[offset] = data; videoram[offset] = data;

4
src/mess/drivers/c65.c
View File

@ -60,10 +60,8 @@ bus serial (available in all modes), a Fast and a Burst serial bus
#include "bus/cbmiec/cbmiec.h" #include "bus/cbmiec/cbmiec.h"
#include "machine/ram.h" #include "machine/ram.h"
static void cbm_c65_quick_sethiaddress( running_machine &machine, UINT16 hiaddress ) static void cbm_c65_quick_sethiaddress( address_space &space, UINT16 hiaddress )
{ {
address_space &space = machine.firstcpu->space(AS_PROGRAM);
space.write_byte(0x82, hiaddress & 0xff); space.write_byte(0x82, hiaddress & 0xff);
space.write_byte(0x83, hiaddress >> 8); space.write_byte(0x83, hiaddress >> 8);
} }

4
src/mess/drivers/cbm2.c
View File

@ -31,10 +31,8 @@
#define A0 BIT(offset, 0) #define A0 BIT(offset, 0)
#define VA12 BIT(va, 12) #define VA12 BIT(va, 12)
static void cbmb_quick_sethiaddress(running_machine &machine, UINT16 hiaddress) static void cbmb_quick_sethiaddress(address_space &space, UINT16 hiaddress)
{ {
address_space &space = machine.firstcpu->space(AS_PROGRAM);
space.write_byte(0xf0046, hiaddress & 0xff); space.write_byte(0xf0046, hiaddress & 0xff);
space.write_byte(0xf0047, hiaddress >> 8); space.write_byte(0xf0047, hiaddress >> 8);
} }

2
src/mess/drivers/esq1.c
View File

@ -548,7 +548,7 @@ WRITE8_MEMBER(esq1_state::duart_output)
{ {
int bank = ((data >> 1) & 0x7); int bank = ((data >> 1) & 0x7);
// printf("DP [%02x]: %d mlo %d mhi %d tape %d\n", data, data&1, (data>>4)&1, (data>>5)&1, (data>>6)&3); // printf("DP [%02x]: %d mlo %d mhi %d tape %d\n", data, data&1, (data>>4)&1, (data>>5)&1, (data>>6)&3);
// printf("[%02x] bank %d => offset %x (PC=%x)\n", data, bank, bank * 0x1000, device->machine().firstcpu->safe_pc()); // printf("[%02x] bank %d => offset %x (PC=%x)\n", data, bank, bank * 0x1000, m_maincpu->safe_pc());
membank("osbank")->set_base(memregion("osrom")->base() + (bank * 0x1000) ); membank("osbank")->set_base(memregion("osrom")->base() + (bank * 0x1000) );
m_seq_bank = (data & 0x8) ? 0x8000 : 0x0000; m_seq_bank = (data & 0x8) ? 0x8000 : 0x0000;

2
src/mess/drivers/junior.c
View File

@ -69,7 +69,7 @@ ADDRESS_MAP_END
INPUT_CHANGED_MEMBER(junior_state::junior_reset) INPUT_CHANGED_MEMBER(junior_state::junior_reset)
{ {
if (newval == 0) if (newval == 0)
machine().firstcpu->reset(); m_maincpu->reset();
} }

2
src/mess/drivers/mc1502.c
View File

@ -233,7 +233,7 @@ const i8251_interface mc1502_i8251_interface =
WRITE_LINE_MEMBER(mc1502_state::mc1502_i8251_syndet) WRITE_LINE_MEMBER(mc1502_state::mc1502_i8251_syndet)
{ {
if (!BIT(m_ppi_portc,3)) if (!BIT(m_ppi_portc,3))
machine().firstcpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); m_maincpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE);
} }
WRITE_LINE_MEMBER(mc1502_state::mc1502_pit8253_out1_changed) WRITE_LINE_MEMBER(mc1502_state::mc1502_pit8253_out1_changed)

4
src/mess/drivers/msbc1.c
View File

@ -65,12 +65,12 @@ INPUT_PORTS_END
void msbc1_state::machine_reset() void msbc1_state::machine_reset()
{ {
void *ram = machine().firstcpu->space(AS_PROGRAM).get_write_ptr(0); void *ram = m_maincpu->space(AS_PROGRAM).get_write_ptr(0);
UINT8 *rom = memregion(MC68000R12_TAG)->base(); UINT8 *rom = memregion(MC68000R12_TAG)->base();
memcpy(ram, rom, 8); memcpy(ram, rom, 8);
machine().firstcpu->reset(); m_maincpu->reset();
} }
static GENERIC_TERMINAL_INTERFACE( terminal_intf ) static GENERIC_TERMINAL_INTERFACE( terminal_intf )

4
src/mess/drivers/pet.c
View File

@ -157,10 +157,8 @@ ROM sockets: UA3 2K or 4K character
static void cbm_pet_quick_sethiaddress( running_machine &machine, UINT16 hiaddress ) static void cbm_pet_quick_sethiaddress( address_space &space, UINT16 hiaddress )
{ {
address_space &space = machine.firstcpu->space(AS_PROGRAM);
space.write_byte(0x2e, hiaddress & 0xff); space.write_byte(0x2e, hiaddress & 0xff);
space.write_byte(0x2c, hiaddress & 0xff); space.write_byte(0x2c, hiaddress & 0xff);
space.write_byte(0x2a, hiaddress & 0xff); space.write_byte(0x2a, hiaddress & 0xff);

8
src/mess/drivers/pokemini.c
View File

@ -532,7 +532,7 @@ WRITE8_MEMBER(pokemini_state::pokemini_hwreg_w)
case 0x02: /* CPU related? case 0x02: /* CPU related?
Bit 0-7 R/W Unknown Bit 0-7 R/W Unknown
*/ */
logerror( "%0X: Write to unknown hardware address: %02X, %02X\n", machine().firstcpu->pc( ), offset, data ); logerror( "%0X: Write to unknown hardware address: %02X, %02X\n", m_maincpu->pc(), offset, data );
break; break;
case 0x08: /* Seconds-timer control case 0x08: /* Seconds-timer control
Bit 0 R/W Timer enable Bit 0 R/W Timer enable
@ -564,7 +564,7 @@ WRITE8_MEMBER(pokemini_state::pokemini_hwreg_w)
Bit 5 R Battery status: 0 - battery OK, 1 - battery low Bit 5 R Battery status: 0 - battery OK, 1 - battery low
Bit 6-7 Unused Bit 6-7 Unused
*/ */
logerror( "%0X: Write to unknown hardware address: %02X, %02X\n", machine().firstcpu->pc( ), offset, data ); logerror( "%0X: Write to unknown hardware address: %02X, %02X\n", m_maincpu->pc(), offset, data );
break; break;
case 0x18: /* Timer 1 pre-scale + enable case 0x18: /* Timer 1 pre-scale + enable
Bit 0-2 R/W low timer 1 prescaler select Bit 0-2 R/W low timer 1 prescaler select
@ -1423,7 +1423,7 @@ WRITE8_MEMBER(pokemini_state::pokemini_hwreg_w)
Map size 2: 0x00 to 0x60 Map size 2: 0x00 to 0x60
Bit 7 Unused Bit 7 Unused
*/ */
logerror( "%0X: Write to unknown hardware address: %02X, %02X\n", machine().firstcpu->pc( ), offset, data ); logerror( "%0X: Write to unknown hardware address: %02X, %02X\n", m_maincpu->pc(), offset, data );
break; break;
case 0x87: /* Sprite tile data memory offset (low) case 0x87: /* Sprite tile data memory offset (low)
Bit 0-5 Always "0" Bit 0-5 Always "0"
@ -1464,7 +1464,7 @@ WRITE8_MEMBER(pokemini_state::pokemini_hwreg_w)
// lcd_data_w( data ); // lcd_data_w( data );
break; break;
default: default:
logerror( "%0X: Write to unknown hardware address: %02X, %02X\n", machine().firstcpu->pc( ), offset, data ); logerror( "%0X: Write to unknown hardware address: %02X, %02X\n", m_maincpu->pc(), offset, data );
break; break;
} }
m_pm_reg[offset] = data; m_pm_reg[offset] = data;

2
src/mess/drivers/ravens.c
View File

@ -155,7 +155,7 @@ READ8_MEMBER( ravens_state::port17_r )
keyin = ioport("X2")->read(); keyin = ioport("X2")->read();
if (!BIT(keyin, 0)) if (!BIT(keyin, 0))
machine().firstcpu->reset(); m_maincpu->reset();
if (keyin != 0xff) if (keyin != 0xff)
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
if BIT(~keyin, i) if BIT(~keyin, i)

2
src/mess/machine/amstr_pc.c
View File

@ -132,7 +132,7 @@ port 03de write/read
DRIVER_INIT_MEMBER(amstrad_pc_state,pc1640) DRIVER_INIT_MEMBER(amstrad_pc_state,pc1640)
{ {
address_space &io_space = machine().firstcpu->space( AS_IO ); address_space &io_space = m_maincpu->space( AS_IO );
io_space.install_read_handler(0x278, 0x27b, read8_delegate(FUNC(amstrad_pc_state::pc1640_port278_r),this), 0xffff); io_space.install_read_handler(0x278, 0x27b, read8_delegate(FUNC(amstrad_pc_state::pc1640_port278_r),this), 0xffff);
io_space.install_read_handler(0x4278, 0x427b, read8_delegate(FUNC(amstrad_pc_state::pc1640_port4278_r),this), 0xffff); io_space.install_read_handler(0x4278, 0x427b, read8_delegate(FUNC(amstrad_pc_state::pc1640_port4278_r),this), 0xffff);

20
src/mess/machine/apollo.c
View File

@ -438,7 +438,7 @@ READ8_MEMBER(apollo_state::apollo_dma_read_byte){
offset &= 0x3ff; offset &= 0x3ff;
} }
data = machine().firstcpu->space(AS_PROGRAM).read_byte(page_offset + offset); data = m_maincpu->space(AS_PROGRAM).read_byte(page_offset + offset);
if (VERBOSE > 1 || offset < 4 || (offset & 0xff) == 0 || (offset & 0xff) == 0xff) if (VERBOSE > 1 || offset < 4 || (offset & 0xff) == 0 || (offset & 0xff) == 0xff)
{ {
@ -458,7 +458,7 @@ WRITE8_MEMBER(apollo_state::apollo_dma_write_byte){
offset &= 0x3ff; offset &= 0x3ff;
} }
// FIXME: MSB not available, writing only LSB // FIXME: MSB not available, writing only LSB
machine().firstcpu->space(AS_PROGRAM).write_byte(page_offset + offset, data); m_maincpu->space(AS_PROGRAM).write_byte(page_offset + offset, data);
if (VERBOSE > 1 || offset < 4 || (offset & 0xff) == 0 || (offset & 0xff) == 0xff) if (VERBOSE > 1 || offset < 4 || (offset & 0xff) == 0 || (offset & 0xff) == 0xff)
{ {
@ -481,7 +481,7 @@ READ8_MEMBER(apollo_state::apollo_dma_read_word){
offset = (offset << 1) & 0x3ff; offset = (offset << 1) & 0x3ff;
} }
data = machine().firstcpu->space(AS_PROGRAM).read_byte(page_offset + offset); data = m_maincpu->space(AS_PROGRAM).read_byte(page_offset + offset);
SLOG1(("dma read word at offset %x+%03x = %04x", page_offset, offset , data)); SLOG1(("dma read word at offset %x+%03x = %04x", page_offset, offset , data));
// FIXME: MSB will get lost // FIXME: MSB will get lost
@ -505,7 +505,7 @@ WRITE8_MEMBER(apollo_state::apollo_dma_write_word){
offset = (offset << 1) & 0x3ff; offset = (offset << 1) & 0x3ff;
} }
machine().firstcpu->space(AS_PROGRAM).write_byte(page_offset + offset, data); m_maincpu->space(AS_PROGRAM).write_byte(page_offset + offset, data);
SLOG1(("dma write word at offset %x+%03x = %02x", page_offset, offset, data)); SLOG1(("dma write word at offset %x+%03x = %02x", page_offset, offset, data));
} }
@ -1293,11 +1293,11 @@ SLOT_INTERFACE_END
void apollo_state::fdc_interrupt(bool state) { void apollo_state::fdc_interrupt(bool state) {
apollo_pic_set_irq_line( machine().firstcpu, APOLLO_IRQ_FDC, state ? ASSERT_LINE : CLEAR_LINE); apollo_pic_set_irq_line( m_maincpu, APOLLO_IRQ_FDC, state ? ASSERT_LINE : CLEAR_LINE);
} }
void apollo_state::fdc_dma_drq(bool state) { void apollo_state::fdc_dma_drq(bool state) {
apollo_dma_fdc_drq(machine().firstcpu, state); apollo_dma_fdc_drq(m_maincpu, state);
} }
/*************************************************************************** /***************************************************************************
@ -1306,7 +1306,7 @@ void apollo_state::fdc_dma_drq(bool state) {
static void apollo_3c505_set_irq(device_t *device, int state) { static void apollo_3c505_set_irq(device_t *device, int state) {
// DLOG2(("apollo_3c505_interrupt: state=%x", state )); // DLOG2(("apollo_3c505_interrupt: state=%x", state ));
apollo_pic_set_irq_line(device->machine().firstcpu, APOLLO_IRQ_ETH1, state); apollo_pic_set_irq_line(device->machine().driver_data<apollo_state>()->m_maincpu, APOLLO_IRQ_ETH1, state);
} }
static int apollo_3c505_tx_data(device_t *device, static int apollo_3c505_tx_data(device_t *device,
@ -1350,7 +1350,7 @@ static THREECOM3C505_INTERFACE(apollo_3c505_config) = {
static void apollo_wdc_set_irq(const running_machine *machine, int state) { static void apollo_wdc_set_irq(const running_machine *machine, int state) {
// FIXME: // FIXME:
// MLOG2(("apollo_wdc_set_irq: state=%x", state )); // MLOG2(("apollo_wdc_set_irq: state=%x", state ));
apollo_pic_set_irq_line(machine->firstcpu, APOLLO_IRQ_WIN1, state); apollo_pic_set_irq_line(machine->driver_data<apollo_state>()->m_maincpu, APOLLO_IRQ_WIN1, state);
} }
static const omti8621_config apollo_wdc_config = { static const omti8621_config apollo_wdc_config = {
@ -1363,13 +1363,13 @@ static const omti8621_config apollo_wdc_config = {
static void apollo_ctape_set_irq(const device_t *device, int state) { static void apollo_ctape_set_irq(const device_t *device, int state) {
DLOG2(("apollo_ctape_set_irq: state=%x", state )); DLOG2(("apollo_ctape_set_irq: state=%x", state ));
apollo_pic_set_irq_line(device->machine().firstcpu, APOLLO_IRQ_CTAPE, state); apollo_pic_set_irq_line(device->machine().driver_data<apollo_state>()->m_maincpu, APOLLO_IRQ_CTAPE, state);
} }
static void apollo_ctape_dma_drq(const device_t *device, int state) { static void apollo_ctape_dma_drq(const device_t *device, int state) {
DLOG2(("apollo_ctape_dma_drq: state=%x", state )); DLOG2(("apollo_ctape_dma_drq: state=%x", state ));
apollo_dma_ctape_drq(device->machine().firstcpu, state); apollo_dma_ctape_drq(device->machine().driver_data<apollo_state>()->m_maincpu, state);
} }
static const sc499_interface apollo_ctape_config = { static const sc499_interface apollo_ctape_config = {

8
src/mess/machine/cbm_snqk.c
View File

@ -23,7 +23,7 @@
int general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size, int general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size,
address_space &space, offs_t offset, void (*cbm_sethiaddress)(running_machine &machine, UINT16 hiaddress) ) address_space &space, offs_t offset, void (*cbm_sethiaddress)(address_space &space, UINT16 hiaddress) )
{ {
char buffer[7]; char buffer[7];
UINT8 *data = NULL; UINT8 *data = NULL;
@ -80,7 +80,7 @@ int general_cbm_loadsnap( device_image_interface &image, const char *file_type,
for (i = 0; i < snapshot_size; i++) for (i = 0; i < snapshot_size; i++)
space.write_byte(address + i + offset, data[i]); space.write_byte(address + i + offset, data[i]);
cbm_sethiaddress(image.device().machine(), address + snapshot_size); cbm_sethiaddress(space, address + snapshot_size);
free(data); free(data);
return IMAGE_INIT_PASS; return IMAGE_INIT_PASS;
@ -90,10 +90,8 @@ error:
return IMAGE_INIT_FAIL; return IMAGE_INIT_FAIL;
} }
void cbm_quick_sethiaddress( running_machine &machine, UINT16 hiaddress ) void cbm_quick_sethiaddress( address_space &space, UINT16 hiaddress )
{ {
address_space &space = machine.firstcpu->space(AS_PROGRAM);
space.write_byte(0x31, hiaddress & 0xff); space.write_byte(0x31, hiaddress & 0xff);
space.write_byte(0x2f, hiaddress & 0xff); space.write_byte(0x2f, hiaddress & 0xff);
space.write_byte(0x2d, hiaddress & 0xff); space.write_byte(0x2d, hiaddress & 0xff);

4
src/mess/machine/cbm_snqk.h
View File

@ -12,8 +12,8 @@
#define CBM_QUICKLOAD_DELAY_SECONDS 3 #define CBM_QUICKLOAD_DELAY_SECONDS 3
int general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size, int general_cbm_loadsnap( device_image_interface &image, const char *file_type, int snapshot_size,
address_space &space, offs_t offset, void (*cbm_sethiaddress)(running_machine &machine, UINT16 hiaddress) ); address_space &space, offs_t offset, void (*cbm_sethiaddress)(address_space &space, UINT16 hiaddress) );
void cbm_quick_sethiaddress( running_machine &machine, UINT16 hiaddress ); void cbm_quick_sethiaddress( address_space &space, UINT16 hiaddress );
#endif /* __CBM_SNQK_H__ */ #endif /* __CBM_SNQK_H__ */

12
src/mess/machine/pc.c
View File

@ -229,19 +229,19 @@ static emu_timer *pc_int_delay_timer;
TIMER_CALLBACK_MEMBER(pc_state::pcjr_delayed_pic8259_irq) TIMER_CALLBACK_MEMBER(pc_state::pcjr_delayed_pic8259_irq)
{ {
machine().firstcpu->set_input_line(0, param ? ASSERT_LINE : CLEAR_LINE); m_maincpu->set_input_line(0, param ? ASSERT_LINE : CLEAR_LINE);
} }
WRITE_LINE_MEMBER(pc_state::pcjr_pic8259_set_int_line) WRITE_LINE_MEMBER(pc_state::pcjr_pic8259_set_int_line)
{ {
UINT32 pc = machine().firstcpu->pc(); UINT32 pc = m_maincpu->pc();
if ( (pc == 0xF0453) || (pc == 0xFF196) ) if ( (pc == 0xF0453) || (pc == 0xFF196) )
{ {
pc_int_delay_timer->adjust( machine().firstcpu->cycles_to_attotime(20), state ); pc_int_delay_timer->adjust( m_maincpu->cycles_to_attotime(20), state );
} }
else else
{ {
machine().firstcpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); m_maincpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
} }
} }
@ -457,7 +457,7 @@ static struct {
READ8_MEMBER(pc_state::pcjr_nmi_enable_r) READ8_MEMBER(pc_state::pcjr_nmi_enable_r)
{ {
pcjr_keyb.latch = 0; pcjr_keyb.latch = 0;
machine().firstcpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
return nmi_enabled; return nmi_enabled;
} }
@ -511,7 +511,7 @@ static void pcjr_set_keyb_int(running_machine &machine, int state)
pcjr_keyb.latch = 1; pcjr_keyb.latch = 1;
} }
machine.firstcpu->set_input_line(INPUT_LINE_NMI, pcjr_keyb.latch && nmi_enabled); drvstate->m_maincpu->set_input_line(INPUT_LINE_NMI, pcjr_keyb.latch && nmi_enabled);
} }

12
src/mess/video/poisk1.c
View File

@ -43,7 +43,7 @@ READ8_MEMBER(p1_state::p1_trap_r)
UINT8 data = m_video.trap[offset]; UINT8 data = m_video.trap[offset];
DBG_LOG(1,"trap",("R %.2x $%02x\n", 0x28+offset, data)); DBG_LOG(1,"trap",("R %.2x $%02x\n", 0x28+offset, data));
if (offset == 0) if (offset == 0)
space.machine().firstcpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
return data; return data;
} }
@ -54,7 +54,7 @@ WRITE8_MEMBER(p1_state::p1_trap_w)
READ8_MEMBER(p1_state::p1_cga_r) READ8_MEMBER(p1_state::p1_cga_r)
{ {
space.machine().firstcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
return 0; return 0;
} }
@ -66,7 +66,7 @@ WRITE8_MEMBER(p1_state::p1_cga_w)
m_video.trap[2] = data; m_video.trap[2] = data;
m_video.trap[1] = 0xC0 | ((port >> 8) & 0x3f); m_video.trap[1] = 0xC0 | ((port >> 8) & 0x3f);
m_video.trap[0] = port & 255; m_video.trap[0] = port & 255;
space.machine().firstcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
} }
WRITE8_MEMBER(p1_state::p1_vram_w) WRITE8_MEMBER(p1_state::p1_vram_w)
@ -77,7 +77,7 @@ WRITE8_MEMBER(p1_state::p1_vram_w)
m_video.trap[2] = data; m_video.trap[2] = data;
m_video.trap[1] = 0x80 | ((offset >> 8) & 0x3f); m_video.trap[1] = 0x80 | ((offset >> 8) & 0x3f);
m_video.trap[0] = offset & 255; m_video.trap[0] = offset & 255;
space.machine().firstcpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE); m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
} }
// CGA emulator // CGA emulator
@ -92,7 +92,7 @@ WRITE8_MEMBER(p1_state::p1_vram_w)
WRITE8_MEMBER(p1_state::p1_ppi2_porta_w) WRITE8_MEMBER(p1_state::p1_ppi2_porta_w)
{ {
address_space &space_prg = machine().firstcpu->space(AS_PROGRAM); address_space &space_prg = m_maincpu->space(AS_PROGRAM);
rectangle visarea; rectangle visarea;
DBG_LOG(1,"color_select_68",("W $%02x\n", data)); DBG_LOG(1,"color_select_68",("W $%02x\n", data));
@ -283,7 +283,7 @@ void p1_state::palette_init()
void p1_state::video_start() void p1_state::video_start()
{ {
address_space &space = machine().firstcpu->space( AS_PROGRAM ); address_space &space = m_maincpu->space( AS_PROGRAM );
DBG_LOG(0,"init",("video_start()\n")); DBG_LOG(0,"init",("video_start()\n"));