Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-19 20:29:09 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

This patch replaces the Machine parameter where an running_machine *

Browse Source 
is available and removes the deprecat.h where unnecessary.

[Oliver Stoeneberg]
This commit is contained in:
Aaron Giles 2008-11-13 07:23:50 +00:00
parent 4af530d9e8
commit cbd240d0de
77 changed files with 119 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emu/cpu/adsp2100/adsp2100.c
View File

@ -96,7 +96,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "adsp2100.h"
#include <stddef.h>
@ -901,7 +900,7 @@ static CPU_EXIT( adsp21xx )
/* execute instructions on this CPU until icount expires */
static CPU_EXECUTE( adsp21xx )
{
int check_debugger = ((Machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
int check_debugger = ((device->machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
adsp2100_state *adsp = device->token;
CHANGEPC(adsp);
@ -921,7 +920,7 @@ static CPU_EXECUTE( adsp21xx )
/* debugging */
adsp->ppc = adsp->pc; /* copy PC to previous PC */
if (check_debugger)
debugger_instruction_hook(Machine, adsp->pc);
debugger_instruction_hook(device->machine, adsp->pc);
#if TRACK_HOTSPOTS
pcbucket[adsp->pc & 0x3fff]++;

3
src/emu/cpu/apexc/apexc.c
View File

@ -325,7 +325,6 @@ field: X address D Function Y address D (part 2)
#include "cpuintrf.h"
#include "debugger.h"
#include "deprecat.h"
#include "apexc.h"
typedef struct
@ -803,7 +802,7 @@ static CPU_EXECUTE( apexc )
do
{
debugger_instruction_hook(Machine, effective_address(apexc.ml));
debugger_instruction_hook(device->machine, effective_address(apexc.ml));
if (apexc.running)
execute();

3
src/emu/cpu/arm/arm.c
View File

@ -17,7 +17,6 @@
#include "arm.h"
#include "debugger.h"
#include "deprecat.h"
#define READ8(addr) cpu_read8(addr)
#define WRITE8(addr,data) cpu_write8(addr,data)
@ -326,7 +325,7 @@ static CPU_EXECUTE( arm )
arm_icount = cycles;
do
{
debugger_instruction_hook(Machine, R15);
debugger_instruction_hook(device->machine, R15);
/* load instruction */
pc = R15;

2
src/emu/cpu/asap/asap.c
View File

@ -543,7 +543,7 @@ static CPU_EXECUTE( asap )
UPDATEPC();
/* core execution loop */
if ((Machine->debug_flags & DEBUG_FLAG_ENABLED) == 0)
if ((device->machine->debug_flags & DEBUG_FLAG_ENABLED) == 0)
{
do
{

3
src/emu/cpu/ccpu/ccpu.c
View File

@ -9,7 +9,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "ccpu.h"
@ -213,7 +212,7 @@ static CPU_EXECUTE( ccpu )
ccpu.nextmiflag = ccpu.nextnextmiflag;
/* fetch the opcode */
debugger_instruction_hook(Machine, ccpu.PC);
debugger_instruction_hook(device->machine, ccpu.PC);
opcode = READOP(ccpu.PC++);
switch (opcode)

23
src/emu/cpu/cdp1802/cdp1802.c
View File

@ -1,6 +1,5 @@
#include "driver.h"
#include "debugger.h"
#include "deprecat.h"
#include "cdp1802.h"
#define CDP1802_CYCLES_RESET 8
@ -233,7 +232,7 @@ static void cdp1802_run(running_machine *machine)
cdp1802_ICount -= CDP1802_CYCLES_RESET;
debugger_instruction_hook(Machine, cdp1802.r[cdp1802.p]);
debugger_instruction_hook(machine, cdp1802.r[cdp1802.p]);
break;
@ -258,7 +257,7 @@ static void cdp1802_run(running_machine *machine)
cdp1802.state = CDP1802_STATE_0_FETCH;
}
debugger_instruction_hook(Machine, cdp1802.r[cdp1802.p]);
debugger_instruction_hook(machine, cdp1802.r[cdp1802.p]);
break;
@ -735,7 +734,7 @@ static void cdp1802_run(running_machine *machine)
cdp1802.state = CDP1802_STATE_0_FETCH;
}
debugger_instruction_hook(Machine, cdp1802.r[cdp1802.p]);
debugger_instruction_hook(machine, cdp1802.r[cdp1802.p]);
break;
@ -823,7 +822,7 @@ static void cdp1802_run(running_machine *machine)
cdp1802.state = CDP1802_STATE_0_FETCH;
}
debugger_instruction_hook(Machine, cdp1802.r[cdp1802.p]);
debugger_instruction_hook(machine, cdp1802.r[cdp1802.p]);
break;
}
@ -831,12 +830,10 @@ static void cdp1802_run(running_machine *machine)
static CPU_EXECUTE( cdp1802 )
{
running_machine *machine = Machine;
cdp1802_ICount = cycles;
cdp1802.prevmode = cdp1802.mode;
cdp1802.mode = cdp1802.intf->mode_r(machine);
cdp1802.mode = cdp1802.intf->mode_r(device->machine);
do
{
@ -846,12 +843,12 @@ static CPU_EXECUTE( cdp1802 )
I = 0;
N = 0;
cdp1802.state = CDP1802_STATE_1_EXECUTE;
cdp1802_run(machine);
cdp1802_run(device->machine);
break;
case CDP1802_MODE_RESET:
cdp1802.state = CDP1802_STATE_1_RESET;
cdp1802_run(machine);
cdp1802_run(device->machine);
break;
case CDP1802_MODE_PAUSE:
@ -869,17 +866,17 @@ static CPU_EXECUTE( cdp1802 )
case CDP1802_MODE_RESET:
cdp1802.prevmode = CDP1802_MODE_RUN;
cdp1802.state = CDP1802_STATE_1_INIT;
cdp1802_run(machine);
cdp1802_run(device->machine);
break;
case CDP1802_MODE_PAUSE:
cdp1802.prevmode = CDP1802_MODE_RUN;
cdp1802.state = CDP1802_STATE_0_FETCH;
cdp1802_run(machine);
cdp1802_run(device->machine);
break;
case CDP1802_MODE_RUN:
cdp1802_run(machine);
cdp1802_run(device->machine);
break;
}
break;

3
src/emu/cpu/cop400/cop410.c
View File

@ -23,7 +23,6 @@
#include "driver.h"
#include "cpuintrf.h"
#include "debugger.h"
#include "deprecat.h"
#include "cop400.h"
/* The opcode table now is a combination of cycle counts and function pointers */
@ -315,7 +314,7 @@ static CPU_EXECUTE( cop410 )
{
prevPC = PC;
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
if (R.intf->cko == COP400_CKO_HALT_IO_PORT)
{

3
src/emu/cpu/cop400/cop420.c
View File

@ -26,7 +26,6 @@
#include "cpuintrf.h"
#include "debugger.h"
#include "deprecat.h"
#include "cop400.h"
/* The opcode table now is a combination of cycle counts and function pointers */
@ -453,7 +452,7 @@ static CPU_EXECUTE( cop420 )
{
prevPC = PC;
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
opcode = ROM(PC);

5
src/emu/cpu/cp1610/cp1610.c
View File

@ -23,7 +23,6 @@
#include "cpuexec.h"
#include "debugger.h"
#include "deprecat.h"
#include "cp1610.h"
#define S 0x80
@ -1551,7 +1550,7 @@ static void cp1610_xori(int d)
static CPU_RESET( cp1610 )
{
/* This is how we set the reset vector */
cpu_set_input_line(Machine->activecpu, CP1610_RESET, PULSE_LINE);
cpu_set_input_line(device->machine->activecpu, CP1610_RESET, PULSE_LINE);
}
/***************************************************
@ -2168,7 +2167,7 @@ static CPU_EXECUTE( cp1610 )
do
{
debugger_instruction_hook(Machine, cp1610.r[7]);
debugger_instruction_hook(device->machine, cp1610.r[7]);
cp1610.mask_interrupts = 0;

14
src/emu/cpu/cubeqcpu/cubeqcpu.c
View File

@ -342,7 +342,7 @@ static CPU_INIT( cquestsnd )
memset(&cquestsnd, 0, sizeof(cquestsnd));
cquestsnd.dac_w = _config->dac_w;
cquestsnd.sound_data = (UINT16*)memory_region(Machine, _config->sound_data_region);
cquestsnd.sound_data = (UINT16*)memory_region(device->machine, _config->sound_data_region);
/* Allocate RAM shared with 68000 */
cquestsnd.sram = malloc(4096);
@ -541,7 +541,7 @@ static int do_sndjmp(int jmp)
static CPU_EXECUTE( cquestsnd )
{
int calldebugger = ((Machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
int calldebugger = ((device->machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
cquestsnd_icount = cycles;
@ -571,7 +571,7 @@ static CPU_EXECUTE( cquestsnd )
int _rin = (inslow >> 26) & 1;
if (calldebugger)
debugger_instruction_hook(Machine, cquestsnd.pc);
debugger_instruction_hook(device->machine, cquestsnd.pc);
/* Don't think this matters, but just in case */
if (rtn)
@ -875,7 +875,7 @@ INLINE int do_rotjmp(int jmp)
static CPU_EXECUTE( cquestrot )
{
int calldebugger = ((Machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
int calldebugger = ((device->machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
cquestrot_icount = cycles;
@ -907,7 +907,7 @@ static CPU_EXECUTE( cquestrot )
UINT16 data_in = 0xffff;
if (calldebugger)
debugger_instruction_hook(Machine, ROT_PC);
debugger_instruction_hook(device->machine, ROT_PC);
/* Handle DRAM accesses - I ought to check this... */
if (!(cquestrot.clkcnt & 3))
@ -1381,7 +1381,7 @@ static CPU_EXECUTE( cquestlin )
{
#define LINE_PC ((cquestlin.pc[prog] & 0x7f) | ((prog == BACKGROUND) ? 0x80 : 0))
int calldebugger = ((Machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
int calldebugger = ((device->machine->debug_flags & DEBUG_FLAG_ENABLED) != 0);
UINT32 *stack_ram;
UINT8 *ptr_ram;
@ -1426,7 +1426,7 @@ static CPU_EXECUTE( cquestlin )
UINT16 data_in = 0;
if (calldebugger)
debugger_instruction_hook(Machine, cquestlin.pc[prog]);
debugger_instruction_hook(device->machine, cquestlin.pc[prog]);
/* Handle accesses to and from shared SRAM */
if (prog == FOREGROUND)

2
src/emu/cpu/e132xs/e132xs.c
View File

@ -4765,7 +4765,7 @@ static CPU_EXECUTE( hyperstone )
UINT16 opcode;
PPC = PC; /* copy PC to previous PC */
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
opcode = READ_OP(PC);
PC += 2;

3
src/emu/cpu/f8/f8.c
View File

@ -27,7 +27,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "f8.h"
#define S 0x01
@ -1578,7 +1577,7 @@ static CPU_EXECUTE( f8 )
do
{
UINT8 op=f8.dbus;
debugger_instruction_hook(Machine, (f8.pc0 - 1) & 0xffff);
debugger_instruction_hook(device->machine, (f8.pc0 - 1) & 0xffff);
switch( op )
{

2
src/emu/cpu/g65816/g65816.c
View File

@ -356,7 +356,7 @@ static CPU_INIT( g65816 )
state_save_register_item("G65816", index, g65816i_cpu.irq_delay);
state_save_register_item("G65816", index, g65816i_cpu.stopped);
state_save_register_postload(Machine, g65816_restore_state, NULL);
state_save_register_postload(device->machine, g65816_restore_state, NULL);
}
/**************************************************************************

2
src/emu/cpu/h6280/h6280.c
View File

@ -248,7 +248,7 @@ static CPU_EXECUTE( h6280 )
CHANGE_PC;
h6280.ppc = h6280.pc;
debugger_instruction_hook(Machine, PCW);
debugger_instruction_hook(device->machine, PCW);
/* Execute 1 instruction */
in=RDOP();

5
src/emu/cpu/h83002/h83002.c
View File

@ -31,7 +31,6 @@
****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "h83002.h"
#include "h8priv.h"
@ -339,7 +338,7 @@ static CPU_INIT( h8 )
state_save_register_item("H8/3002", index, h8.h8TSTR);
state_save_register_item_array("H8/3002", index, h8.h8TCNT);
state_save_register_postload(Machine, h8_onstateload, NULL);
state_save_register_postload(device->machine, h8_onstateload, NULL);
h8_itu_init();
}
@ -474,7 +473,7 @@ static CPU_EXECUTE( h8 )
{
h8.ppc = h8.pc;
debugger_instruction_hook(Machine, h8.pc);
debugger_instruction_hook(device->machine, h8.pc);
opcode = cpu_readop16(h8.pc);
// mame_printf_debug("[%06x]: %04x => %x\n", h8.pc, opcode, (opcode>>12)&0xf);

7
src/emu/cpu/hd6309/hd6309.c
View File

@ -103,7 +103,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "hd6309.h"
#define VERBOSE 0
@ -532,7 +531,7 @@ static CPU_INIT( hd6309 )
state_save_register_item("hd6309", index, DP);
state_save_register_item("hd6309", index, CC);
state_save_register_item("hd6309", index, MD);
state_save_register_postload(Machine, hd6309_postload, NULL);
state_save_register_postload(device->machine, hd6309_postload, NULL);
state_save_register_item("hd6309", index, hd6309.int_state);
state_save_register_item("hd6309", index, hd6309.nmi_state);
state_save_register_item("hd6309", index, hd6309.irq_state[0]);
@ -632,7 +631,7 @@ static CPU_EXECUTE( hd6309 ) /* NS 970908 */
if (hd6309.int_state & (HD6309_CWAI | HD6309_SYNC))
{
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
hd6309_ICount = 0;
}
else
@ -641,7 +640,7 @@ static CPU_EXECUTE( hd6309 ) /* NS 970908 */
{
pPPC = pPC;
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
hd6309.ireg = ROP(PCD);
PC++;

5
src/emu/cpu/i386/i386.c
View File

@ -11,7 +11,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "i386.h"
#include "i386intf.h"
@ -579,7 +578,7 @@ static CPU_INIT( i386 )
state_save_register_item(state_type, index, I.ldtr.flags);
state_save_register_item(state_type, index, I.irq_state);
state_save_register_item(state_type, index, I.performed_intersegment_jump);
state_save_register_postload(Machine, i386_postload, NULL);
state_save_register_postload(device->machine, i386_postload, NULL);
}
static void build_opcode_table(UINT32 features)
@ -716,7 +715,7 @@ static CPU_EXECUTE( i386 )
I.segment_prefix = 0;
I.prev_eip = I.eip;
debugger_instruction_hook(Machine, I.pc);
debugger_instruction_hook(device->machine, I.pc);
i386_check_irq_line();
I386OP(decode_opcode)();

3
src/emu/cpu/i8085/i8085.c
View File

@ -125,7 +125,6 @@
/*int survival_prot = 0; */
#include "debugger.h"
#include "deprecat.h"
#include "i8085.h"
#include "i8085cpu.h"
#include "i8085daa.h"
@ -1308,7 +1307,7 @@ static CPU_EXECUTE( i8085 )
i8085_ICount = cycles;
do
{
debugger_instruction_hook(Machine, I.PC.d);
debugger_instruction_hook(device->machine, I.PC.d);
/* interrupts enabled or TRAP pending ? */
if ( (I.IM & IM_IEN) || (I.IREQ & IM_TRAP) )
{

3
src/emu/cpu/i86/i286.c
View File

@ -4,7 +4,6 @@
****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "host.h"
@ -227,7 +226,7 @@ static CPU_EXECUTE( i80286 )
while(i80286_ICount>0)
{
LOG(("[%04x:%04x]=%02x\tF:%04x\tAX=%04x\tBX=%04x\tCX=%04x\tDX=%04x %d%d%d%d%d%d%d%d%d\n",I.sregs[CS],I.pc - I.base[CS],ReadByte(I.pc),I.flags,I.regs.w[AX],I.regs.w[BX],I.regs.w[CX],I.regs.w[DX], I.AuxVal?1:0, I.OverVal?1:0, I.SignVal?1:0, I.ZeroVal?1:0, I.CarryVal?1:0, I.ParityVal?1:0,I.TF, I.IF, I.DirVal<0?1:0));
debugger_instruction_hook(Machine, I.pc);
debugger_instruction_hook(device->machine, I.pc);
seg_prefix=FALSE;
I.prevpc = I.pc;

5
src/emu/cpu/i86/i86.c
View File

@ -5,7 +5,6 @@
/* 26.March 2000 PeT changed set_irq_line */
#include "debugger.h"
#include "deprecat.h"
#include "cpuintrf.h"
#include "host.h"
@ -248,7 +247,7 @@ static CPU_EXECUTE( i8086 )
LOG(("[%04x:%04x]=%02x\tF:%04x\tAX=%04x\tBX=%04x\tCX=%04x\tDX=%04x %d%d%d%d%d%d%d%d%d\n",
I.sregs[CS], I.pc - I.base[CS], ReadByte(I.pc), I.flags, I.regs.w[AX], I.regs.w[BX], I.regs.w[CX], I.regs.w[DX], I.AuxVal ? 1 : 0, I.OverVal ? 1 : 0,
I.SignVal ? 1 : 0, I.ZeroVal ? 1 : 0, I.CarryVal ? 1 : 0, I.ParityVal ? 1 : 0, I.TF, I.IF, I.DirVal < 0 ? 1 : 0));
debugger_instruction_hook(Machine, I.pc);
debugger_instruction_hook(device->machine, I.pc);
seg_prefix = FALSE;
I.prevpc = I.pc;
@ -301,7 +300,7 @@ static CPU_EXECUTE( i80186 )
{
LOG(("[%04x:%04x]=%02x\tAX=%04x\tBX=%04x\tCX=%04x\tDX=%04x\n", I.sregs[CS], I.pc, ReadByte(I.pc), I.regs.w[AX],
I.regs.w[BX], I.regs.w[CX], I.regs.w[DX]));
debugger_instruction_hook(Machine, I.pc);
debugger_instruction_hook(device->machine, I.pc);
seg_prefix = FALSE;
I.prevpc = I.pc;

3
src/emu/cpu/i8x41/i8x41.c
View File

@ -115,7 +115,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "i8x41.h"
typedef struct _upi41_state_t upi41_state_t;
@ -924,7 +923,7 @@ static CPU_EXECUTE( i8x41 )
PPC = PC;
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
PC += 1;
upi41_state->icount -= i8x41_cycles[op];

3
src/emu/cpu/i960/i960.c
View File

@ -1,5 +1,4 @@
#include "debugger.h"
#include "deprecat.h"
#include "i960.h"
#include "i960dis.h"
#include <math.h>
@ -1959,7 +1958,7 @@ static CPU_EXECUTE( i960 )
check_irqs(i960_state);
while(i960_state->icount >= 0) {
i960_state->PIP = i960_state->IP;
debugger_instruction_hook(Machine, i960_state->IP);
debugger_instruction_hook(device->machine, i960_state->IP);
i960_state->bursting = 0;

4
src/emu/cpu/jaguar/jaguar.c
View File

@ -527,7 +527,7 @@ static CPU_EXECUTE( jaguargpu )
/* debugging */
//if (jaguar.PC < 0xf03000 || jaguar.PC > 0xf04000) { fatalerror("GPU: jaguar.PC = %06X (ppc = %06X)", jaguar.PC, jaguar.ppc); }
jaguar.ppc = jaguar.PC;
debugger_instruction_hook(Machine, jaguar.PC);
debugger_instruction_hook(device->machine, jaguar.PC);
/* instruction fetch */
jaguar.op = ROPCODE(jaguar.PC);
@ -573,7 +573,7 @@ static CPU_EXECUTE( jaguardsp )
/* debugging */
//if (jaguar.PC < 0xf1b000 || jaguar.PC > 0xf1d000) { fatalerror(stderr, "DSP: jaguar.PC = %06X", jaguar.PC); }
jaguar.ppc = jaguar.PC;
debugger_instruction_hook(Machine, jaguar.PC);
debugger_instruction_hook(device->machine, jaguar.PC);
/* instruction fetch */
jaguar.op = ROPCODE(jaguar.PC);

3
src/emu/cpu/konami/konami.c
View File

@ -35,7 +35,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "konami.h"
#define VERBOSE 0
@ -499,7 +498,7 @@ static CPU_EXECUTE( konami )
{
pPPC = pPC;
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
konami.ireg = ROP(PCD);
PC++;

3
src/emu/cpu/lh5801/lh5801.c
View File

@ -18,7 +18,6 @@
*
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "lh5801.h"
@ -133,7 +132,7 @@ static CPU_EXECUTE( lh5801 )
{
lh5801.oldpc = P;
debugger_instruction_hook(Machine, P);
debugger_instruction_hook(device->machine, P);
lh5801_instruction();
} while (lh5801_icount > 0);

3
src/emu/cpu/lr35902/lr35902.c
View File

@ -37,7 +37,6 @@
/** **/
/*************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "lr35902.h"
#define FLAG_Z 0x80
@ -309,7 +308,7 @@ static CPU_EXECUTE( lr35902 )
} else {
/* Fetch and count cycles */
lr35902_ProcessInterrupts ();
debugger_instruction_hook(Machine, Regs.w.PC);
debugger_instruction_hook(device->machine, Regs.w.PC);
if ( Regs.w.enable & HALTED ) {
CYCLES_PASSED( Cycles[0x76] );
Regs.w.execution_state = 1;

4
src/emu/cpu/m37710/m37710.c
View File

@ -51,8 +51,8 @@
added save state support.
*/
#include "deprecat.h"
#include "debugger.h"
#include "deprecat.h"
#include "cpuexec.h"
#include "m37710cm.h"
@ -1041,7 +1041,7 @@ static CPU_INIT( m37710 )
state_save_register_item("M377xx", index, m37710i_cpu.reload[7].seconds);
state_save_register_item("M377xx", index, m37710i_cpu.reload[7].attoseconds);
state_save_register_postload(Machine, m37710_restore_state, NULL);
state_save_register_postload(device->machine, m37710_restore_state, NULL);
}
/**************************************************************************

8
src/emu/cpu/m6800/m6800.c
View File

@ -987,7 +987,7 @@ static CPU_EXECUTE( m6800 )
else
{
pPPC = pPC;
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
ireg=M_RDOP(PCD);
PC++;
@ -1337,7 +1337,7 @@ static CPU_EXECUTE( m6803 )
else
{
pPPC = pPC;
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
ireg=M_RDOP(PCD);
PC++;
@ -1679,7 +1679,7 @@ static CPU_EXECUTE( hd63701 )
else
{
pPPC = pPC;
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
ireg=M_RDOP(PCD);
PC++;
@ -2011,7 +2011,7 @@ static CPU_EXECUTE( nsc8105 )
else
{
pPPC = pPC;
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
ireg=M_RDOP(PCD);
PC++;

3
src/emu/cpu/m6805/m6805.c
View File

@ -32,7 +32,6 @@
#include "debugger.h"
#include "deprecat.h"
#include "m6805.h"
#define IRQ_LEVEL_DETECT 0
@ -530,7 +529,7 @@ static CPU_EXECUTE( m6805 )
}
}
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
ireg=M_RDOP(PC++);

5
src/emu/cpu/m6809/m6809.c
View File

@ -71,7 +71,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "m6809.h"
/* Enable big switch statement for the main opcodes */
@ -521,7 +520,7 @@ static CPU_EXECUTE( m6809 ) /* NS 970908 */
if (m6809.int_state & (M6809_CWAI | M6809_SYNC))
{
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
m6809_ICount = 0;
}
else
@ -530,7 +529,7 @@ static CPU_EXECUTE( m6809 ) /* NS 970908 */
{
pPPC = pPC;
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
m6809.ireg = ROP(PCD);
PC++;

5
src/emu/cpu/mb86233/mb86233.c
View File

@ -15,7 +15,6 @@
#include "mb86233.h"
#include "debugger.h"
#include "deprecat.h"
/***************************************************************************
STRUCTURES & TYPEDEFS
@ -134,7 +133,7 @@ static CPU_INIT( mb86233 )
memset( mb86233.RAM, 0, 2 * 0x200 * sizeof(UINT32) );
mb86233.ARAM = &mb86233.RAM[0];
mb86233.BRAM = &mb86233.RAM[0x200];
mb86233.Tables = (UINT32*) memory_region(Machine, _config->tablergn);
mb86233.Tables = (UINT32*) memory_region(device->machine, _config->tablergn);
state_save_register_global_pointer(mb86233.RAM,2 * 0x200 * sizeof(UINT32));
}
@ -974,7 +973,7 @@ static CPU_EXECUTE( mb86233 )
UINT32 val;
UINT32 opcode;
debugger_instruction_hook(Machine, GETPC());
debugger_instruction_hook(device->machine, GETPC());
opcode = ROPCODE(GETPC());

3
src/emu/cpu/mb88xx/mb88xx.c
View File

@ -14,7 +14,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "mb88xx.h"
/***************************************************************************
@ -239,7 +238,7 @@ static CPU_EXECUTE( mb88 )
UINT8 opcode, arg, oc;
/* fetch the opcode */
debugger_instruction_hook(Machine, GETPC());
debugger_instruction_hook(device->machine, GETPC());
opcode = READOP(GETPC());
/* increment the PC */

3
src/emu/cpu/mc68hc11/mc68hc11.c
View File

@ -5,7 +5,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "mc68hc11.h"
enum
@ -388,7 +387,7 @@ static CPU_EXECUTE( hc11 )
UINT8 op;
hc11.ppc = hc11.pc;
debugger_instruction_hook(Machine, hc11.pc);
debugger_instruction_hook(device->machine, hc11.pc);
op = FETCH();
hc11_optable[op]();

3
src/emu/cpu/mcs48/mcs48.c
View File

@ -41,7 +41,6 @@ T0 output clock
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "mcs48.h"
@ -934,7 +933,7 @@ static CPU_EXECUTE( mcs48 )
{
/* fetch next opcode */
mcs48->prevpc = mcs48->pc;
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
opcode = opcode_fetch(PC++);
/* process opcode and count cycles */

3
src/emu/cpu/mcs51/mcs51.c
View File

@ -138,7 +138,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "mcs51.h"
#define VERBOSE 1
@ -1941,7 +1940,7 @@ static CPU_EXECUTE( mcs51 )
{
/* Read next opcode */
PPC = PC;
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
op = cpu_readop(PC++);
/* process opcode and count cycles */

2
src/emu/cpu/mips/mips3.c
View File

@ -1677,7 +1677,7 @@ CPU_EXECUTE( mips3 )
/* debugging */
mips3.ppc = mips3.core.pc;
debugger_instruction_hook(Machine, mips3.core.pc);
debugger_instruction_hook(device->machine, mips3.core.pc);
/* instruction fetch */
op = ROPCODE(mips3.pcbase | (mips3.core.pc & 0xfff));

4
src/emu/cpu/mips/psx.c
View File

@ -1598,7 +1598,7 @@ static CPU_RESET( mips )
mips_update_memory_handlers();
mips_update_address_masks();
mips_update_scratchpad(Machine);
mips_update_scratchpad(device->machine);
mips_set_cp0r( CP0_SR, SR_BEV );
mips_set_cp0r( CP0_CAUSE, 0x00000000 );
@ -1796,7 +1796,7 @@ static CPU_EXECUTE( mips )
do
{
if (LOG_BIOSCALL) log_bioscall();
debugger_instruction_hook(Machine, mipscpu.pc );
debugger_instruction_hook(device->machine, mipscpu.pc );
mipscpu.op = cpu_readop32( mipscpu.pc );
switch( INS_OP( mipscpu.op ) )

3
src/emu/cpu/mips/r3000.c
View File

@ -7,7 +7,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "r3000.h"
@ -745,7 +744,7 @@ static CPU_EXECUTE( r3000 )
/* debugging */
r3000->ppc = r3000->pc;
debugger_instruction_hook(Machine, r3000->pc);
debugger_instruction_hook(device->machine, r3000->pc);
/* instruction fetch */
op = ROPCODE(r3000->pc);

2
src/emu/cpu/nec/nec.c
View File

@ -1250,7 +1250,7 @@ static CPU_EXECUTE( necv )
if (I.no_interrupt)
I.no_interrupt--;
debugger_instruction_hook(Machine, (I.sregs[PS]<<4) + I.ip);
debugger_instruction_hook(device->machine, (I.sregs[PS]<<4) + I.ip);
prev_ICount = nec_ICount;
nec_instruction[fetchop()]();
do_prefetch(prev_ICount);

2
src/emu/cpu/pdp1/pdp1.c
View File

@ -624,7 +624,7 @@ static CPU_EXECUTE( pdp1 )
do
{
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
/* ioh should be cleared at the end of the instruction cycle, and ios at the

5
src/emu/cpu/pdp1/tx0.c
View File

@ -10,7 +10,6 @@
#include "cpuintrf.h"
#include "debugger.h"
#include "deprecat.h"
#include "tx0.h"
#define LOG 0
@ -183,7 +182,7 @@ static CPU_EXECUTE( tx0_64kw )
do
{
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
if (tx0.ioh && tx0.ios)
@ -291,7 +290,7 @@ static CPU_EXECUTE( tx0_8kw )
do
{
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
if (tx0.ioh && tx0.ios)

5
src/emu/cpu/pic16c5x/pic16c5x.c
View File

@ -54,7 +54,6 @@
#include "debugger.h"
#include "deprecat.h"
#include "pic16c5x.h"
@ -841,7 +840,7 @@ static CPU_EXECUTE( pic16C5x )
if (PD == 0) /* Sleep Mode */
{
inst_cycles = (1*CLK);
debugger_instruction_hook(Machine, R.PC);
debugger_instruction_hook(device->machine, R.PC);
if (WDTE) {
pic16C5x_update_watchdog(1*CLK);
}
@ -850,7 +849,7 @@ static CPU_EXECUTE( pic16C5x )
{
R.PREVPC = R.PC;
debugger_instruction_hook(Machine, R.PC);
debugger_instruction_hook(device->machine, R.PC);
R.opcode.d = M_RDOP(R.PC);
R.PC++;

2
src/emu/cpu/powerpc/ppc403.c
View File

@ -177,7 +177,7 @@ static CPU_EXECUTE( ppc403 )
{
UINT32 opcode;
debugger_instruction_hook(Machine, ppc.pc);
debugger_instruction_hook(device->machine, ppc.pc);
ppc.pc = ppc.npc;
ppc.npc += 4;
opcode = ROPCODE(ppc.pc);

2
src/emu/cpu/powerpc/ppc602.c
View File

@ -252,7 +252,7 @@ static CPU_EXECUTE( ppc602 )
while( ppc_icount > 0 )
{
ppc.pc = ppc.npc;
debugger_instruction_hook(Machine, ppc.pc);
debugger_instruction_hook(device->machine, ppc.pc);
if (MSR & MSR_IR)
opcode = ppc_readop_translated(ppc.pc);

2
src/emu/cpu/powerpc/ppc603.c
View File

@ -260,7 +260,7 @@ static CPU_EXECUTE( ppc603 )
while( ppc_icount > 0 )
{
ppc.pc = ppc.npc;
debugger_instruction_hook(Machine, ppc.pc);
debugger_instruction_hook(device->machine, ppc.pc);
if (MSR & MSR_IR)
opcode = ppc_readop_translated(ppc.pc);

2
src/emu/cpu/rsp/rsp.c
View File

@ -2596,7 +2596,7 @@ static CPU_EXECUTE( rsp )
while (rsp_icount > 0)
{
rsp.ppc = rsp.pc;
debugger_instruction_hook(Machine, rsp.pc);
debugger_instruction_hook(device->machine, rsp.pc);
op = ROPCODE(rsp.pc);
if (rsp.nextpc != ~0)

3
src/emu/cpu/s2650/s2650.c
View File

@ -13,7 +13,6 @@
*************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "s2650.h"
#include "s2650cpu.h"
@ -868,7 +867,7 @@ static CPU_EXECUTE( s2650 )
{
S.ppc = S.page + S.iar;
debugger_instruction_hook(Machine, S.page + S.iar);
debugger_instruction_hook(device->machine, S.page + S.iar);
S.ir = ROP();
S.r = S.ir & 3; /* register / value */

2
src/emu/cpu/saturn/saturn.c
View File

@ -179,7 +179,7 @@ static CPU_EXECUTE( saturn )
{
saturn.oldpc = saturn.pc;
debugger_instruction_hook(Machine, saturn.pc);
debugger_instruction_hook(device->machine, saturn.pc);
if ( saturn.sleeping )
{

3
src/emu/cpu/sc61860/sc61860.c
View File

@ -28,7 +28,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "sc61860.h"
#include "sc.h"
@ -117,7 +116,7 @@ static CPU_EXECUTE( sc61860 )
{
sc61860.oldpc = sc61860.pc;
debugger_instruction_hook(Machine, sc61860.pc);
debugger_instruction_hook(device->machine, sc61860.pc);
sc61860_instruction();

3
src/emu/cpu/se3208/se3208.c
View File

@ -1,5 +1,4 @@
#include "debugger.h"
#include "deprecat.h"
#include "se3208.h"
/*
@ -1772,7 +1771,7 @@ static CPU_EXECUTE( SE3208 )
{
UINT16 Opcode=cpu_readop16(WORD_XOR_LE(Context.PC));
debugger_instruction_hook(Machine, Context.PC);
debugger_instruction_hook(device->machine, Context.PC);
OpTable[Opcode](Opcode);
Context.PPC=Context.PC;

2
src/emu/cpu/sh2/sh2.c
View File

@ -2212,7 +2212,7 @@ static CPU_EXECUTE( sh2 )
else
opcode = cpu_readop16(WORD_XOR_BE((UINT32)(sh2->pc & AM)));
debugger_instruction_hook(Machine, sh2->pc);
debugger_instruction_hook(device->machine, sh2->pc);
sh2->delay = 0;
sh2->pc += 2;

2
src/emu/cpu/sh4/sh4.c
View File

@ -3335,7 +3335,7 @@ static CPU_EXECUTE( sh4 )
else
opcode = cpu_readop16(WORD2_XOR_LE((UINT32)(sh4.pc & AM)));
debugger_instruction_hook(Machine, sh4.pc & AM);
debugger_instruction_hook(device->machine, sh4.pc & AM);
sh4.delay = 0;
sh4.pc += 2;

5
src/emu/cpu/sharc/sharc.c
View File

@ -5,7 +5,6 @@
#include "sharc.h"
#include "debugger.h"
#include "deprecat.h"
static CPU_DISASSEMBLE( sharc );
@ -707,7 +706,7 @@ static CPU_EXECUTE( sharc )
}
sharc_icount = 0;
debugger_instruction_hook(Machine, sharc.daddr);
debugger_instruction_hook(device->machine, sharc.daddr);
return cycles;
}
@ -742,7 +741,7 @@ static CPU_EXECUTE( sharc )
// fetch next instruction
sharc.fetch_opcode = ROPCODE(sharc.faddr);
debugger_instruction_hook(Machine, sharc.pc);
debugger_instruction_hook(device->machine, sharc.pc);
// handle looping
if (sharc.pc == (sharc.laddr & 0xffffff))

3
src/emu/cpu/sm8500/sm8500.c
View File

@ -10,7 +10,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "sm8500.h"
#define FLAG_C 0x80
@ -218,7 +217,7 @@ static CPU_EXECUTE( sm8500 )
UINT32 d1,d2;
UINT32 res;
debugger_instruction_hook(Machine, regs.PC);
debugger_instruction_hook(device->machine, regs.PC);
oldpc = regs.PC;
mycycles = 0;
sm8500_process_interrupts();

3
src/emu/cpu/spc700/spc700.c
View File

@ -62,7 +62,6 @@ Address Function Register R/W When Reset Remarks
#include <limits.h>
#include "debugger.h"
#include "deprecat.h"
#include "spc700.h"
/* ======================================================================== */
@ -1411,7 +1410,7 @@ CPU_EXECUTE( spc700 )
while(CLOCKS > 0)
{
REG_PPC = REG_PC;
debugger_instruction_hook(Machine, REG_PC);
debugger_instruction_hook(device->machine, REG_PC);
REG_PC++;
#if 0

3
src/emu/cpu/ssp1601/ssp1601.c
View File

@ -18,7 +18,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "ssp1601.h"
@ -540,7 +539,7 @@ static CPU_EXECUTE( ssp1601 )
PPC = rPC;
debugger_instruction_hook(Machine, rPC);
debugger_instruction_hook(device->machine, rPC);
op = FETCH();

3
src/emu/cpu/t11/t11.c
View File

@ -12,7 +12,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "t11.h"
@ -400,7 +399,7 @@ static CPU_EXECUTE( t11 )
{
t11.ppc = t11.reg[7]; /* copy PC to previous PC */
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
t11.op = ROPCODE();
(*opcode_table[t11.op >> 3])();

3
src/emu/cpu/tms32010/tms32010.c
View File

@ -54,7 +54,6 @@
#include "debugger.h"
#include "deprecat.h"
#include "tms32010.h"
@ -790,7 +789,7 @@ static CPU_EXECUTE( tms32010 )
R.PREVPC = R.PC;
debugger_instruction_hook(Machine, R.PC);
debugger_instruction_hook(device->machine, R.PC);
R.opcode.d = M_RDOP(R.PC);
R.PC++;

7
src/emu/cpu/tms32025/tms32025.c
View File

@ -119,7 +119,6 @@ Table 3-2. TMS32025/26 Memory Blocks
#include "debugger.h"
#include "deprecat.h"
#include "tms32025.h"
@ -1986,7 +1985,7 @@ static CPU_EXECUTE( tms32025 )
while (R.idle && tms32025_icount > 0)
process_timer(tms32025_icount);
if (tms32025_icount <= 0) debugger_instruction_hook(Machine, R.PC);
if (tms32025_icount <= 0) debugger_instruction_hook(device->machine, R.PC);
while (tms32025_icount > 0)
@ -1999,7 +1998,7 @@ static CPU_EXECUTE( tms32025 )
R.PREVPC = R.PC;
debugger_instruction_hook(Machine, R.PC);
debugger_instruction_hook(device->machine, R.PC);
R.opcode.d = M_RDOP(R.PC);
R.PC++;
@ -2024,7 +2023,7 @@ static CPU_EXECUTE( tms32025 )
if (R.init_load_addr == 2) { /* Repeat next instruction */
R.PREVPC = R.PC;
debugger_instruction_hook(Machine, R.PC);
debugger_instruction_hook(device->machine, R.PC);
R.opcode.d = M_RDOP(R.PC);
R.PC++;

6
src/emu/cpu/tms32031/tms32031.c
View File

@ -521,7 +521,7 @@ static CPU_EXECUTE( tms32031 )
if (tms32031.is_idling)
return tms32031_icount;
if ((Machine->debug_flags & DEBUG_FLAG_ENABLED) == 0)
if ((device->machine->debug_flags & DEBUG_FLAG_ENABLED) == 0)
{
while (tms32031_icount > 0)
{
@ -553,7 +553,7 @@ static CPU_EXECUTE( tms32031 )
while (tms32031_icount > 0)
{
if (IREG(TMR_SP) & 0xff000000)
debugger_break(Machine);
debugger_break(device->machine);
if ((IREG(TMR_ST) & RMFLAG) && tms32031.pc == IREG(TMR_RE) + 1)
{
if ((INT32)--IREG(TMR_RC) >= 0)
@ -574,7 +574,7 @@ static CPU_EXECUTE( tms32031 )
continue;
}
debugger_instruction_hook(Machine, tms32031.pc);
debugger_instruction_hook(device->machine, tms32031.pc);
execute_one();
}
}

3
src/emu/cpu/tms32051/tms32051.c
View File

@ -5,7 +5,6 @@
*/
#include "debugger.h"
#include "deprecat.h"
#include "cpuintrf.h"
#include "tms32051.h"
@ -363,7 +362,7 @@ static CPU_EXECUTE( tms )
}
ppc = tms.pc;
debugger_instruction_hook(Machine, tms.pc);
debugger_instruction_hook(device->machine, tms.pc);
tms.op = ROPCODE();
tms32051_opcode_table[tms.op >> 8]();

4
src/emu/cpu/tms34010/34010gfx.c
View File

@ -9,6 +9,8 @@
#ifndef RECURSIVE_INCLUDE
#include "deprecat.h"
#define LOG_GFX_OPS 0
#define LOGGFX(x) do { if (LOG_GFX_OPS && input_code_pressed(KEYCODE_L)) logerror x; } while (0)
@ -83,7 +85,7 @@ static int apply_window(tms34010_state *tms, const char *inst_name,int srcbpp, U
int diff, cycles = 3;
if (WINDOW_CHECKING(tms) == 2)
logerror("%08x: %s apply_window window mode %d not supported!\n", cpu_get_pc(Machine->activecpu), inst_name, WINDOW_CHECKING(tms));
logerror("%08x: %s apply_window window mode %d not supported!\n", cpu_get_pc(tms->device), inst_name, WINDOW_CHECKING(tms));
CLR_V(tms);
if (WINDOW_CHECKING(tms) == 1)

1
src/emu/cpu/tms34010/tms34010.c
View File

@ -8,7 +8,6 @@
***************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "osd_cpu.h"
#include "tms34010.h"
#include "34010ops.h"

4
src/emu/cpu/tms7000/tms7000.c
View File

@ -472,7 +472,7 @@ static CPU_EXECUTE( tms7000 )
do
{
debugger_instruction_hook(Machine, pPC);
debugger_instruction_hook(device->machine, pPC);
if( tms7000.idle_state == 0 )
{
@ -511,7 +511,7 @@ static CPU_EXECUTE( tms7000_exl )
do
{
debugger_instruction_hook(Machine, pPC);
debugger_instruction_hook(device->machine, pPC);
if( tms7000.idle_state == 0 )
{

4
src/emu/cpu/tms9900/99xxcore.h
View File

@ -1479,7 +1479,7 @@ static CPU_EXECUTE( tms99xx )
}
}
if ((Machine->debug_flags & DEBUG_FLAG_CALL_HOOK) != 0)
if ((device->machine->debug_flags & DEBUG_FLAG_CALL_HOOK) != 0)
{
#if 0 /* Trace */
logerror("> PC %4.4x :%4.4x %4.4x : R=%4.4x %4.4x %4.4x %4.4x %4.4x %4.4x %4.4x %4.4x %4.4x %4.4x%4.4x %4.4x %4.4x %4.4x %4.4x %4.4x :T=%d\n",I.PC,I.STATUS,I.WP,I.FR[0],I.FR[1],I.FR[2],I.FR[3],I.FR[4],I.FR[5],I.FR[6],I.FR[7],I.FR[8],I.FR[9],I.FR[10],I.FR[11],I.FR[12],I.FR[13],I.FR[14],I.FR[15],TMS99XX_ICOUNT);
@ -1506,7 +1506,7 @@ static CPU_EXECUTE( tms99xx )
#endif
#endif
debugger_instruction_hook(Machine, I.IR);
debugger_instruction_hook(device->machine, I.IR);
}
if (I.IDLE)

3
src/emu/cpu/upd7810/upd7810.c
View File

@ -406,7 +406,6 @@ STOP 01001000 10111011 12 stop
#include "debugger.h"
#include "deprecat.h"
#include "upd7810.h"
static UPD7810 upd7810;
@ -1708,7 +1707,7 @@ static CPU_EXECUTE( upd7810 )
{
int cc = 0;
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
PPC = PC;
RDOP(OP);

2
src/emu/cpu/v30mz/v30mz.c
View File

@ -971,7 +971,7 @@ static CPU_EXECUTE( v30mz )
if (I.no_interrupt)
I.no_interrupt--;
debugger_instruction_hook(Machine, (I.sregs[CS]<<4) + I.ip);
debugger_instruction_hook(device->machine, (I.sregs[CS]<<4) + I.ip);
nec_instruction[FETCHOP]();
}

3
src/emu/cpu/v60/v60.c
View File

@ -4,7 +4,6 @@
// Portability fixes by Richter Belmont
#include "debugger.h"
#include "deprecat.h"
#include "v60.h"
// memory accessors
@ -428,7 +427,7 @@ static CPU_EXECUTE( v60 )
v60_try_irq();
while(v60_ICount >= 0) {
v60.PPC = PC;
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
v60_ICount -= 8; /* fix me -- this is just an average */
inc = OpCodeTable[OpRead8(PC)]();
PC += inc;

3
src/emu/cpu/v810/v810.c
View File

@ -17,7 +17,6 @@
********************************************/
#include "debugger.h"
#include "deprecat.h"
#include "v810.h"
#define clkIF 3
@ -976,7 +975,7 @@ static CPU_EXECUTE( v810 )
while(v810_ICount>=0)
{
v810.PPC=PC;
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
OP=R_OP(PC);
PC+=2;
v810_ICount-= OpCodeTable[OP>>10]();

9
src/emu/cpu/z180/z180.c
View File

@ -77,7 +77,6 @@ Hitachi HD647180 series:
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "driver.h"
#include "z180.h"
#include "cpu/z80/z80daisy.h"
@ -1902,7 +1901,7 @@ static CPU_INIT( z180 )
{
Z180.daisy = NULL;
if (device->static_config)
Z180.daisy = z80daisy_init(Machine, Machine->config->cpu[cpunum_get_active()].tag, device->static_config);
Z180.daisy = z80daisy_init(device, device->static_config);
Z180.irq_callback = irqcallback;
Z180.device = device;
@ -2219,7 +2218,7 @@ again:
if ((IO_DSTAT & Z180_DSTAT_DE0) == Z180_DSTAT_DE0 &&
(IO_DMODE & Z180_DMODE_MMOD) == Z180_DMODE_MMOD)
{
debugger_instruction_hook(Machine, _PCD);
debugger_instruction_hook(device->machine, _PCD);
z180_dma0();
old_icount = handle_timers(z180_icount, old_icount);
@ -2232,7 +2231,7 @@ again:
Z180.after_EI = 0;
_PPC = _PCD;
debugger_instruction_hook(Machine, _PCD);
debugger_instruction_hook(device->machine, _PCD);
_R++;
EXEC_INLINE(op,ROP());
@ -2259,7 +2258,7 @@ again:
Z180.after_EI = 0;
_PPC = _PCD;
debugger_instruction_hook(Machine, _PCD);
debugger_instruction_hook(device->machine, _PCD);
_R++;
EXEC_INLINE(op,ROP());
old_icount = handle_timers(z180_icount, old_icount);

5
src/emu/cpu/z80/z80.c
View File

@ -99,7 +99,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "driver.h"
#include "z80.h"
#include "z80daisy.h"
@ -3548,7 +3547,7 @@ static CPU_INIT( z80 )
/* Reset registers to their initial values */
memset(z80, 0, sizeof(*z80));
if (device->static_config != NULL)
z80->daisy = z80daisy_init(Machine, Machine->config->cpu[cpunum_get_active()].tag, device->static_config);
z80->daisy = z80daisy_init(device, device->static_config);
z80->irq_callback = irqcallback;
z80->device = device;
IX = IY = 0xffff; /* IX and IY are FFFF after a reset! */
@ -3624,7 +3623,7 @@ static CPU_EXECUTE( z80 )
z80->after_ei = FALSE;
PRVPC = PCD;
debugger_instruction_hook(Machine, PCD);
debugger_instruction_hook(device->machine, PCD);
R++;
EXEC_INLINE(z80,op,ROP(z80));
} while( z80->icount > 0 );

4
src/emu/cpu/z80/z80daisy.c
View File

@ -21,7 +21,7 @@ struct _z80_daisy_state
};
z80_daisy_state *z80daisy_init(running_machine *machine, const char *cputag, const z80_daisy_chain *daisy)
z80_daisy_state *z80daisy_init(const device_config *cpudevice, const z80_daisy_chain *daisy)
{
astring *tempstring = astring_alloc();
z80_daisy_state *head = NULL;
@ -32,7 +32,7 @@ z80_daisy_state *z80daisy_init(running_machine *machine, const char *cputag, con
{
*tailptr = auto_malloc(sizeof(**tailptr));
(*tailptr)->next = NULL;
(*tailptr)->device = devtag_get_device(machine, daisy->devtype, device_inherit_tag(tempstring, cputag, daisy->devname));
(*tailptr)->device = devtag_get_device(cpudevice->machine, daisy->devtype, device_inherit_tag(tempstring, cpudevice->tag, daisy->devname));
if ((*tailptr)->device == NULL)
fatalerror("Unable to locate device '%s'", daisy->devname);
(*tailptr)->irq_state = (z80_daisy_irq_state)device_get_info_fct((*tailptr)->device, DEVINFO_FCT_IRQ_STATE);

2
src/emu/cpu/z80/z80daisy.h
View File

@ -60,7 +60,7 @@ struct _z80_daisy_chain
FUNCTION PROTOTYPES
***************************************************************************/
z80_daisy_state *z80daisy_init(running_machine *machine, const char *cputag, const z80_daisy_chain *daisy);
z80_daisy_state *z80daisy_init(const device_config *cpudevice, const z80_daisy_chain *daisy);
void z80daisy_reset(z80_daisy_state *daisy);
int z80daisy_update_irq_state(z80_daisy_state *chain);

3
src/emu/cpu/z8000/z8000.c
View File

@ -44,7 +44,6 @@
*****************************************************************************/
#include "debugger.h"
#include "deprecat.h"
#include "z8000.h"
#include "z8000cpu.h"
#include "osd_cpu.h"
@ -486,7 +485,7 @@ static CPU_EXECUTE( z8000 )
if (IRQ_REQ)
Interrupt();
debugger_instruction_hook(Machine, PC);
debugger_instruction_hook(device->machine, PC);
if (IRQ_REQ & Z8000_HALT)
{

1
src/emu/machine/z80pio.c
View File

@ -10,7 +10,6 @@
***************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "z80pio.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"

1
src/emu/machine/z80sio.c
View File

@ -8,7 +8,6 @@
***************************************************************************/
#include "driver.h"
#include "deprecat.h"
#include "z80sio.h"
#include "cpu/z80/z80.h"
#include "cpu/z80/z80daisy.h"

1
src/emu/uiinput.c
View File

@ -14,7 +14,6 @@
#include "inptport.h"
#include "profiler.h"
#include "render.h"
#include "deprecat.h"
/***************************************************************************