diff options
author | 2013-04-15 13:41:27 +0000 | |
---|---|---|
committer | 2013-04-15 13:41:27 +0000 | |
commit | 28cc0d1c7d3c7ea351041530246af5024276a80c (patch) | |
tree | 95cf6860e0377da301c1ac7b1b7dae0e6f75abd4 /src/mess/machine/primo.c | |
parent | 5a9bf9269c094466678e36607fffc77b4ecf7476 (diff) |
various cpu lookup cleanup (nw)
Diffstat (limited to 'src/mess/machine/primo.c')
-rw-r--r-- | src/mess/machine/primo.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/mess/machine/primo.c b/src/mess/machine/primo.c index bbb9eaef8ea..f702b348308 100644 --- a/src/mess/machine/primo.c +++ b/src/mess/machine/primo.c @@ -46,7 +46,7 @@ INTERRUPT_GEN_MEMBER(primo_state::primo_vblank_interrupt) static void primo_update_memory(running_machine &machine) { primo_state *state = machine.driver_data<primo_state>(); - address_space& space = machine.device("maincpu")->memory().space(AS_PROGRAM); + address_space& space = state->m_maincpu->space(AS_PROGRAM); switch (state->m_port_FD & 0x03) { case 0x00: /* Original ROM */ @@ -269,20 +269,20 @@ static void primo_setup_pss (running_machine &machine, UINT8* snapshot_data, UIN /* Z80 registers */ - machine.device("maincpu")->state().set_state_int(Z80_BC, snapshot_data[4] + snapshot_data[5]*256); - machine.device("maincpu")->state().set_state_int(Z80_DE, snapshot_data[6] + snapshot_data[7]*256); - machine.device("maincpu")->state().set_state_int(Z80_HL, snapshot_data[8] + snapshot_data[9]*256); - machine.device("maincpu")->state().set_state_int(Z80_AF, snapshot_data[10] + snapshot_data[11]*256); - machine.device("maincpu")->state().set_state_int(Z80_BC2, snapshot_data[12] + snapshot_data[13]*256); - machine.device("maincpu")->state().set_state_int(Z80_DE2, snapshot_data[14] + snapshot_data[15]*256); - machine.device("maincpu")->state().set_state_int(Z80_HL2, snapshot_data[16] + snapshot_data[17]*256); - machine.device("maincpu")->state().set_state_int(Z80_AF2, snapshot_data[18] + snapshot_data[19]*256); - machine.device("maincpu")->state().set_state_int(Z80_PC, snapshot_data[20] + snapshot_data[21]*256); - machine.device("maincpu")->state().set_state_int(Z80_SP, snapshot_data[22] + snapshot_data[23]*256); - machine.device("maincpu")->state().set_state_int(Z80_I, snapshot_data[24]); - machine.device("maincpu")->state().set_state_int(Z80_R, snapshot_data[25]); - machine.device("maincpu")->state().set_state_int(Z80_IX, snapshot_data[26] + snapshot_data[27]*256); - machine.device("maincpu")->state().set_state_int(Z80_IY, snapshot_data[28] + snapshot_data[29]*256); + state->m_maincpu->set_state_int(Z80_BC, snapshot_data[4] + snapshot_data[5]*256); + state->m_maincpu->set_state_int(Z80_DE, snapshot_data[6] + snapshot_data[7]*256); + state->m_maincpu->set_state_int(Z80_HL, snapshot_data[8] + snapshot_data[9]*256); + state->m_maincpu->set_state_int(Z80_AF, snapshot_data[10] + snapshot_data[11]*256); + state->m_maincpu->set_state_int(Z80_BC2, snapshot_data[12] + snapshot_data[13]*256); + state->m_maincpu->set_state_int(Z80_DE2, snapshot_data[14] + snapshot_data[15]*256); + state->m_maincpu->set_state_int(Z80_HL2, snapshot_data[16] + snapshot_data[17]*256); + state->m_maincpu->set_state_int(Z80_AF2, snapshot_data[18] + snapshot_data[19]*256); + state->m_maincpu->set_state_int(Z80_PC, snapshot_data[20] + snapshot_data[21]*256); + state->m_maincpu->set_state_int(Z80_SP, snapshot_data[22] + snapshot_data[23]*256); + state->m_maincpu->set_state_int(Z80_I, snapshot_data[24]); + state->m_maincpu->set_state_int(Z80_R, snapshot_data[25]); + state->m_maincpu->set_state_int(Z80_IX, snapshot_data[26] + snapshot_data[27]*256); + state->m_maincpu->set_state_int(Z80_IY, snapshot_data[28] + snapshot_data[29]*256); /* IO ports */ @@ -297,7 +297,7 @@ static void primo_setup_pss (running_machine &machine, UINT8* snapshot_data, UIN /* memory */ for (i=0; i<0xc000; i++) - machine.device("maincpu")->memory().space(AS_PROGRAM).write_byte( i+0x4000, snapshot_data[i+38]); + state->m_maincpu->space(AS_PROGRAM).write_byte( i+0x4000, snapshot_data[i+38]); } SNAPSHOT_LOAD( primo ) @@ -336,6 +336,8 @@ static void primo_setup_pp (running_machine &machine,UINT8* quickload_data, UINT { int i; + primo_state *state = machine.driver_data<primo_state>(); + UINT16 load_addr; UINT16 start_addr; @@ -343,9 +345,9 @@ static void primo_setup_pp (running_machine &machine,UINT8* quickload_data, UINT start_addr = quickload_data[2] + quickload_data[3]*256; for (i=4; i<quickload_size; i++) - machine.device("maincpu")->memory().space(AS_PROGRAM).write_byte(start_addr+i-4, quickload_data[i]); + state->m_maincpu->space(AS_PROGRAM).write_byte(start_addr+i-4, quickload_data[i]); - machine.device("maincpu")->state().set_state_int(Z80_PC, start_addr); + state->m_maincpu->set_state_int(Z80_PC, start_addr); logerror ("Quickload .pp l: %04x r: %04x s: %04x\n", load_addr, start_addr, quickload_size-4); } |