From 92f305310513e310dcca7f5b1c3fe7ec2b197775 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Mon, 10 Nov 2008 07:42:09 +0000 Subject: Major cpuintrf changes: * added a set of cpu_* calls which accept a CPU device object; these are now the preferred means of manipulating a CPU * removed the cpunum_* calls; added an array of cpu[] to the running_machine object; converted all existing cpunum_* calls to cpu_* calls, pulling the CPU device object from the new array in the running_machine * removed the activecpu_* calls; added an activecpu member to the running_machine object; converted all existing activecpu_* calls to cpu_* calls, pulling the active CPU device object from the running_machine * changed cpuintrf_push_context() to cpu_push_context(), taking a CPU object pointer; changed cpuintrf_pop_context() to cpu_pop_context(); eventually these will go away * many other similar changes moving toward a model where all CPU references are done by the CPU object and not by index --- src/emu/machine/am53cf96.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/emu/machine/am53cf96.c') diff --git a/src/emu/machine/am53cf96.c b/src/emu/machine/am53cf96.c index b1117cb9584..2a5bba17ec5 100644 --- a/src/emu/machine/am53cf96.c +++ b/src/emu/machine/am53cf96.c @@ -69,11 +69,11 @@ READ32_HANDLER( am53cf96_r ) if (reg == REG_FIFO) { -// mame_printf_debug("53cf96: read FIFO PC=%x\n", activecpu_get_pc()); +// mame_printf_debug("53cf96: read FIFO PC=%x\n", cpu_get_pc(machine->activecpu)); return 0; } -// logerror("53cf96: read reg %d = %x (PC=%x)\n", reg, rv>>shift, activecpu_get_pc()); +// logerror("53cf96: read reg %d = %x (PC=%x)\n", reg, rv>>shift, cpu_get_pc(machine->activecpu)); if (reg == REG_IRQSTATE) { @@ -106,7 +106,7 @@ WRITE32_HANDLER( am53cf96_w ) } val &= 0xff; -// logerror("53cf96: w %x to reg %d (ofs %02x data %08x mask %08x PC=%x)\n", val, reg, offset, data, mem_mask, activecpu_get_pc()); +// logerror("53cf96: w %x to reg %d (ofs %02x data %08x mask %08x PC=%x)\n", val, reg, offset, data, mem_mask, cpu_get_pc(machine->activecpu)); // if writing to the target ID, cache it off for later if (reg == REG_STATUS) @@ -144,7 +144,7 @@ WRITE32_HANDLER( am53cf96_w ) case 2: // reset device scsi_regs[REG_IRQSTATE] = 8; // indicate success - logerror("53cf96: reset target ID = %d (PC = %x)\n", last_id, activecpu_get_pc()); + logerror("53cf96: reset target ID = %d (PC = %x)\n", last_id, cpu_get_pc(machine->activecpu)); if (devices[last_id]) { SCSIReset( devices[last_id] ); @@ -172,7 +172,7 @@ WRITE32_HANDLER( am53cf96_w ) scsi_regs[REG_INTSTATE] = 4; } - logerror("53cf96: command %x exec. target ID = %d (PC = %x)\n", fifo[1], last_id, activecpu_get_pc()); + logerror("53cf96: command %x exec. target ID = %d (PC = %x)\n", fifo[1], last_id, cpu_get_pc(machine->activecpu)); if (devices[last_id]) { int length; -- cgit v1.2.3-70-g09d2