diff options
author | smf- <smf-@users.noreply.github.com> | 2018-04-13 16:32:23 +0100 |
---|---|---|
committer | smf- <smf-@users.noreply.github.com> | 2018-04-13 16:41:37 +0100 |
commit | 1a27a251f819ecd7990a21d1b1c5ef82355b63c2 (patch) | |
tree | e64a720ca63495737ea5536cc90408343a4feff1 /src/mame/drivers | |
parent | 603b5bfd61ed3b9968c268aaa9cb13ebb6801ec6 (diff) |
remove safe_pc() and safe_pcbase() (nw)
Diffstat (limited to 'src/mame/drivers')
57 files changed, 208 insertions, 268 deletions
diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp index cefb7c079cc..5492770ed48 100644 --- a/src/mame/drivers/39in1.cpp +++ b/src/mame/drivers/39in1.cpp @@ -116,7 +116,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c vsprintf( buf, s_fmt, v ); va_end( v ); device.logerror( "%s: %s", device.machine().describe_context(), buf ); - //printf( "%s: %s", device.machine().describe_context(), buf ); + //printf( "%s: %s", device.machine().describe_context().c_str(), buf ); } } diff --git a/src/mame/drivers/4dpi.cpp b/src/mame/drivers/4dpi.cpp index f245174df69..ed3a11de476 100644 --- a/src/mame/drivers/4dpi.cpp +++ b/src/mame/drivers/4dpi.cpp @@ -68,7 +68,7 @@ inline void ATTR_PRINTF(3,4) sgi_ip6_state::verboselog( int n_level, const char va_start( v, s_fmt ); vsprintf( buf, s_fmt, v ); va_end( v ); - logerror("%08x: %s", machine().device("maincpu")->safe_pc(), buf); + logerror("%s: %s", machine().describe_context(), buf); } #endif } diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp index c2b6e4965ef..20ebb856924 100644 --- a/src/mame/drivers/88games.cpp +++ b/src/mame/drivers/88games.cpp @@ -263,7 +263,7 @@ INPUT_PORTS_END WRITE8_MEMBER( _88games_state::banking_callback ) { - logerror("%04x: bank select %02x\n", machine().device("maincpu")->safe_pc(), data); + logerror("%s: bank select %02x\n", machine().describe_context(), data); /* bits 0-2 select ROM bank for 0000-1fff */ /* bit 3: when 1, palette RAM at 1000-1fff */ diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp index 9a272c712b4..36acbe3e8f3 100644 --- a/src/mame/drivers/apollo.cpp +++ b/src/mame/drivers/apollo.cpp @@ -139,7 +139,7 @@ const char *apollo_cpu_context(device_t *cpu) { int s = (t / osd_ticks_per_second()) % 3600; int ms = (t / (osd_ticks_per_second() / 1000)) % 1000; - sprintf(statebuf, "%d.%03d %s pc=%08x", s, ms, cpu->tag(), cpu->safe_pcbase()); + sprintf(statebuf, "%s %d.%03d", cpu->machine().describe_context().c_str(), s, ms); } else { strcpy(statebuf, "(no context)"); } diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp index 68022aff578..195dae13a46 100644 --- a/src/mame/drivers/astrof.cpp +++ b/src/mame/drivers/astrof.cpp @@ -1379,8 +1379,8 @@ DRIVER_INIT_MEMBER(astrof_state,sstarbtl) DRIVER_INIT_MEMBER(astrof_state,acombat3) { /* set up protection handlers */ - machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(FUNC(astrof_state::shoot_r),this)); - machine().device("maincpu")->memory().space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(FUNC(astrof_state::abattle_coin_prot_r),this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xa003, 0xa003, read8_delegate(FUNC(astrof_state::shoot_r),this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xa004, 0xa004, read8_delegate(FUNC(astrof_state::abattle_coin_prot_r),this)); } diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp index 2a38b9c7038..8d11d511afc 100644 --- a/src/mame/drivers/atarigt.cpp +++ b/src/mame/drivers/atarigt.cpp @@ -287,7 +287,7 @@ void atarigt_state::tmek_protection_w(address_space &space, offs_t offset, uint1 Read ($38488) */ - if (LOG_PROTECTION) logerror("%06X:Protection W@%06X = %04X\n", space.device().safe_pcbase(), offset, data); + if (LOG_PROTECTION) logerror("%s:Protection W@%06X = %04X\n", machine().describe_context(), offset, data); /* track accesses */ tmek_update_mode(offset); @@ -302,7 +302,7 @@ void atarigt_state::tmek_protection_w(address_space &space, offs_t offset, uint1 void atarigt_state::tmek_protection_r(address_space &space, offs_t offset, uint16_t *data) { - if (LOG_PROTECTION) logerror("%06X:Protection R@%06X\n", space.device().safe_pcbase(), offset); + if (LOG_PROTECTION) logerror("%s:Protection R@%06X\n", machine().describe_context(), offset); /* track accesses */ tmek_update_mode(offset); @@ -368,7 +368,7 @@ void atarigt_state::primrage_protection_w(address_space &space, offs_t offset, u { if (LOG_PROTECTION) { - uint32_t pc = space.device().safe_pcbase(); + uint32_t pc = m_maincpu->pcbase(); switch (pc) { /* protection code from 20f90 - 21000 */ @@ -401,7 +401,7 @@ void atarigt_state::primrage_protection_w(address_space &space, offs_t offset, u /* catch anything else */ default: - logerror("%06X:Unknown protection W@%06X = %04X\n", space.device().safe_pcbase(), offset, data); + logerror("%s:Unknown protection W@%06X = %04X\n", machine().describe_context(), offset, data); break; } } @@ -441,7 +441,7 @@ void atarigt_state::primrage_protection_r(address_space &space, offs_t offset, u if (LOG_PROTECTION) { - uint32_t pc = space.device().safe_pcbase(); + uint32_t pc = m_maincpu->pcbase(); uint32_t p1, p2, a6; switch (pc) { @@ -504,7 +504,7 @@ if (LOG_PROTECTION) /* catch anything else */ default: - logerror("%06X:Unknown protection R@%06X\n", space.device().safe_pcbase(), offset); + logerror("%s:Unknown protection R@%06X\n", machine().describe_context(), offset); break; } } diff --git a/src/mame/drivers/atlantis.cpp b/src/mame/drivers/atlantis.cpp index 0028fb99e85..293f61a2f1f 100644 --- a/src/mame/drivers/atlantis.cpp +++ b/src/mame/drivers/atlantis.cpp @@ -193,25 +193,25 @@ public: READ8_MEMBER(atlantis_state::parallel_r) { uint8_t result = 0x7; - logerror("%06X: parallel_r %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, result); + logerror("%s: parallel_r %08x = %02x\n", machine().describe_context(), offset, result); return result; } WRITE8_MEMBER(atlantis_state::parallel_w) { - logerror("%06X: parallel_w %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%s: parallel_w %08x = %02x\n", machine().describe_context(), offset, data); } // Expansion ROM READ8_MEMBER (atlantis_state::exprom_r) { - logerror("%06X: exprom_r %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, 0xff); + logerror("%s: exprom_r %08x = %02x\n", machine().describe_context(), offset, 0xff); return 0xff; } WRITE8_MEMBER(atlantis_state::exprom_w) { - logerror("%06X: exprom_w %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%s: exprom_w %08x = %02x\n", machine().describe_context(), offset, data); } // Board PLD @@ -319,7 +319,7 @@ WRITE32_MEMBER(atlantis_state::board_ctrl_w) case 0xbf: digit = '|'; break; case 0xfe: digit = '-'; break; case 0xff: digit = 'Z'; break; - if (0) logerror("%06X: status_leds_w digit: %c %08x = %02x\n", machine().device("maincpu")->safe_pc(), digit, offset, data); + if (0) logerror("%s: status_leds_w digit: %c %08x = %02x\n", machine().describe_context(), digit, offset, data); } } break; @@ -355,7 +355,7 @@ WRITE8_MEMBER(atlantis_state::cmos_w) if (offset == 0 && (m_user_io_state & 0x1)) { // Data written is shifted by 1 bit each time. Maybe a serial line output? if (LOG_RTC && m_serial_count == 0) - logerror("%06X: cmos_w[0] start serial %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%s: cmos_w[0] start serial %08x = %02x\n", machine().describe_context(), offset, data); m_serial_count++; if (m_serial_count == 8) m_serial_count = 0; diff --git a/src/mame/drivers/bfcobra.cpp b/src/mame/drivers/bfcobra.cpp index 8a6768fea69..4099bf49981 100644 --- a/src/mame/drivers/bfcobra.cpp +++ b/src/mame/drivers/bfcobra.cpp @@ -495,7 +495,7 @@ void bfcobra_state::RunBlit(address_space &space) /* This debug is now wrong ! */ if (DEBUG_BLITTER) { - osd_printf_debug("\n%s:Blitter: Running command from 0x%.5x\n\n", device->machine().describe_context(), blitter.program.addr - 12); + osd_printf_debug("\n%s:Blitter: Running command from 0x%.5x\n\n", device->machine().describe_context().c_str(), blitter.program.addr - 12); osd_printf_debug("Command Reg %.2x", blitter.command); osd_printf_debug(" %s %s %s %s %s %s %s\n", blitter.command & CMD_RUN ? "RUN" : " ", diff --git a/src/mame/drivers/calchase.cpp b/src/mame/drivers/calchase.cpp index a752ec6e107..672929b5b47 100644 --- a/src/mame/drivers/calchase.cpp +++ b/src/mame/drivers/calchase.cpp @@ -200,7 +200,7 @@ uint8_t calchase_state::mtxc_config_r(int function, int reg) void calchase_state::mtxc_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:MTXC: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:MTXC: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); /* memory banking with North Bridge: @@ -294,7 +294,7 @@ uint8_t calchase_state::piix4_config_r(int function, int reg) void calchase_state::piix4_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); m_piix4_config_reg[function][reg] = data; } diff --git a/src/mame/drivers/camplynx.cpp b/src/mame/drivers/camplynx.cpp index 8aaa1986eea..ae72292761d 100644 --- a/src/mame/drivers/camplynx.cpp +++ b/src/mame/drivers/camplynx.cpp @@ -245,7 +245,7 @@ d7 = read from bank 4 */ m_bankdata = data; data ^= 0x31; // make all lines active high -//printf("%s:%X\n", machine().describe_context(), data); +//printf("%s:%X\n", machine().describe_context().c_str(), data); // do writes m_wbyte = (data & 0x0f) | ((m_port80 & 0x0c) << 3); // do reads @@ -371,7 +371,7 @@ d0 = read from bank 4 */ uint8_t rbyte = bitswap<8>(data, 0, 0, 0, 0, 0, 1, 2, 3) & 0x0f; // rearrange to 0,1,2,4 if (BIT(rbyte, 1)) rbyte &= 0x07; // remove 4 if 1 selected (AND gate in IC82) -//printf("%s:%X:%X:%X\n", machine().describe_context(), data, rbyte, m_wbyte); +//printf("%s:%X:%X:%X\n", machine().describe_context().c_str(), data, rbyte, m_wbyte); switch (rbyte) { case 0x00: diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp index 16d5b99c469..baa6f7d3493 100644 --- a/src/mame/drivers/cobra.cpp +++ b/src/mame/drivers/cobra.cpp @@ -1169,19 +1169,7 @@ void cobra_fifo::push(const device_t *cpu, uint64_t data) { if (m_verbose) { - char accessor_location[50]; - if (cpu != nullptr) - { - // cpu has a name and a PC - sprintf(accessor_location, "(%s) %08X", cpu->tag(), const_cast<device_t *>(cpu)->safe_pc()); - } - else - { - // non-cpu - sprintf(accessor_location, "(non-cpu)"); - } - - printf("%s: push %08X%08X (%d) at %s\n", m_name, (uint32_t)(data >> 32), (uint32_t)(data), m_num, accessor_location); + printf("%s %s: push %08X%08X (%d)\n", cpu->machine().describe_context().c_str(), m_name, (uint32_t)(data >> 32), (uint32_t)(data), m_num); } if (m_num == m_size) @@ -1189,19 +1177,7 @@ void cobra_fifo::push(const device_t *cpu, uint64_t data) if (m_verbose) { int i, j; - char accessor_location[50]; - if (cpu != nullptr) - { - // cpu has a name and a PC - sprintf(accessor_location, "(%s) %08X", cpu->tag(), const_cast<device_t *>(cpu)->safe_pc()); - } - else - { - // non-cpu - sprintf(accessor_location, "(non-cpu)"); - } - - printf("%s overflow at %s\n", m_name, accessor_location); + printf("%s %s overflow\n", cpu->machine().describe_context().c_str(), m_name); printf("%s dump:\n", m_name); for (j=0; j < 128; j+=4) @@ -1246,19 +1222,7 @@ bool cobra_fifo::pop(const device_t *cpu, uint64_t *result) { if (m_verbose) { - char accessor_location[50]; - if (cpu != nullptr) - { - // cpu has a name and a PC - sprintf(accessor_location, "(%s) %08X", cpu->tag(), const_cast<device_t *>(cpu)->safe_pc()); - } - else - { - // non-cpu - sprintf(accessor_location, "(non-cpu)"); - } - - printf("%s underflow at %s\n", m_name, accessor_location); + printf("%s %s underflow\n", cpu->machine().describe_context().c_str(), m_name); } return false; } @@ -1267,19 +1231,7 @@ bool cobra_fifo::pop(const device_t *cpu, uint64_t *result) if (m_verbose) { - char accessor_location[50]; - if (cpu != nullptr) - { - // cpu has a name and a PC - sprintf(accessor_location, "(%s) %08X", cpu->tag(), const_cast<device_t *>(cpu)->safe_pc()); - } - else - { - // non-cpu - sprintf(accessor_location, "(non-cpu)"); - } - - printf("%s: pop %08X%08X (%d) at %s\n", m_name, (uint32_t)(r >> 32), (uint32_t)(r), m_num-1, accessor_location); + printf("%s %s: pop %08X%08X (%d)\n", cpu->machine().describe_context().c_str(), m_name, (uint32_t)(r >> 32), (uint32_t)(r), m_num-1); } m_rpos++; diff --git a/src/mame/drivers/cps3.cpp b/src/mame/drivers/cps3.cpp index d544fa6fafe..5e2eb44038b 100644 --- a/src/mame/drivers/cps3.cpp +++ b/src/mame/drivers/cps3.cpp @@ -2440,7 +2440,7 @@ SH2_DMA_KLUDGE_CB(cps3_state::dma_callback) } else { - //printf("%s :src %08x, dst %08x, returning %08x\n", machine().describe_context(), src, dst, data); + //printf("%s :src %08x, dst %08x, returning %08x\n", machine().describe_context().c_str(), src, dst, data); } /* I doubt this is endian safe.. needs checking / fixing */ diff --git a/src/mame/drivers/craft.cpp b/src/mame/drivers/craft.cpp index 3228365e81b..ec81337ac0f 100644 --- a/src/mame/drivers/craft.cpp +++ b/src/mame/drivers/craft.cpp @@ -83,7 +83,7 @@ inline void craft_state::verboselog(int n_level, const char *s_fmt, ...) va_start( v, s_fmt ); vsprintf( buf, s_fmt, v ); va_end( v ); - logerror( "%08x: %s", m_maincpu->safe_pc(), buf ); + logerror( "%s: %s", machine().describe_context(), buf ); } #endif } diff --git a/src/mame/drivers/crystal.cpp b/src/mame/drivers/crystal.cpp index d8494ec7e5f..eca562f6d6f 100644 --- a/src/mame/drivers/crystal.cpp +++ b/src/mame/drivers/crystal.cpp @@ -421,7 +421,7 @@ WRITE32_MEMBER(crystal_state::IntAck_w) IRQ_CALLBACK_MEMBER(crystal_state::icallback) { - address_space &space = device.memory().space(AS_PROGRAM); + address_space &space = m_maincpu->space(AS_PROGRAM); uint32_t IntPend = space.read_dword(0x01800c0c); int i; diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp index 5f3aefc5598..95955651ad1 100644 --- a/src/mame/drivers/darius.cpp +++ b/src/mame/drivers/darius.cpp @@ -455,7 +455,7 @@ WRITE_LINE_MEMBER(darius_state::darius_adpcm_int) READ8_MEMBER(darius_state::adpcm_command_read) { - /* logerror("read port 0: %02x PC=%4x\n",adpcm_command, space.device().safe_pc() ); */ + /* logerror("%s read port 0: %02x\n", machine().describe_context(), adpcm_command ); */ return m_adpcm_command; } @@ -472,13 +472,13 @@ READ8_MEMBER(darius_state::readport3) WRITE8_MEMBER(darius_state::adpcm_nmi_disable) { m_nmi_enable = 0; - /* logerror("write port 0: NMI DISABLE PC=%4x\n", data, space.device().safe_pc() ); */ + /* logerror("%s write port 0: NMI DISABLE\n", machine().describe_context(), data ); */ } WRITE8_MEMBER(darius_state::adpcm_nmi_enable) { m_nmi_enable = 1; - /* logerror("write port 1: NMI ENABLE PC=%4x\n", space.device().safe_pc() ); */ + /* logerror("%s write port 1: NMI ENABLE\n", machine().describe_context() ); */ } WRITE8_MEMBER(darius_state::adpcm_data_w) diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp index 486761b11d3..7a3fb34c4e1 100644 --- a/src/mame/drivers/dkong.cpp +++ b/src/mame/drivers/dkong.cpp @@ -685,7 +685,7 @@ WRITE8_MEMBER(dkong_state::s2650_data_w) WRITE_LINE_MEMBER(dkong_state::s2650_fo_w) { #if DEBUG_PROTECTION - logerror("write : pc = %04x, FO = %02x\n",space.device().safe_pc(), data); + logerror("%s write : FO = %02x\n", machine().describe_context(), data); #endif m_main_fo = state; diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp index 125eaf3100a..90f0f4020e5 100644 --- a/src/mame/drivers/eolith.cpp +++ b/src/mame/drivers/eolith.cpp @@ -1599,7 +1599,7 @@ void eolith_state::speedup_read() { /* for debug */ //if ((m_maincpu->pc()!=m_speedup_address) && (m_speedup_vblank!=1) ) - // printf("%s:eolith speedup_read data %02x\n",machine().describe_context(), m_speedup_vblank); + // printf("%s:eolith speedup_read data %02x\n",machine().describe_context().c_str(), m_speedup_vblank); if (m_speedup_vblank==0 && m_speedup_scanline < m_speedup_resume_scanline) { diff --git a/src/mame/drivers/esq1.cpp b/src/mame/drivers/esq1.cpp index 33e657ba3a0..2297bcb825b 100644 --- a/src/mame/drivers/esq1.cpp +++ b/src/mame/drivers/esq1.cpp @@ -547,7 +547,7 @@ WRITE8_MEMBER(esq1_state::duart_output) { 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("[%02x] bank %d => offset %x (PC=%x)\n", data, bank, bank * 0x1000, m_maincpu->safe_pc()); +// printf("%s [%02x] bank %d => offset %x\n", machine().describe_context().c_str(), data, bank, bank * 0x1000); membank("osbank")->set_base(memregion("osrom")->base() + (bank * 0x1000) ); m_seq_bank = (data & 0x8) ? 0x8000 : 0x0000; diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp index e336569e8e0..f04d87a182c 100644 --- a/src/mame/drivers/galpani2.cpp +++ b/src/mame/drivers/galpani2.cpp @@ -143,9 +143,9 @@ void galpani2_state::machine_reset() machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(50)); //initial mcu xchk } -static void galpani2_write_kaneko(device_t *device) +static void galpani2_write_kaneko(cpu_device *cpu) { - address_space &dstspace = device->memory().space(AS_PROGRAM); + address_space &dstspace = cpu->space(AS_PROGRAM); int i,x,tpattidx; unsigned char testpattern[] = {0xFF,0x55,0xAA,0xDD,0xBB,0x99}; diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp index 7e6ea28bafd..fdd842265fa 100644 --- a/src/mame/drivers/gts3.cpp +++ b/src/mame/drivers/gts3.cpp @@ -255,7 +255,7 @@ WRITE8_MEMBER( gts3_state::u4b_w ) m_lampclk = clk_bit; -// printf("B=%s=%X ",machine().describe_context(),data&0xe0); +// printf("%s B=%X ",machine().describe_context().c_str(),data&0xe0); } READ8_MEMBER( gts3_state::u4a_r ) diff --git a/src/mame/drivers/gts3a.cpp b/src/mame/drivers/gts3a.cpp index af5d17210a5..fe3ce919bee 100644 --- a/src/mame/drivers/gts3a.cpp +++ b/src/mame/drivers/gts3a.cpp @@ -268,7 +268,7 @@ WRITE8_MEMBER( gts3a_state::u4b_w ) m_lampclk = clk_bit; -// printf("B=%s=%X ",machine().describe_context(),data&0xe0); +// printf("%s B=%X ",machine().describe_context().c_str(),data&0xe0); } READ8_MEMBER( gts3a_state::u4a_r ) diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp index 5ee2f60b165..0858ca32f6a 100644 --- a/src/mame/drivers/gts80.cpp +++ b/src/mame/drivers/gts80.cpp @@ -325,7 +325,7 @@ WRITE8_MEMBER( gts80_state::port2a_w ) //d0-3 bcd data; d4-6 = centre segment; d7 = dipsw enable WRITE8_MEMBER( gts80_state::port2b_w ) { - m_segment = data;//printf("%s:%X ",machine().describe_context(),data); + m_segment = data;//printf("%s:%X ",machine().describe_context().c_str(),data); } // solenoids diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp index 504044b5ef6..a8586f37d42 100644 --- a/src/mame/drivers/gts80a.cpp +++ b/src/mame/drivers/gts80a.cpp @@ -315,7 +315,7 @@ WRITE8_MEMBER( gts80a_state::port2a_w ) //d0-3 bcd data; d4-6 = centre segment; d7 = dipsw enable WRITE8_MEMBER( gts80a_state::port2b_w ) { - m_segment = data;//printf("%s:%X ",machine().describe_context(),data); + m_segment = data;//printf("%s:%X ",machine().describe_context().c_str(),data); } // solenoids diff --git a/src/mame/drivers/halleys.cpp b/src/mame/drivers/halleys.cpp index 48e0d38ba35..c6b721195b6 100644 --- a/src/mame/drivers/halleys.cpp +++ b/src/mame/drivers/halleys.cpp @@ -392,7 +392,7 @@ void halleys_state::blit(int offset) #if HALLEYS_DEBUG if (0) { - logerror("%s:[%04x]", machine.describe_context(), offset); + logerror("%s:[%04x]", machine().describe_context(), offset); for (ecx=0; ecx<16; ecx++) logerror(" %02x", param[ecx]); logerror("\n"); } diff --git a/src/mame/drivers/indy_indigo2.cpp b/src/mame/drivers/indy_indigo2.cpp index 3c8219fd08e..88f1a43a8d1 100644 --- a/src/mame/drivers/indy_indigo2.cpp +++ b/src/mame/drivers/indy_indigo2.cpp @@ -1333,8 +1333,7 @@ WRITE_LINE_MEMBER(ip22_state::scsi_irq) dump_chain(space, m_hpc3.m_scsi0_desc); - printf("PC is %08x\n", machine.device("maincpu")->safe_pc()); - printf("DMA to device: length %x xie %d eox %d\n", length, xie, eox); + printf("%s DMA to device: length %x xie %d eox %d\n", machine().describe_context().c_str(), length, xie, eox); if (length <= 0x4000) { diff --git a/src/mame/drivers/iris3130.cpp b/src/mame/drivers/iris3130.cpp index b9cafd0f827..05f8148b24a 100644 --- a/src/mame/drivers/iris3130.cpp +++ b/src/mame/drivers/iris3130.cpp @@ -131,7 +131,7 @@ inline void ATTR_PRINTF(3,4) sgi_ip2_state::verboselog( int n_level, const char va_start( v, s_fmt ); vsprintf( buf, s_fmt, v ); va_end( v ); - logerror("%08x: %s", machine().device("maincpu")->safe_pc(), buf); + logerror("%s: %s", machine().describe_context(), buf); } #endif } diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp index 0d2a8e44360..74e42a8cd68 100644 --- a/src/mame/drivers/kenseim.cpp +++ b/src/mame/drivers/kenseim.cpp @@ -271,7 +271,7 @@ WRITE8_MEMBER(kenseim_state::mb8936_portc_w) { // I'm guessing these are the 20 'power meter' LEDs, 10 for each player? (it writes 42 times, with the last write being some terminator?) -// printf("%s mb8936 write %02x to port C but no handler assigned (serial data?)\n", machine().describe_context(), data); +// printf("%s mb8936 write %02x to port C but no handler assigned (serial data?)\n", machine().describe_context().c_str(), data); if (data & 0x08) { @@ -306,7 +306,7 @@ WRITE8_MEMBER(kenseim_state::mb8936_portc_w) WRITE8_MEMBER(kenseim_state::mb8936_porta_w) // maybe molesa output? (6-bits?) { - //if (data&0xc0) printf("%s mb8936 write %02x to port A (mole output 1?)\n", machine().describe_context(), data); + //if (data&0xc0) printf("%s mb8936 write %02x to port A (mole output 1?)\n", machine().describe_context().c_str(), data); for (int i = 0; i < 6; i++) @@ -325,7 +325,7 @@ WRITE8_MEMBER(kenseim_state::mb8936_porta_w) // maybe molesa output? (6-bits?) WRITE8_MEMBER(kenseim_state::mb8936_portb_w) // maybe molesb output? (6-bits?) { - //if (data&0xc0) printf("%s mb8936 write %02x to port B (mole output 2?)\n", machine().describe_context(), data); + //if (data&0xc0) printf("%s mb8936 write %02x to port B (mole output 2?)\n", machine().describe_context().c_str(), data); for (int i = 0; i < 6; i++) { @@ -344,7 +344,7 @@ WRITE8_MEMBER(kenseim_state::mb8936_portb_w) // maybe molesb output? (6-bits?) WRITE8_MEMBER(kenseim_state::mb8936_portf_w) { // typically written when the 'moles' output is, maybe the 2 strobes? - //printf("%s mb8936 write %02x to port F (strobe?)\n", machine().describe_context(), data); + //printf("%s mb8936 write %02x to port F (strobe?)\n", machine().describe_context().c_str(), data); } diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index dd66aed59a6..520205762a3 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -260,7 +260,7 @@ READ8_MEMBER ( mac_state::mac_rbv_r ) { data &= ~0x38; data |= (m_montype.read_safe(2)<<3); -// printf("rbv_r montype: %02x (PC %x)\n", data, space.cpu->safe_pc()); +// printf("%s rbv_r montype: %02x\n", machine().describe_context().c_str(), data); } // bit 7 of these registers always reads as 0 on RBV diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index ac157b18170..f88b5cd190d 100644 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -737,7 +737,7 @@ READ8_MEMBER(mac128_state::mac_via_in_b) val |= m_rtc->data_r(); -// printf("VIA1 IN_B = %02x (PC %x)\n", val, m_maincpu->safe_pc()); +// printf("%s VIA1 IN_B = %02x\n", machine().describe_context().c_str(), val); return val; } @@ -745,7 +745,7 @@ READ8_MEMBER(mac128_state::mac_via_in_b) WRITE8_MEMBER(mac128_state::mac_via_out_a) { device_t *fdc = machine().device("fdc"); -// printf("VIA1 OUT A: %02x (PC %x)\n", data, m_maincpu->safe_pc()); +// printf("%s VIA1 OUT A: %02x (PC %x)\n", machine().describe_context().c_str(), data); //set_scc_waitrequest((data & 0x80) >> 7); m_screen_buffer = (data & 0x40) >> 6; @@ -767,7 +767,7 @@ WRITE8_MEMBER(mac128_state::mac_via_out_a) WRITE8_MEMBER(mac128_state::mac_via_out_b) { -// printf("VIA1 OUT B: %02x (PC %x)\n", data, m_maincpu->safe_pc()); +// printf("%s VIA1 OUT B: %02x\n", machine().describe_context().c_str(), data); m_snd_enable = ((data & 0x80) == 0) ? true : false; update_volume(); diff --git a/src/mame/drivers/malzak.cpp b/src/mame/drivers/malzak.cpp index 505cf3bc2c1..200afe9963a 100644 --- a/src/mame/drivers/malzak.cpp +++ b/src/mame/drivers/malzak.cpp @@ -156,7 +156,7 @@ WRITE8_MEMBER(malzak_state::port40_w) // Bits 1-3 are all set high upon death, until the game continues // Bit 6 is used only in Malzak II, and is set high after checking // the selected version -// logerror("S2650 [0x%04x]: port 0x40 write: 0x%02x\n", m_maincpu->safe_pc(), data); +// logerror("%s S2650: port 0x40 write: 0x%02x\n", machine().describe_context(), data); membank("bank1")->set_entry((data & 0x40) >> 6); } diff --git a/src/mame/drivers/mediagx.cpp b/src/mame/drivers/mediagx.cpp index b0201255005..88cdef56dfe 100644 --- a/src/mame/drivers/mediagx.cpp +++ b/src/mame/drivers/mediagx.cpp @@ -931,7 +931,7 @@ void mediagx_state::init_mediagx() uint32_t mediagx_state::generic_speedup(address_space &space, int idx) { - if (space.device().safe_pc() == m_speedup_table[idx].pc) + if (m_maincpu->pc() == m_speedup_table[idx].pc) { m_speedup_hits[idx]++; space.device().execute().spin_until_interrupt(); diff --git a/src/mame/drivers/model3.cpp b/src/mame/drivers/model3.cpp index 575877d4a96..03226ea2d5b 100644 --- a/src/mame/drivers/model3.cpp +++ b/src/mame/drivers/model3.cpp @@ -1254,7 +1254,7 @@ LSI53C810_DMA_CB(model3_state::real3d_dma_callback) case 0x9c: /* Unknown */ break; default: - logerror("dma_callback: %08X, %08X, %d at %08X", src, dst, length, machine().device("maincpu")->safe_pc()); + logerror("%s dma_callback: %08X, %08X, %d at %08X", machine().describe_context(), src, dst, length); break; } } @@ -1517,7 +1517,7 @@ WRITE64_MEMBER(model3_state::model3_ctrl_w) } break; default: - //osd_printf_debug("Lightgun: Unknown command %02X %s\n", (uint32_t)(data >> 24), machine().describe_context()); + //osd_printf_debug("%s Lightgun: Unknown command %02X\n", machine().describe_context().c_str(), (uint32_t)(data >> 24)); break; } } @@ -1544,7 +1544,7 @@ WRITE64_MEMBER(model3_state::model3_ctrl_w) READ64_MEMBER(model3_state::model3_sys_r) { -// printf("model3_sys_r: mask %llx @ %x %s\n", mem_mask, offset, machine().describe_context()); +// printf("%s model3_sys_r: mask %llx @ %x\n", machine().describe_context().c_str(), mem_mask, offset); switch (offset) { @@ -1569,7 +1569,7 @@ READ64_MEMBER(model3_state::model3_sys_r) else logerror("m3_sys: Unk sys_r @ 0x10: mask = %x\n", (uint32_t)mem_mask); break; case 0x18/8: -// printf("read irq_state %x %s\n", m_irq_state, machine().describe_context()); +// printf("%s read irq_state %x\n", machine().describe_context().c_str(), m_irq_state); return (uint64_t)m_irq_state<<56 | 0xff000000; } diff --git a/src/mame/drivers/namcona1.cpp b/src/mame/drivers/namcona1.cpp index de83625a057..dde78db24eb 100644 --- a/src/mame/drivers/namcona1.cpp +++ b/src/mame/drivers/namcona1.cpp @@ -452,7 +452,7 @@ void namcona1_state::blit() (void)src0; /* logerror( "%s: blt(%08x,%08x,numBytes=%04x);src=%04x %04x %04x; dst=%04x %04x %04x; gfx=%04x\n", - machine.describe_context(), + machine().describe_context(), dst_baseaddr,src_baseaddr,num_bytes, src0,src1,src2, dst0,dst1,dst2, diff --git a/src/mame/drivers/namcos21.cpp b/src/mame/drivers/namcos21.cpp index a98dfe278c8..6350861fa72 100644 --- a/src/mame/drivers/namcos21.cpp +++ b/src/mame/drivers/namcos21.cpp @@ -1149,9 +1149,8 @@ WRITE16_MEMBER(namcos21_state::pointram_control_w) /* m_pointram_control&0x20 : bank for depthcue data */ #if 0 - logerror( "dsp_control_w:'%s':%x[%x]:=%04x ", - cpu->tag, - cpu->safe_pc(), + logerror( "%s dsp_control_w:[%x]:=%04x ", + machine().describe_context(), offset, m_pointram_control ); diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp index db7c9ffcd09..9fdd574447b 100644 --- a/src/mame/drivers/neoprint.cpp +++ b/src/mame/drivers/neoprint.cpp @@ -191,7 +191,7 @@ READ8_MEMBER(neoprint_state::neoprint_unk_r) m_vblank = (m_screen->frame_number() & 0x1) ? 0x10 : 0x00; - //if(m_maincpu->pc() != 0x1504 && m_maincpu->pc() != 0x5f86 && m_machine->safe_pc() != 0x5f90) + //if(m_maincpu->pc() != 0x1504 && m_maincpu->pc() != 0x5f86 && m_maincpu->pc() != 0x5f90) // printf("%08x\n",m_maincpu->pc()); return m_vblank| 4 | 3; diff --git a/src/mame/drivers/nyny.cpp b/src/mame/drivers/nyny.cpp index ef335ef75b8..e020eee411a 100644 --- a/src/mame/drivers/nyny.cpp +++ b/src/mame/drivers/nyny.cpp @@ -383,7 +383,7 @@ WRITE8_MEMBER(nyny_state::nyny_ay8910_37_port_a_w) { /* not sure what this does */ - /*logerror("%x PORT A write %x at Y=%x X=%x\n", space.device().safe_pc(), data, m_screen->vpos(), m_screen->hpos());*/ + /*logerror("%s PORT A write %x at Y=%x X=%x\n", machine().describe_context(), data, m_screen->vpos(), m_screen->hpos());*/ } /************************************* diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp index efe9107238a..39b541642b8 100644 --- a/src/mame/drivers/overdriv.cpp +++ b/src/mame/drivers/overdriv.cpp @@ -60,7 +60,7 @@ static const uint16_t overdriv_default_eeprom[64] = WRITE16_MEMBER(overdriv_state::eeprom_w) { -//logerror("%s: write %04x to eeprom_w\n",machine.describe_context(),data); +//logerror("%s: write %04x to eeprom_w\n",machine().describe_context(),data); if (ACCESSING_BITS_0_7) { /* bit 0 is data */ diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp index 8c42ee3e773..e70b183e791 100644 --- a/src/mame/drivers/parodius.cpp +++ b/src/mame/drivers/parodius.cpp @@ -223,7 +223,7 @@ void parodius_state::machine_reset() WRITE8_MEMBER( parodius_state::banking_callback ) { if (data & 0xf0) - logerror("%04x: setlines %02x\n", machine().device("maincpu")->safe_pc(), data); + logerror("%s: setlines %02x\n", machine().describe_context(), data); membank("bank1")->set_entry((data & 0x0f) ^ 0x0f); } diff --git a/src/mame/drivers/pirates.cpp b/src/mame/drivers/pirates.cpp index bf58e431489..8b968563611 100644 --- a/src/mame/drivers/pirates.cpp +++ b/src/mame/drivers/pirates.cpp @@ -130,7 +130,7 @@ CUSTOM_INPUT_MEMBER(pirates_state::prot_r) 602e and 62a6 */ /* For Genix, see 6576 for setting values and 67c2,d3b4 and dbc2 for tests. */ - pc = machine().device("main")->safe_pc(); + pc = m_maincpu->pc(); if (pc == 0x6134) { bit = prot & 1; diff --git a/src/mame/drivers/psikyo.cpp b/src/mame/drivers/psikyo.cpp index 61cb9ff425a..9914a999ab0 100644 --- a/src/mame/drivers/psikyo.cpp +++ b/src/mame/drivers/psikyo.cpp @@ -458,7 +458,7 @@ CUSTOM_INPUT_MEMBER(psikyo_state::z80_nmi_r) /* main CPU might be waiting for sound CPU to finish NMI, so set a timer to give sound CPU a chance to run */ machine().scheduler().synchronize(); -// logerror("%s - Read coin port during Z80 NMI\n", machine.describe_context()); +// logerror("%s - Read coin port during Z80 NMI\n", machine().describe_context()); } return ret; diff --git a/src/mame/drivers/queen.cpp b/src/mame/drivers/queen.cpp index 1731e143ed5..a12d1719694 100644 --- a/src/mame/drivers/queen.cpp +++ b/src/mame/drivers/queen.cpp @@ -174,7 +174,7 @@ uint8_t queen_state::piix4_config_r(int function, int reg) void queen_state::piix4_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); m_piix4_config_reg[function][reg] = data; } diff --git a/src/mame/drivers/savquest.cpp b/src/mame/drivers/savquest.cpp index 6414f74ac33..2f31185b4b7 100644 --- a/src/mame/drivers/savquest.cpp +++ b/src/mame/drivers/savquest.cpp @@ -156,7 +156,7 @@ uint8_t savquest_state::mtxc_config_r(int function, int reg) void savquest_state::mtxc_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:MXTC: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:MXTC: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); #if 1 switch(reg) @@ -299,7 +299,7 @@ uint8_t savquest_state::piix4_config_r(int function, int reg) void savquest_state::piix4_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); m_piix4_config_reg[function][reg] = data; } diff --git a/src/mame/drivers/segald.cpp b/src/mame/drivers/segald.cpp index 9cfd3e6ef59..6cd988930b5 100644 --- a/src/mame/drivers/segald.cpp +++ b/src/mame/drivers/segald.cpp @@ -240,7 +240,7 @@ WRITE8_MEMBER(segald_state::astron_COLOR_write) WRITE8_MEMBER(segald_state::astron_FIX_write) { m_fix_ram[offset] = data; - /* logerror("FIX write : 0x%04x @ 0x%04x [0x%x]\n", data, offset, space.device().safe_pc()); */ + /* logerror("%s FIX write : 0x%04x [0x%x]\n", machine().describe_context(), data, offset); */ } WRITE8_MEMBER(segald_state::astron_io_bankswitch_w) diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index cda8f69aaa6..1c2b49291b3 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -1415,8 +1415,8 @@ void seta_state::uPD71054_update_timer(device_t *cpu, int no) uPD71054->timer[no]->adjust( period, no ); } else { uPD71054->timer[no]->adjust( attotime::never, no); - logerror( "CPU #0 PC %06X: uPD71054 error, timer %d duration is 0\n", - (cpu != nullptr) ? cpu->safe_pc() : -1, no ); + logerror( "%s: uPD71054 error, timer %d duration is 0\n", + machine().describe_context(), no ); } } diff --git a/src/mame/drivers/sothello.cpp b/src/mame/drivers/sothello.cpp index 18d11a2c99a..5b13d7ad3f4 100644 --- a/src/mame/drivers/sothello.cpp +++ b/src/mame/drivers/sothello.cpp @@ -252,7 +252,7 @@ void sothello_state::unlock_shared_ram() } else { - //logerror("Sub cpu active! @%x\n",device().safe_pc()); + //logerror("%s Sub cpu active!\n",machine().describe_context()); } } diff --git a/src/mame/drivers/squale.cpp b/src/mame/drivers/squale.cpp index 8b84f145420..6fa00ec6102 100644 --- a/src/mame/drivers/squale.cpp +++ b/src/mame/drivers/squale.cpp @@ -246,7 +246,7 @@ WRITE8_MEMBER( squale_state::fdc_sel0_w ) floppy_image_device *floppy = 0; #ifdef DBGMODE - printf("%s: write fdc_sel0_w reg : 0x%X\n",machine().describe_context(),data); + printf("%s: write fdc_sel0_w reg : 0x%X\n",machine().describe_context().c_str(),data); #endif fdc_sel0 = data; @@ -292,7 +292,7 @@ WRITE8_MEMBER( squale_state::fdc_sel0_w ) WRITE8_MEMBER( squale_state::fdc_sel1_w ) { #ifdef DBGMODE - printf("%s: write fdc_sel1_w reg : 0x%X\n",machine().describe_context(),data); + printf("%s: write fdc_sel1_w reg : 0x%X\n",machine().describe_context().c_str(),data); #endif fdc_sel1 = data; @@ -305,7 +305,7 @@ READ8_MEMBER( squale_state::fdc_sel0_r ) data = fdc_sel0; #ifdef DBGMODE - printf("%s: read fdc_sel0_r 0x%.2X\n",machine().describe_context(),data); + printf("%s: read fdc_sel0_r 0x%.2X\n",machine().describe_context().c_str(),data); #endif return data; @@ -318,7 +318,7 @@ READ8_MEMBER( squale_state::fdc_sel1_r ) data = fdc_sel1; #ifdef DBGMODE - printf("%s: read fdc_sel1_r 0x%.2X\n",machine().describe_context(),data); + printf("%s: read fdc_sel1_r 0x%.2X\n",machine().describe_context().c_str(),data); #endif return data; @@ -332,7 +332,7 @@ WRITE8_MEMBER( squale_state::pia_u75_porta_w ) { // U75 PIA Port A : Keyboard rows output #ifdef DBGMODE - printf("%s: write pia_u75_porta_w : 0x%.2X\n",machine().describe_context(),data); + printf("%s: write pia_u75_porta_w : 0x%.2X\n",machine().describe_context().c_str(),data); #endif keyboard_line = data; return; @@ -344,7 +344,7 @@ READ8_MEMBER( squale_state::pia_u75_porta_r ) uint8_t data; #ifdef DBGMODE - printf("%s: read pia_u75_porta_r\n",machine().describe_context()); + printf("%s: read pia_u75_porta_r\n",machine().describe_context().c_str()); #endif data = keyboard_line; @@ -380,7 +380,7 @@ READ8_MEMBER( squale_state::pia_u75_portb_r ) } #ifdef DBGMODE - printf("%s: read pia_u75_portb_r : 0x%.2X\n",machine().describe_context(),data); + printf("%s: read pia_u75_portb_r : 0x%.2X\n",machine().describe_context().c_str(),data); #endif return data; @@ -390,7 +390,7 @@ WRITE8_MEMBER( squale_state::pia_u75_portb_w ) { // U75 PIA Port B : Keyboard column input #ifdef DBGMODE - printf("%s: write pia_u75_portb_w : 0x%.2X\n",machine().describe_context(),data); + printf("%s: write pia_u75_portb_w : 0x%.2X\n",machine().describe_context().c_str(),data); #endif return; } @@ -418,7 +418,7 @@ READ8_MEMBER( squale_state::ay_portb_r ) data |= ( ioport("ay_joy_2")->read() ) & 0x8F; #ifdef DBGMODE - printf("%s: read ay_portb_r : 0x%.2X\n",machine().describe_context(),data); + printf("%s: read ay_portb_r : 0x%.2X\n",machine().describe_context().c_str(),data); #endif return data; @@ -439,7 +439,7 @@ READ8_MEMBER( squale_state::ay_porta_r ) uint8_t data; #ifdef DBGMODE - printf("%s: read ay_porta_r\n",machine().describe_context()); + printf("%s: read ay_porta_r\n",machine().describe_context().c_str()); #endif data = ( ioport("ay_joy_2")->read() ) & 0x8F; @@ -460,7 +460,7 @@ WRITE8_MEMBER( squale_state::ay_porta_w ) // B0 : Joystick 1 - Right #ifdef DBGMODE - printf("%s: write ay_porta_w : 0x%.2X\n",machine().describe_context(),data); + printf("%s: write ay_porta_w : 0x%.2X\n",machine().describe_context().c_str(),data); #endif return; } @@ -478,7 +478,7 @@ WRITE8_MEMBER( squale_state::ay_portb_w ) // B0 : Joystick 2 - Right #ifdef DBGMODE - printf("%s: write ay_portb_w : 0x%.2X\n",machine().describe_context(),data); + printf("%s: write ay_portb_w : 0x%.2X\n",machine().describe_context().c_str(),data); #endif return; } @@ -493,7 +493,7 @@ READ8_MEMBER( squale_state::pia_u72_porta_r ) uint8_t data; #ifdef DBGMODE - printf("%s: read pia_u72_porta_r\n",machine().describe_context()); + printf("%s: read pia_u72_porta_r\n",machine().describe_context().c_str()); #endif if( m_cart_rom && m_cart_rom->bytes() ) @@ -509,7 +509,7 @@ WRITE8_MEMBER( squale_state::pia_u72_porta_w ) // U72 PIA Port A : Cartridge data bus #ifdef DBGMODE - printf("%s: write pia_u72_porta_w : 0x%.2X\n",machine().describe_context(),data); + printf("%s: write pia_u72_porta_w : 0x%.2X\n",machine().describe_context().c_str(),data); #endif return; @@ -520,7 +520,7 @@ WRITE_LINE_MEMBER( squale_state::pia_u72_ca2_w ) // U72 PIA CA2 : Cartridge address control #ifdef DBGMODE - printf("%s: U72 PIA Port CA2 Set to %2x\n", machine().describe_context(),state); + printf("%s: U72 PIA Port CA2 Set to %2x\n", machine().describe_context().c_str(),state); #endif if( state ) @@ -544,7 +544,7 @@ WRITE_LINE_MEMBER( squale_state::pia_u75_cb2_w ) // U75 PIA CB2 : Cartridge address reset #ifdef DBGMODE - printf("%s: U75 PIA Port CB2 Set to %2x\n", machine().describe_context(),state); + printf("%s: U75 PIA Port CB2 Set to %2x\n", machine().describe_context().c_str(),state); #endif if( state ) @@ -570,7 +570,7 @@ READ8_MEMBER( squale_state::pia_u72_portb_r ) uint8_t data = 0xFF; #ifdef DBGMODE - printf("%s: read pia_u72_portb_r\n",machine().describe_context()); + printf("%s: read pia_u72_portb_r\n",machine().describe_context().c_str()); #endif return data; @@ -581,7 +581,7 @@ WRITE8_MEMBER( squale_state::pia_u72_portb_w ) // U72 PIA Port B : Printer data bus #ifdef DBGMODE - printf("%s: write pia_u72_portb_w : 0x%.2X\n",machine().describe_context(),data); + printf("%s: write pia_u72_portb_w : 0x%.2X\n",machine().describe_context().c_str(),data); #endif return; @@ -592,7 +592,7 @@ WRITE_LINE_MEMBER( squale_state::pia_u72_cb2_w ) // U72 PIA CB2 : Printer Data Strobe line #ifdef DBGMODE - printf("%s: U72 PIA Port CB2 Set to %2x\n", machine().describe_context(),state); + printf("%s: U72 PIA Port CB2 Set to %2x\n", machine().describe_context().c_str(),state); #endif } diff --git a/src/mame/drivers/supracan.cpp b/src/mame/drivers/supracan.cpp index 32595bd6e50..e92cf7f03b7 100644 --- a/src/mame/drivers/supracan.cpp +++ b/src/mame/drivers/supracan.cpp @@ -207,8 +207,6 @@ private: uint16_t m_video_regs[256]; - bool m_hack_68k_to_6502_access; - tilemap_t *m_tilemap_sizes[4][4]; bitmap_ind16 m_sprite_final_bitmap; void write_swapped_byte(int offset, uint8_t byte); @@ -228,7 +226,7 @@ private: TIMER_CALLBACK_MEMBER(supracan_line_off_callback); TIMER_CALLBACK_MEMBER(supracan_video_callback); DECLARE_DEVICE_IMAGE_LOAD_MEMBER(supracan_cart); - inline void verboselog(const char *tag, int n_level, const char *s_fmt, ...) ATTR_PRINTF(4,5); + inline void verboselog(int n_level, const char *s_fmt, ...) ATTR_PRINTF(3,4); int supracan_tilemap_get_region(int layer); void supracan_tilemap_get_info_common(int layer, tile_data &tileinfo, int count); void supracan_tilemap_get_info_roz(int layer, tile_data &tileinfo, int count); @@ -244,7 +242,7 @@ public: -inline void supracan_state::verboselog(const char *tag, int n_level, const char *s_fmt, ...) +inline void supracan_state::verboselog(int n_level, const char *s_fmt, ...) { #if ENABLE_VERBOSE_LOG if( VERBOSE_LEVEL >= n_level ) @@ -254,7 +252,7 @@ inline void supracan_state::verboselog(const char *tag, int n_level, const char va_start( v, s_fmt ); vsprintf( buf, s_fmt, v ); va_end( v ); - logerror( "%06x: %s: %s", machine().device(tag)->safe_pc(), tag, buf ); + logerror( "%s: %s", machine().describe_context(), buf ); } #endif } @@ -341,7 +339,7 @@ void supracan_state::supracan_tilemap_get_info_common(int layer, tile_data &tile break; default: - verboselog("maincpu", 0, "Unsupported tilemap mode: %d\n", (m_tilemap_mode[layer] & 0x7000) >> 12); + verboselog(0, "Unsupported tilemap mode: %d\n", (m_tilemap_mode[layer] & 0x7000) >> 12); break; } @@ -491,7 +489,7 @@ int supracan_state::get_tilemap_dimensions(int &xsize, int &ysize, int layer) return 3; default: - verboselog("maincpu", 0, "Unsupported tilemap size for layer %d: %04x\n", layer, select); + verboselog(0, "Unsupported tilemap size for layer %d: %04x\n", layer, select); return 0; } } @@ -1016,31 +1014,31 @@ void supracan_state::dma_w(address_space &space, int offset, uint16_t data, uint switch(offset) { case 0x00/2: // Source address MSW - verboselog("maincpu", 0, "dma_w: source msw %d: %04x\n", ch, data); + verboselog(0, "dma_w: source msw %d: %04x\n", ch, data); acan_dma_regs->source[ch] &= 0x0000ffff; acan_dma_regs->source[ch] |= data << 16; break; case 0x02/2: // Source address LSW - verboselog("maincpu", 0, "dma_w: source lsw %d: %04x\n", ch, data); + verboselog(0, "dma_w: source lsw %d: %04x\n", ch, data); acan_dma_regs->source[ch] &= 0xffff0000; acan_dma_regs->source[ch] |= data; break; case 0x04/2: // Destination address MSW - verboselog("maincpu", 0, "dma_w: dest msw %d: %04x\n", ch, data); + verboselog(0, "dma_w: dest msw %d: %04x\n", ch, data); acan_dma_regs->dest[ch] &= 0x0000ffff; acan_dma_regs->dest[ch] |= data << 16; break; case 0x06/2: // Destination address LSW - verboselog("maincpu", 0, "dma_w: dest lsw %d: %04x\n", ch, data); + verboselog(0, "dma_w: dest lsw %d: %04x\n", ch, data); acan_dma_regs->dest[ch] &= 0xffff0000; acan_dma_regs->dest[ch] |= data; break; case 0x08/2: // Byte count - verboselog("maincpu", 0, "dma_w: count %d: %04x\n", ch, data); + verboselog(0, "dma_w: count %d: %04x\n", ch, data); acan_dma_regs->count[ch] = data; break; case 0x0a/2: // Control - verboselog("maincpu", 0, "dma_w: control %d: %04x\n", ch, data); + verboselog(0, "dma_w: control %d: %04x\n", ch, data); if(data & 0x8800) { // if(data & 0x2000) @@ -1068,12 +1066,12 @@ void supracan_state::dma_w(address_space &space, int offset, uint16_t data, uint } else if(data != 0x0000) // fake DMA, used by C.U.G. { - verboselog("maincpu", 0, "dma_w: Unknown DMA kickoff value of %04x (other regs %08x, %08x, %d)\n", data, acan_dma_regs->source[ch], acan_dma_regs->dest[ch], acan_dma_regs->count[ch] + 1); + verboselog(0, "dma_w: Unknown DMA kickoff value of %04x (other regs %08x, %08x, %d)\n", data, acan_dma_regs->source[ch], acan_dma_regs->dest[ch], acan_dma_regs->count[ch] + 1); fatalerror("dma_w: Unknown DMA kickoff value of %04x (other regs %08x, %08x, %d)\n",data, acan_dma_regs->source[ch], acan_dma_regs->dest[ch], acan_dma_regs->count[ch] + 1); } break; default: - verboselog("maincpu", 0, "dma_w: Unknown register: %08x = %04x & %04x\n", 0xe90020 + (offset << 1), data, mem_mask); + verboselog(0, "dma_w: Unknown register: %08x = %04x & %04x\n", 0xe90020 + (offset << 1), data, mem_mask); break; } } @@ -1153,7 +1151,7 @@ READ8_MEMBER( supracan_state::_6502_soundmem_r ) case 0x410: // Sound IRQ enable data = m_sound_irq_enable_reg; - if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_r: IRQ enable: %04x\n", data); + if(!machine().side_effects_disabled()) verboselog(0, "supracan_soundreg_r: IRQ enable: %04x\n", data); if(!machine().side_effects_disabled()) { if(m_sound_irq_enable_reg & m_sound_irq_source_reg) @@ -1169,17 +1167,17 @@ READ8_MEMBER( supracan_state::_6502_soundmem_r ) case 0x411: // Sound IRQ source data = m_sound_irq_source_reg; m_sound_irq_source_reg = 0; - if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_r: IRQ source: %04x\n", data); + if(!machine().side_effects_disabled()) verboselog(3, "supracan_soundreg_r: IRQ source: %04x\n", data); if(!machine().side_effects_disabled()) { m_soundcpu->set_input_line(0, CLEAR_LINE); } break; case 0x420: - if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_r: Sound hardware status? (not yet implemented): %02x\n", 0); + if(!machine().side_effects_disabled()) verboselog(3, "supracan_soundreg_r: Sound hardware status? (not yet implemented): %02x\n", 0); break; case 0x422: - if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_r: Sound hardware data? (not yet implemented): %02x\n", 0); + if(!machine().side_effects_disabled()) verboselog(3, "supracan_soundreg_r: Sound hardware data? (not yet implemented): %02x\n", 0); break; case 0x404: case 0x405: @@ -1190,7 +1188,7 @@ READ8_MEMBER( supracan_state::_6502_soundmem_r ) default: if(offset >= 0x300 && offset < 0x500) { - if(!machine().side_effects_disabled()) verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_r: Unknown register %04x\n", offset); + if(!machine().side_effects_disabled()) verboselog(0, "supracan_soundreg_r: Unknown register %04x\n", offset); } break; } @@ -1205,29 +1203,29 @@ WRITE8_MEMBER( supracan_state::_6502_soundmem_w ) case 0x407: if(m_sound_cpu_68k_irq_reg &~ data) { - verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_w: sound_cpu_68k_irq_reg: %04x: Triggering M68k IRQ\n", data); + verboselog(0, "supracan_soundreg_w: sound_cpu_68k_irq_reg: %04x: Triggering M68k IRQ\n", data); m_maincpu->set_input_line(7, HOLD_LINE); } else { - verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_w: sound_cpu_68k_irq_reg: %04x\n", data); + verboselog(0, "supracan_soundreg_w: sound_cpu_68k_irq_reg: %04x\n", data); } m_sound_cpu_68k_irq_reg = data; break; case 0x410: m_sound_irq_enable_reg = data; - verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_w: IRQ enable: %02x\n", data); + verboselog(0, "supracan_soundreg_w: IRQ enable: %02x\n", data); break; case 0x420: - verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_w: Sound hardware reg data? (not yet implemented): %02x\n", data); + verboselog(3, "supracan_soundreg_w: Sound hardware reg data? (not yet implemented): %02x\n", data); break; case 0x422: - verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 3, "supracan_soundreg_w: Sound hardware reg addr? (not yet implemented): %02x\n", data); + verboselog(3, "supracan_soundreg_w: Sound hardware reg addr? (not yet implemented): %02x\n", data); break; default: if(offset >= 0x300 && offset < 0x500) { - verboselog(m_hack_68k_to_6502_access ? "maincpu" : "soundcpu", 0, "supracan_soundreg_w: Unknown register %04x = %02x\n", offset, data); + verboselog(0, "supracan_soundreg_w: Unknown register %04x = %02x\n", offset, data); } m_soundram[offset] = data; break; @@ -1379,15 +1377,11 @@ WRITE16_MEMBER( supracan_state::_68k_soundram_w ) { if(ACCESSING_BITS_8_15) { - m_hack_68k_to_6502_access = true; _6502_soundmem_w(mem, offset*2, data >> 8); - m_hack_68k_to_6502_access = false; } if(ACCESSING_BITS_0_7) { - m_hack_68k_to_6502_access = true; _6502_soundmem_w(mem, offset*2 + 1, data & 0xff); - m_hack_68k_to_6502_access = false; } } } @@ -1403,15 +1397,11 @@ READ16_MEMBER( supracan_state::_68k_soundram_r ) val = 0; if(ACCESSING_BITS_8_15) { - m_hack_68k_to_6502_access = true; val |= _6502_soundmem_r(mem, offset*2) << 8; - m_hack_68k_to_6502_access = false; } if(ACCESSING_BITS_0_7) { - m_hack_68k_to_6502_access = true; val |= _6502_soundmem_r(mem, offset*2 + 1); - m_hack_68k_to_6502_access = false; } } @@ -1425,7 +1415,7 @@ READ16_MEMBER( supracan_state::sound_r ) switch( offset ) { default: - verboselog("maincpu", 0, "sound_r: Unknown register: (%08x) & %04x\n", 0xe90000 + (offset << 1), mem_mask); + verboselog(0, "sound_r: Unknown register: (%08x) & %04x\n", 0xe90000 + (offset << 1), mem_mask); break; } @@ -1457,10 +1447,10 @@ WRITE16_MEMBER( supracan_state::sound_w ) /* Halt the sound cpu */ m_soundcpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } - verboselog("maincpu", 0, "sound cpu ctrl: %04x\n", data); + verboselog(0, "sound cpu ctrl: %04x\n", data); break; default: - verboselog("maincpu", 0, "sound_w: Unknown register: %08x = %04x & %04x\n", 0xe90000 + (offset << 1), data, mem_mask); + verboselog(0, "sound_w: Unknown register: %08x = %04x & %04x\n", 0xe90000 + (offset << 1), data, mem_mask); break; } } @@ -1475,7 +1465,7 @@ READ16_MEMBER( supracan_state::video_r ) case 0x00/2: // Video IRQ flags if(!machine().side_effects_disabled()) { - //verboselog("maincpu", 0, "read video IRQ flags (%04x)\n", data); + //verboselog(0, "read video IRQ flags (%04x)\n", data); m_maincpu->set_input_line(7, CLEAR_LINE); } break; @@ -1485,16 +1475,16 @@ READ16_MEMBER( supracan_state::video_r ) //data = 0; break; case 0x100/2: - if(!machine().side_effects_disabled()) verboselog("maincpu", 0, "read tilemap_flags[0] (%04x)\n", data); + if(!machine().side_effects_disabled()) verboselog(0, "read tilemap_flags[0] (%04x)\n", data); break; case 0x106/2: - if(!machine().side_effects_disabled()) verboselog("maincpu", 0, "read tilemap_scrolly[0] (%04x)\n", data); + if(!machine().side_effects_disabled()) verboselog(0, "read tilemap_scrolly[0] (%04x)\n", data); break; case 0x120/2: - if(!machine().side_effects_disabled()) verboselog("maincpu", 0, "read tilemap_flags[1] (%04x)\n", data); + if(!machine().side_effects_disabled()) verboselog(0, "read tilemap_flags[1] (%04x)\n", data); break; default: - if(!machine().side_effects_disabled()) verboselog("maincpu", 0, "video_r: Unknown register: %08x (%04x & %04x)\n", 0xf00000 + (offset << 1), data, mem_mask); + if(!machine().side_effects_disabled()) verboselog(0, "video_r: Unknown register: %08x (%04x & %04x)\n", 0xf00000 + (offset << 1), data, mem_mask); break; } @@ -1549,7 +1539,7 @@ TIMER_CALLBACK_MEMBER(supracan_state::supracan_video_callback) case 240: if(m_irq_mask & 1) { - verboselog("maincpu", 0, "Triggering VBL IRQ\n\n"); + verboselog(0, "Triggering VBL IRQ\n\n"); m_maincpu->set_input_line(7, HOLD_LINE); } break; @@ -1576,35 +1566,35 @@ WRITE16_MEMBER( supracan_state::video_w ) switch(offset) { case 0x10/2: // Byte count - verboselog("maincpu", 0, "sprite dma word count: %04x\n", data); + verboselog(0, "sprite dma word count: %04x\n", data); acan_sprdma_regs->count = data; break; case 0x12/2: // Destination address MSW acan_sprdma_regs->dst &= 0x0000ffff; acan_sprdma_regs->dst |= data << 16; - verboselog("maincpu", 0, "sprite dma dest msw: %04x\n", data); + verboselog(0, "sprite dma dest msw: %04x\n", data); break; case 0x14/2: // Destination address LSW acan_sprdma_regs->dst &= 0xffff0000; acan_sprdma_regs->dst |= data; - verboselog("maincpu", 0, "sprite dma dest lsw: %04x\n", data); + verboselog(0, "sprite dma dest lsw: %04x\n", data); break; case 0x16/2: // Source word increment - verboselog("maincpu", 0, "sprite dma dest word inc: %04x\n", data); + verboselog(0, "sprite dma dest word inc: %04x\n", data); acan_sprdma_regs->dst_inc = data; break; case 0x18/2: // Source address MSW acan_sprdma_regs->src &= 0x0000ffff; acan_sprdma_regs->src |= data << 16; - verboselog("maincpu", 0, "sprite dma src msw: %04x\n", data); + verboselog(0, "sprite dma src msw: %04x\n", data); break; case 0x1a/2: // Source address LSW - verboselog("maincpu", 0, "sprite dma src lsw: %04x\n", data); + verboselog(0, "sprite dma src lsw: %04x\n", data); acan_sprdma_regs->src &= 0xffff0000; acan_sprdma_regs->src |= data; break; case 0x1c/2: // Source word increment - verboselog("maincpu", 0, "sprite dma src word inc: %04x\n", data); + verboselog(0, "sprite dma src word inc: %04x\n", data); acan_sprdma_regs->src_inc = data; break; case 0x1e/2: @@ -1641,12 +1631,12 @@ WRITE16_MEMBER( supracan_state::video_w ) } else { - verboselog("maincpu", 0, "dma_w: Attempting to kick off a DMA without bit 15 set! (%04x)\n", data); + verboselog(0, "dma_w: Attempting to kick off a DMA without bit 15 set! (%04x)\n", data); } break; case 0x08/2: { - verboselog("maincpu", 3, "video_flags = %04x\n", data); + verboselog(3, "video_flags = %04x\n", data); m_video_flags = data; rectangle visarea = m_screen->visible_area(); @@ -1658,7 +1648,7 @@ WRITE16_MEMBER( supracan_state::video_w ) case 0x0a/2: { // raster interrupt - verboselog("maincpu", 0, "IRQ Trigger? = %04x\n", data); + verboselog(0, "IRQ Trigger? = %04x\n", data); if(data & 0x8000) { m_line_on_timer->adjust(m_screen->time_until_pos((data & 0x00ff), 0)); @@ -1672,7 +1662,7 @@ WRITE16_MEMBER( supracan_state::video_w ) case 0x0c/2: { - verboselog("maincpu", 0, "IRQ De-Trigger? = %04x\n", data); + verboselog(0, "IRQ De-Trigger? = %04x\n", data); if(data & 0x8000) { m_line_off_timer->adjust(m_screen->time_until_pos(data & 0x00ff, 0)); @@ -1685,48 +1675,48 @@ WRITE16_MEMBER( supracan_state::video_w ) break; /* Sprites */ - case 0x20/2: m_sprite_base_addr = data << 2; verboselog("maincpu", 0, "sprite_base_addr = %04x\n", data); break; - case 0x22/2: m_sprite_count = data+1; verboselog("maincpu", 0, "sprite_count = %d\n", data+1); break; - case 0x26/2: m_sprite_flags = data; verboselog("maincpu", 0, "sprite_flags = %04x\n", data); break; + case 0x20/2: m_sprite_base_addr = data << 2; verboselog(0, "sprite_base_addr = %04x\n", data); break; + case 0x22/2: m_sprite_count = data+1; verboselog(0, "sprite_count = %d\n", data+1); break; + case 0x26/2: m_sprite_flags = data; verboselog(0, "sprite_flags = %04x\n", data); break; /* Tilemap 0 */ - case 0x100/2: m_tilemap_flags[0] = data; verboselog("maincpu", 3, "tilemap_flags[0] = %04x\n", data); break; - case 0x104/2: m_tilemap_scrollx[0] = data; verboselog("maincpu", 3, "tilemap_scrollx[0] = %04x\n", data); break; - case 0x106/2: m_tilemap_scrolly[0] = data; verboselog("maincpu", 3, "tilemap_scrolly[0] = %04x\n", data); break; - case 0x108/2: m_tilemap_base_addr[0] = (data) << 1; verboselog("maincpu", 3, "tilemap_base_addr[0] = %05x\n", data << 2); break; - case 0x10a/2: m_tilemap_mode[0] = data; verboselog("maincpu", 3, "tilemap_mode[0] = %04x\n", data); break; + case 0x100/2: m_tilemap_flags[0] = data; verboselog(3, "tilemap_flags[0] = %04x\n", data); break; + case 0x104/2: m_tilemap_scrollx[0] = data; verboselog(3, "tilemap_scrollx[0] = %04x\n", data); break; + case 0x106/2: m_tilemap_scrolly[0] = data; verboselog(3, "tilemap_scrolly[0] = %04x\n", data); break; + case 0x108/2: m_tilemap_base_addr[0] = (data) << 1; verboselog(3, "tilemap_base_addr[0] = %05x\n", data << 2); break; + case 0x10a/2: m_tilemap_mode[0] = data; verboselog(3, "tilemap_mode[0] = %04x\n", data); break; /* Tilemap 1 */ - case 0x120/2: m_tilemap_flags[1] = data; verboselog("maincpu", 3, "tilemap_flags[1] = %04x\n", data); break; - case 0x124/2: m_tilemap_scrollx[1] = data; verboselog("maincpu", 3, "tilemap_scrollx[1] = %04x\n", data); break; - case 0x126/2: m_tilemap_scrolly[1] = data; verboselog("maincpu", 3, "tilemap_scrolly[1] = %04x\n", data); break; - case 0x128/2: m_tilemap_base_addr[1] = (data) << 1; verboselog("maincpu", 3, "tilemap_base_addr[1] = %05x\n", data << 2); break; - case 0x12a/2: m_tilemap_mode[1] = data; verboselog("maincpu", 3, "tilemap_mode[1] = %04x\n", data); break; + case 0x120/2: m_tilemap_flags[1] = data; verboselog(3, "tilemap_flags[1] = %04x\n", data); break; + case 0x124/2: m_tilemap_scrollx[1] = data; verboselog(3, "tilemap_scrollx[1] = %04x\n", data); break; + case 0x126/2: m_tilemap_scrolly[1] = data; verboselog(3, "tilemap_scrolly[1] = %04x\n", data); break; + case 0x128/2: m_tilemap_base_addr[1] = (data) << 1; verboselog(3, "tilemap_base_addr[1] = %05x\n", data << 2); break; + case 0x12a/2: m_tilemap_mode[1] = data; verboselog(3, "tilemap_mode[1] = %04x\n", data); break; /* Tilemap 2? */ - case 0x140/2: m_tilemap_flags[2] = data; verboselog("maincpu", 0, "tilemap_flags[2] = %04x\n", data); break; - case 0x144/2: m_tilemap_scrollx[2] = data; verboselog("maincpu", 0, "tilemap_scrollx[2] = %04x\n", data); break; - case 0x146/2: m_tilemap_scrolly[2] = data; verboselog("maincpu", 0, "tilemap_scrolly[2] = %04x\n", data); break; - case 0x148/2: m_tilemap_base_addr[2] = (data) << 1; verboselog("maincpu", 0, "tilemap_base_addr[2] = %05x\n", data << 2); break; - case 0x14a/2: m_tilemap_mode[2] = data; verboselog("maincpu", 0, "tilemap_mode[2] = %04x\n", data); break; + case 0x140/2: m_tilemap_flags[2] = data; verboselog(0, "tilemap_flags[2] = %04x\n", data); break; + case 0x144/2: m_tilemap_scrollx[2] = data; verboselog(0, "tilemap_scrollx[2] = %04x\n", data); break; + case 0x146/2: m_tilemap_scrolly[2] = data; verboselog(0, "tilemap_scrolly[2] = %04x\n", data); break; + case 0x148/2: m_tilemap_base_addr[2] = (data) << 1; verboselog(0, "tilemap_base_addr[2] = %05x\n", data << 2); break; + case 0x14a/2: m_tilemap_mode[2] = data; verboselog(0, "tilemap_mode[2] = %04x\n", data); break; /* ROZ */ - case 0x180/2: m_roz_mode = data; verboselog("maincpu", 3, "roz_mode = %04x\n", data); break; - case 0x184/2: m_roz_scrollx = (data << 16) | (m_roz_scrollx & 0xffff); m_roz_changed |= 1; verboselog("maincpu", 3, "roz_scrollx = %08x\n", m_roz_scrollx); break; - case 0x186/2: m_roz_scrollx = (data) | (m_roz_scrollx & 0xffff0000); m_roz_changed |= 1; verboselog("maincpu", 3, "roz_scrollx = %08x\n", m_roz_scrollx); break; - case 0x188/2: m_roz_scrolly = (data << 16) | (m_roz_scrolly & 0xffff); m_roz_changed |= 2; verboselog("maincpu", 3, "roz_scrolly = %08x\n", m_roz_scrolly); break; - case 0x18a/2: m_roz_scrolly = (data) | (m_roz_scrolly & 0xffff0000); m_roz_changed |= 2; verboselog("maincpu", 3, "roz_scrolly = %08x\n", m_roz_scrolly); break; - case 0x18c/2: m_roz_coeffa = data; verboselog("maincpu", 3, "roz_coeffa = %04x\n", data); break; - case 0x18e/2: m_roz_coeffb = data; verboselog("maincpu", 3, "roz_coeffb = %04x\n", data); break; - case 0x190/2: m_roz_coeffc = data; verboselog("maincpu", 3, "roz_coeffc = %04x\n", data); break; - case 0x192/2: m_roz_coeffd = data; verboselog("maincpu", 3, "roz_coeffd = %04x\n", data); break; - case 0x194/2: m_roz_base_addr = (data) << 1; verboselog("maincpu", 3, "roz_base_addr = %05x\n", data << 2); break; - case 0x196/2: m_roz_tile_bank = data; verboselog("maincpu", 3, "roz_tile_bank = %04x\n", data); break; //tile bank - case 0x198/2: m_roz_unk_base0 = data << 2; verboselog("maincpu", 3, "roz_unk_base0 = %05x\n", data << 2); break; - case 0x19a/2: m_roz_unk_base1 = data << 2; verboselog("maincpu", 3, "roz_unk_base1 = %05x\n", data << 2); break; - case 0x19e/2: m_roz_unk_base2 = data << 2; verboselog("maincpu", 3, "roz_unk_base2 = %05x\n", data << 2); break; + case 0x180/2: m_roz_mode = data; verboselog(3, "roz_mode = %04x\n", data); break; + case 0x184/2: m_roz_scrollx = (data << 16) | (m_roz_scrollx & 0xffff); m_roz_changed |= 1; verboselog(3, "roz_scrollx = %08x\n", m_roz_scrollx); break; + case 0x186/2: m_roz_scrollx = (data) | (m_roz_scrollx & 0xffff0000); m_roz_changed |= 1; verboselog(3, "roz_scrollx = %08x\n", m_roz_scrollx); break; + case 0x188/2: m_roz_scrolly = (data << 16) | (m_roz_scrolly & 0xffff); m_roz_changed |= 2; verboselog(3, "roz_scrolly = %08x\n", m_roz_scrolly); break; + case 0x18a/2: m_roz_scrolly = (data) | (m_roz_scrolly & 0xffff0000); m_roz_changed |= 2; verboselog(3, "roz_scrolly = %08x\n", m_roz_scrolly); break; + case 0x18c/2: m_roz_coeffa = data; verboselog(3, "roz_coeffa = %04x\n", data); break; + case 0x18e/2: m_roz_coeffb = data; verboselog(3, "roz_coeffb = %04x\n", data); break; + case 0x190/2: m_roz_coeffc = data; verboselog(3, "roz_coeffc = %04x\n", data); break; + case 0x192/2: m_roz_coeffd = data; verboselog(3, "roz_coeffd = %04x\n", data); break; + case 0x194/2: m_roz_base_addr = (data) << 1; verboselog(3, "roz_base_addr = %05x\n", data << 2); break; + case 0x196/2: m_roz_tile_bank = data; verboselog(3, "roz_tile_bank = %04x\n", data); break; //tile bank + case 0x198/2: m_roz_unk_base0 = data << 2; verboselog(3, "roz_unk_base0 = %05x\n", data << 2); break; + case 0x19a/2: m_roz_unk_base1 = data << 2; verboselog(3, "roz_unk_base1 = %05x\n", data << 2); break; + case 0x19e/2: m_roz_unk_base2 = data << 2; verboselog(3, "roz_unk_base2 = %05x\n", data << 2); break; - case 0x1d0/2: m_unk_1d0 = data; verboselog("maincpu", 3, "unk_1d0 = %04x\n", data); break; + case 0x1d0/2: m_unk_1d0 = data; verboselog(3, "unk_1d0 = %04x\n", data); break; @@ -1739,10 +1729,10 @@ WRITE16_MEMBER( supracan_state::video_w ) m_maincpu->set_input_line(7, CLEAR_LINE); } #endif - verboselog("maincpu", 3, "irq_mask = %04x\n", data); + verboselog(3, "irq_mask = %04x\n", data); break; default: - verboselog("maincpu", 0, "video_w: Unknown register: %08x = %04x & %04x\n", 0xf00000 + (offset << 1), data, mem_mask); + verboselog(0, "video_w: Unknown register: %08x = %04x & %04x\n", 0xf00000 + (offset << 1), data, mem_mask); break; } // m_video_regs[offset] = data; diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp index e2f223970bb..d4cbdd897c9 100644 --- a/src/mame/drivers/surpratk.cpp +++ b/src/mame/drivers/surpratk.cpp @@ -29,7 +29,7 @@ INTERRUPT_GEN_MEMBER(surpratk_state::surpratk_interrupt) WRITE8_MEMBER(surpratk_state::surpratk_videobank_w) { if (data & 0xf8) - logerror("%04x: videobank = %02x\n",m_maincpu->pc(),data); + logerror("%s: videobank = %02x\n", machine().describe_context(), data); /* bit 0 = select 053245 at 0000-07ff */ /* bit 1 = select palette at 0000-07ff */ @@ -164,7 +164,7 @@ void surpratk_state::machine_reset() WRITE8_MEMBER( surpratk_state::banking_callback ) { -// logerror("%04x: setlines %02x\n", machine().device("maincpu")->safe_pc(), data); +// logerror("%s: setlines %02x\n", machine().describe_context(), data); membank("bank1")->set_entry(data & 0x1f); } diff --git a/src/mame/drivers/taitowlf.cpp b/src/mame/drivers/taitowlf.cpp index 9014573d659..e8775976818 100644 --- a/src/mame/drivers/taitowlf.cpp +++ b/src/mame/drivers/taitowlf.cpp @@ -119,7 +119,7 @@ uint8_t taitowlf_state::mtxc_config_r(int function, int reg) void taitowlf_state::mtxc_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:MTXC: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:MTXC: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); switch(reg) { @@ -202,7 +202,7 @@ uint8_t taitowlf_state::piix4_config_r(int function, int reg) void taitowlf_state::piix4_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); m_piix4_config_reg[function][reg] = data; } diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp index 741243b114c..73b8fad51a5 100644 --- a/src/mame/drivers/thunderx.cpp +++ b/src/mame/drivers/thunderx.cpp @@ -697,7 +697,7 @@ MACHINE_CONFIG_END WRITE8_MEMBER( thunderx_state::banking_callback ) { - //logerror("thunderx %04x: bank select %02x\n", machine().device("maincpu")->safe_pc(), data); + //logerror("%s thunderx bank select %02x\n", machine().describe_context(), data); m_rombank->set_entry(data & 0x0f); } diff --git a/src/mame/drivers/vegas.cpp b/src/mame/drivers/vegas.cpp index 3cacc0d19f1..1a53fd6f1de 100644 --- a/src/mame/drivers/vegas.cpp +++ b/src/mame/drivers/vegas.cpp @@ -559,7 +559,7 @@ WRITE32_MEMBER( vegas_state::timekeeper_w ) m_cmos_unlocked = 0; } else - logerror("%08X:timekeeper_w(%04X,%08X & %08X) without CMOS unlocked\n", safe_pc(), offset, data, mem_mask); + logerror("%s: timekeeper_w(%04X,%08X & %08X) without CMOS unlocked\n", machine().describe_context(), offset, data, mem_mask); } @@ -679,7 +679,7 @@ READ8_MEMBER(vegas_state::sio_r) result = m_sio_irq_enable; if (LOG_SIO) { std::string sioBitSel = sioIRQString(result); - logerror("%08X: sio_r: INTR ENABLE 0x%02x %s\n", machine().device("maincpu")->safe_pc(), result, sioBitSel); + logerror("%s: sio_r: INTR ENABLE 0x%02x %s\n", machine().describe_context(), result, sioBitSel); } break; case 2: @@ -687,7 +687,7 @@ READ8_MEMBER(vegas_state::sio_r) result = m_sio_irq_state & m_sio_irq_enable; if (LOG_SIO) { std::string sioBitSel = sioIRQString(result); - logerror("%08X: sio_r: INTR CAUSE 0x%02x %s\n", machine().device("maincpu")->safe_pc(), result, sioBitSel); + logerror("%s: sio_r: INTR CAUSE 0x%02x %s\n", machine().describe_context(), result, sioBitSel); } //m_sio_irq_state &= ~0x02; break; @@ -696,7 +696,7 @@ READ8_MEMBER(vegas_state::sio_r) result = m_sio_irq_state; if (LOG_SIO) { std::string sioBitSel = sioIRQString(result); - logerror("%08X: sio_r: INTR STATUS 0x%02x %s\n", machine().device("maincpu")->safe_pc(), result, sioBitSel); + logerror("%s: sio_r: INTR STATUS 0x%02x %s\n", machine().describe_context(), result, sioBitSel); } break; case 4: @@ -736,7 +736,7 @@ READ8_MEMBER(vegas_state::sio_r) } } if (LOG_SIO && (index < 0x1 || index > 0x4)) - logerror("%08X: sio_r: offset: %08x index: %d result: %02X\n", machine().device("maincpu")->safe_pc(), offset, index, result); + logerror("%s: sio_r: offset: %08x index: %d result: %02X\n", machine().describe_context(), offset, index, result); return result; } @@ -848,7 +848,7 @@ WRITE8_MEMBER(vegas_state::cpu_io_w) } if (LOG_SIO) { popmessage("System LED: %C", digit); - //logerror("%08X: cpu_io_w System LED offset %X = %02X '%c'\n", machine().device("maincpu")->safe_pc(), offset, data, digit); + //logerror("%s: cpu_io_w System LED offset %X = %02X '%c'\n", machine().describe_context(), offset, data, digit); } } break; @@ -861,19 +861,19 @@ WRITE8_MEMBER(vegas_state::cpu_io_w) reset_sio(); } if (LOG_SIO) - logerror("%08X: cpu_io_w PLD Config offset %X = %02X\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%s: cpu_io_w PLD Config offset %X = %02X\n", machine().describe_context(), offset, data); break; case 2: if (LOG_SIO && (m_cpuio_data[3] & 0x1)) - logerror("%08X: cpu_io_w PLD Status / Jamma Serial Sense offset %X = %02X\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%s: cpu_io_w PLD Status / Jamma Serial Sense offset %X = %02X\n", machine().describe_context(), offset, data); break; case 3: // Bit 0: Enable SIO, Bit 1: Enable SIO_R0/IDE, Bit 2: Enable PCI if (LOG_SIO) - logerror("%08X: cpu_io_w System Reset offset %X = %02X\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%s: cpu_io_w System Reset offset %X = %02X\n", machine().describe_context(), offset, data); break; default: - logerror("%08X: cpu_io_w unknown offset %X = %02X\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%s: cpu_io_w unknown offset %X = %02X\n", machine().describe_context(), offset, data); break; } } @@ -884,7 +884,7 @@ READ8_MEMBER( vegas_state::cpu_io_r ) if (offset < 4) result = m_cpuio_data[offset]; if (LOG_SIO && !(!(m_cpuio_data[3] & 0x1))) - logerror("%08X:cpu_io_r offset %X = %02X\n", machine().device("maincpu")->safe_pc(), offset, result); + logerror("%s:cpu_io_r offset %X = %02X\n", machine().describe_context(), offset, result); return result; } @@ -898,7 +898,7 @@ READ8_MEMBER( vegas_state::cpu_io_r ) READ32_MEMBER( vegas_state::analog_port_r ) { - //logerror("%08X: analog_port_r = %08X & %08X\n", machine().device("maincpu")->safe_pc(), m_pending_analog_read, mem_mask); + //logerror("%s: analog_port_r = %08X & %08X\n", machine().describe_context(), m_pending_analog_read, mem_mask); // Clear interrupt m_sio_irq_state &= ~0x02; if (m_sio_irq_enable & 0x02) { @@ -936,7 +936,7 @@ WRITE32_MEMBER( vegas_state::analog_port_w ) //osd_printf_info("wheel calibration comlete wheel: %02x\n", currValue); } //logerror("analog_port_w: wheel_force: %i read: %i\n", m_wheel_force, m_pending_analog_read); - //logerror("%08X: analog_port_w = %08X & %08X index = %d\n", machine().device("maincpu")->safe_pc(), data, mem_mask, index); + //logerror("%s: analog_port_w = %08X & %08X index = %d\n", machine().describe_context(), data, mem_mask, index); if (m_sio_irq_enable & 0x02) { m_sio_irq_state |= 0x02; update_sio_irqs(); @@ -997,13 +997,13 @@ READ32_MEMBER(vegas_state::unknown_r) READ8_MEMBER(vegas_state::parallel_r) { uint8_t result = 0x7; - logerror("%06X: parallel_r %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, result); + logerror("%s: parallel_r %08x = %02x\n", machine().describe_context(), offset, result); return result; } WRITE8_MEMBER(vegas_state::parallel_w) { - logerror("%06X: parallel_w %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%s: parallel_w %08x = %02x\n", machine().describe_context(), offset, data); } /************************************* @@ -1011,7 +1011,7 @@ WRITE8_MEMBER(vegas_state::parallel_w) *************************************/ WRITE8_MEMBER(vegas_state::mpsreset_w) { - logerror("%06X: mpsreset_w %08x = %02x\n", machine().device("maincpu")->safe_pc(), offset, data); + logerror("%s: mpsreset_w %08x = %02x\n", machine().describe_context(), offset, data); } /************************************* @@ -1061,11 +1061,11 @@ CUSTOM_INPUT_MEMBER(vegas_state::i40_r) data = ~index & 0xf; break; default: - //logerror("%08X: i40_r: select: %x index: %d data: %x\n", machine().device("maincpu")->safe_pc(), m_i40_data, index, data); + //logerror("%s: i40_r: select: %x index: %d data: %x\n", machine().describe_context(), m_i40_data, index, data); break; } //if (m_i40_data & 0x1000) - // printf("%08X: i40_r: select: %x index: %d data: %x\n", machine().device("maincpu")->safe_pc(), m_i40_data, index, data); + // printf("%s: i40_r: select: %x index: %d data: %x\n", machine().describe_context().c_str(), m_i40_data, index, data); //m_i40_data &= ~0x1000; return data; } diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp index 01d8c772b04..6b8f48fcc42 100644 --- a/src/mame/drivers/vendetta.cpp +++ b/src/mame/drivers/vendetta.cpp @@ -422,7 +422,7 @@ void vendetta_state::machine_reset() WRITE8_MEMBER( vendetta_state::banking_callback ) { if (data >= 0x1c) - logerror("PC = %04x : Unknown bank selected %02x\n", machine().device("maincpu")->safe_pc(), data); + logerror("%s Unknown bank selected %02x\n", machine().describe_context(), data); else membank("bank1")->set_entry(data); } diff --git a/src/mame/drivers/viper.cpp b/src/mame/drivers/viper.cpp index 1ee098762cf..dd66728ec56 100644 --- a/src/mame/drivers/viper.cpp +++ b/src/mame/drivers/viper.cpp @@ -1931,7 +1931,7 @@ READ64_MEMBER(viper_state::e70000_r) m_ds2430_bit_timer->reset(); m_ds2430_bit_timer->start_time(); -// printf("e70000_r: %08X (mask %08X%08X) at %08X\n", offset, (uint32_t)(mem_mask >> 32), (uint32_t)mem_mask, cpu->safe_pc()); +// printf("%s e70000_r: %08X (mask %08X%08X)\n", machine().describe_context().c_str(), offset, (uint32_t)(mem_mask >> 32), (uint32_t)mem_mask); } return 0; @@ -1971,7 +1971,7 @@ WRITE64_MEMBER(viper_state::unk1a_w) { if (ACCESSING_BITS_56_63) { - // printf("unk1a_w: %08X%08X, %08X (mask %08X%08X) at %08X\n", (uint32_t)(data >> 32), (uint32_t)data, offset, (uint32_t)(mem_mask >> 32), (uint32_t)mem_mask, cpu->safe_pc()); + // printf("%s unk1a_w: %08X%08X, %08X (mask %08X%08X) at %08X\n", machine().describe_context().c_str(), (uint32_t)(data >> 32), (uint32_t)data, offset, (uint32_t)(mem_mask >> 32), (uint32_t)mem_mask); } } @@ -1980,7 +1980,7 @@ WRITE64_MEMBER(viper_state::unk1b_w) if (ACCESSING_BITS_56_63) { m_ds2430_unk_status = 0; - // printf("unk1b_w: %08X%08X, %08X (mask %08X%08X) at %08X\n", (uint32_t)(data >> 32), (uint32_t)data, offset, (uint32_t)(mem_mask >> 32), (uint32_t)mem_mask, cpu->safe_pc()); + // printf("%s unk1b_w: %08X%08X, %08X (mask %08X%08X) at %08X\n", machine().describe_context().c_str(), (uint32_t)(data >> 32), (uint32_t)data, offset, (uint32_t)(mem_mask >> 32), (uint32_t)mem_mask); } } diff --git a/src/mame/drivers/voyager.cpp b/src/mame/drivers/voyager.cpp index 4b2ba7c8e5d..21423bfc76b 100644 --- a/src/mame/drivers/voyager.cpp +++ b/src/mame/drivers/voyager.cpp @@ -82,7 +82,7 @@ uint8_t voyager_state::mtxc_config_r(int function, int reg) void voyager_state::mtxc_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:MTXC: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:MTXC: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); switch(reg) { @@ -181,7 +181,7 @@ uint8_t voyager_state::piix4_config_r(int function, int reg) void voyager_state::piix4_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); m_piix4_config_reg[function][reg] = data; } diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp index 9e7102ff60c..bb899a1c156 100644 --- a/src/mame/drivers/wheelfir.cpp +++ b/src/mame/drivers/wheelfir.cpp @@ -429,7 +429,7 @@ WRITE16_MEMBER(wheelfir_state::wheelfir_blit_w) { vpage=LAYER_BG; /* - printf("bg -> %d %d %d %d %d %d @ %x\n",dst_x0,dst_y0, dst_x1,dst_y1, dst_x1-dst_x0, dst_y1-dst_y0,space.device().safe_pc()); + printf("%s bg -> %d %d %d %d %d %d @ %x\n",machine().describe_context().c_str(), dst_x0,dst_y0, dst_x1,dst_y1, dst_x1-dst_x0, dst_y1-dst_y0); for(int i=0;i<16;++i) { @@ -538,8 +538,8 @@ WRITE16_MEMBER(wheelfir_state::wheelfir_7c0000_w) { if (ACCESSING_BITS_8_15) { - //{uint16_t x = data & 0xf800; static int y = -1; if (x != y) { y = x; printf("%s wheelfir_7c0000_w %d%d%d%d%d\n", machine().describe_context(), BIT(data, 15), BIT(data, 14), BIT(data, 13), BIT(data, 12), BIT(data, 11)); }} - //{uint16_t x = data & 0x0700; static int y = -1; if (x != y) { y = x; printf("%s eeprom write %d%d%d\n", machine().describe_context(), BIT(data, 10), BIT(data, 9), BIT(data, 8)); }} + //{uint16_t x = data & 0xf800; static int y = -1; if (x != y) { y = x; printf("%s wheelfir_7c0000_w %d%d%d%d%d\n", machine().describe_context().c_str(), BIT(data, 15), BIT(data, 14), BIT(data, 13), BIT(data, 12), BIT(data, 11)); }} + //{uint16_t x = data & 0x0700; static int y = -1; if (x != y) { y = x; printf("%s eeprom write %d%d%d\n", machine().describe_context().c_str(), BIT(data, 10), BIT(data, 9), BIT(data, 8)); }} m_eeprom->di_write(BIT(data, 9)); m_eeprom->clk_write(BIT(data, 8)); m_eeprom->cs_write(BIT(data, 10)); @@ -561,7 +561,7 @@ READ16_MEMBER(wheelfir_state::wheelfir_7c0000_r) { data |= (machine().rand() & 0x2000); // ? data |= m_eeprom->do_read() << 15; - //printf("%s eeprom read %04x %04x\n", machine().describe_context(), data, mem_mask); + //printf("%s eeprom read %04x %04x\n", machine().describe_context().c_str(), data, mem_mask); } if (ACCESSING_BITS_0_7) diff --git a/src/mame/drivers/xtom3d.cpp b/src/mame/drivers/xtom3d.cpp index 8ec5817ac35..4aa6b37b8fc 100644 --- a/src/mame/drivers/xtom3d.cpp +++ b/src/mame/drivers/xtom3d.cpp @@ -244,7 +244,7 @@ uint8_t xtom3d_state::piix4_config_r(int function, int reg) void xtom3d_state::piix4_config_w(int function, int reg, uint8_t data) { -// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context(), function, reg, data); +// osd_printf_debug("%s:PIIX4: write %d, %02X, %02X\n", machine().describe_context().c_str(), function, reg, data); m_piix4_config_reg[function][reg] = data; } diff --git a/src/mame/drivers/zaurus.cpp b/src/mame/drivers/zaurus.cpp index dde72fa0571..588ed5a55ab 100644 --- a/src/mame/drivers/zaurus.cpp +++ b/src/mame/drivers/zaurus.cpp @@ -1467,7 +1467,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t& device, int n_level, c vsprintf( buf, s_fmt, v ); va_end( v ); device.logerror( "%s: %s", device.machine().describe_context(), buf ); - //printf( "%s: %s", device.machine().describe_context(), buf ); + //printf( "%s: %s", device.machine().describe_context().c_str(), buf ); } } |