diff options
author | 2018-01-05 08:33:59 +0100 | |
---|---|---|
committer | 2018-01-05 08:35:26 +0100 | |
commit | c28c7b92690eb6aaa6c0e91b60cea787883f0789 (patch) | |
tree | ecbfc93c171d43a956b768bb543190a3562c6c37 | |
parent | bc9d99d58b7264fc853662cbd4e311c0f1dbe9dd (diff) |
Extended time! All space.device() removed from comments (nw)
59 files changed, 158 insertions, 192 deletions
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp index 5784c8b2e41..cc5cbab5176 100644 --- a/src/devices/bus/a2bus/a2cffa.cpp +++ b/src/devices/bus/a2bus/a2cffa.cpp @@ -235,7 +235,6 @@ void a2bus_cffa2000_device::write_c800(uint16_t offset, uint8_t data) { if (!m_writeprotect) { -// printf("Write %02x to EEPROM at %x (PC=%x)\n", data, offset, space.device().safe_pc()); m_eeprom[offset + 0x800] = data; } } diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp index 415ba20cbea..8d923be6345 100644 --- a/src/devices/bus/a2bus/a2memexp.cpp +++ b/src/devices/bus/a2bus/a2memexp.cpp @@ -133,8 +133,6 @@ uint8_t a2bus_memexp_device::read_c0nx(uint8_t offset) m_regs[2] = ((m_liveptr>>16) & 0xff) | m_bankhior; } -// printf("Read c0n%x (PC=%x) = %02x\n", offset, space.device().safe_pc(), retval); - return retval; } @@ -145,8 +143,6 @@ uint8_t a2bus_memexp_device::read_c0nx(uint8_t offset) void a2bus_memexp_device::write_c0nx(uint8_t offset, uint8_t data) { -// printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc()); - switch (offset) { case 0: diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp index ab00183ac7f..4711c1b5597 100644 --- a/src/devices/bus/a2bus/a2mockingboard.cpp +++ b/src/devices/bus/a2bus/a2mockingboard.cpp @@ -163,7 +163,6 @@ void a2bus_ayboard_device::device_reset() uint8_t a2bus_ayboard_device::read_cnxx(uint8_t offset) { -// logerror("Mockingboard(%d): read @ Cn%02X (PC=%x)\n", m_slot, offset, space.device().safe_pc()); if (m_isPhasor) { uint8_t retVal = 0; @@ -229,8 +228,6 @@ void a2bus_ayboard_device::write_cnxx(uint8_t offset, uint8_t data) viaSel = (offset & 0x80) ? 2 : 1; } -// logerror("Phasor(%d): write %02x to Cn%02X (PC=%x) (native %d viaSel %d)\n", m_slot, data, offset, space.device().safe_pc(), m_PhasorNative ? 1 : 0, viaSel); - if (viaSel & 1) { m_via1->write(machine().dummy_space(), offset&0xf, data); diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp index c75e338195b..83a707aa4e9 100644 --- a/src/devices/bus/a2bus/a2videoterm.cpp +++ b/src/devices/bus/a2bus/a2videoterm.cpp @@ -238,8 +238,6 @@ void a2bus_videx80_device::device_reset() uint8_t a2bus_videx80_device::read_c0nx(uint8_t offset) { -// printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc()); - m_rambank = ((offset>>2) & 3) * 512; if (offset == 1) @@ -257,8 +255,6 @@ uint8_t a2bus_videx80_device::read_c0nx(uint8_t offset) void a2bus_videx80_device::write_c0nx(uint8_t offset, uint8_t data) { -// printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc()); - if (offset == 0) { m_crtc->address_w(data); diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp index e3bcec5c442..dcf8bb2d1aa 100644 --- a/src/devices/bus/gba/rom.cpp +++ b/src/devices/bus/gba/rom.cpp @@ -953,7 +953,6 @@ uint32_t gba_eeprom_device::read() switch (m_state) { case EEP_IDLE: -// printf("eeprom_r: @ %x, mask %08x (state %d) (PC=%x) = %d\n", offset, ~mem_mask, m_state, activecpu_get_pc(), 1); return 0x00010001; // "ready" case EEP_READFIRST: @@ -992,17 +991,13 @@ uint32_t gba_eeprom_device::read() m_state = EEP_IDLE; } -// printf("out = %08x\n", out); -// printf("eeprom_r: @ %x, mask %08x (state %d) (PC=%x) = %08x\n", offset, ~mem_mask, m_state, activecpu_get_pc(), out); return out; } -// printf("eeprom_r: @ %x, mask %08x (state %d) (PC=%x) = %d\n", offset, ~mem_mask, m_state, space.device().safe_pc(), 0); return 0; } void gba_eeprom_device::write(uint32_t data) { -// printf("eeprom_w: %x @ %x (state %d) (PC=%x)\n", data, offset, m_state, space.device().safe_pc()); switch (m_state) { case EEP_IDLE: diff --git a/src/devices/bus/nubus/nubus_m2hires.cpp b/src/devices/bus/nubus/nubus_m2hires.cpp index cfa9f84e13a..4c0481b16fc 100644 --- a/src/devices/bus/nubus/nubus_m2hires.cpp +++ b/src/devices/bus/nubus/nubus_m2hires.cpp @@ -90,7 +90,7 @@ void nubus_m2hires_device::device_start() slotspace = get_slotspace(); -// printf("[m2hires %p] slotspace = %x\n", this, slotspace); +// logerror("[m2hires %p] slotspace = %x\n", this, slotspace); m_vram.resize(VRAM_SIZE); m_vram32 = (uint32_t *)&m_vram[0]; @@ -245,7 +245,7 @@ WRITE32_MEMBER( nubus_m2hires_device::m2hires_w ) break; case 0x5038: // DAC control -// printf("%08x to DAC control (PC=%x)\n", data, space.device().safe_pc()); +// logerror("%08x to DAC control %s\n", data, machine().describe_context()); m_clutoffs = (data>>24)&0xff; break; @@ -254,7 +254,7 @@ WRITE32_MEMBER( nubus_m2hires_device::m2hires_w ) if (m_count == 3) { -// printf("RAMDAC: color %d = %02x %02x %02x (PC=%x)\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], space.device().safe_pc() ); +// logerror("RAMDAC: color %d = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context() ); m_palette[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]); m_clutoffs++; if (m_clutoffs > 255) @@ -275,7 +275,7 @@ WRITE32_MEMBER( nubus_m2hires_device::m2hires_w ) break; default: -// printf("m2hires_w: %08x @ %x, mask %08x (PC=%x)\n", data, offset, mem_mask, space.device().safe_pc()); +// logerror("m2hires_w: %08x @ %x, mask %08x %s\n", data, offset, mem_mask, machine().describe_context()); break; } } @@ -289,7 +289,7 @@ READ32_MEMBER( nubus_m2hires_device::m2hires_r ) } /* else { - printf("m2hires_r: @ %x, mask %08x (PC=%x)\n", offset, mem_mask, space.device().safe_pc()); + logerror("m2hires_r: @ %x, mask %08x %s\n", offset, mem_mask, machine().describe_context()); }*/ return 0; diff --git a/src/devices/bus/nubus/nubus_m2video.cpp b/src/devices/bus/nubus/nubus_m2video.cpp index 22f958c53fa..a61859f0f40 100644 --- a/src/devices/bus/nubus/nubus_m2video.cpp +++ b/src/devices/bus/nubus/nubus_m2video.cpp @@ -92,7 +92,7 @@ void nubus_m2video_device::device_start() slotspace = get_slotspace(); -// printf("[m2video %p] slotspace = %x\n", this, slotspace); +// logerror("[m2video %p] slotspace = %x\n", this, slotspace); m_vram.resize(VRAM_SIZE); m_vram32 = (uint32_t *)&m_vram[0]; @@ -246,7 +246,7 @@ WRITE32_MEMBER( nubus_m2video_device::m2video_w ) break; case 0x4007: // DAC control -// printf("%08x to DAC control (PC=%x)\n", data, space.device().safe_pc()); +// logerror("%08x to DAC control %s\n", data, machine().describe_context()); m_clutoffs = (data>>24)&0xff; break; @@ -255,7 +255,7 @@ WRITE32_MEMBER( nubus_m2video_device::m2video_w ) if (m_count == 3) { -// printf("RAMDAC: color %02x = %02x %02x %02x (PC=%x)\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], space.device().safe_pc() ); +// logerror("RAMDAC: color %02x = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context() ); m_palette[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]); m_clutoffs++; if (m_clutoffs > 255) @@ -276,7 +276,7 @@ WRITE32_MEMBER( nubus_m2video_device::m2video_w ) break; default: -// printf("m2video_w: %08x @ %x, mask %08x (PC=%x)\n", data, offset, mem_mask, space.device().safe_pc()); +// logerror("m2video_w: %08x @ %x, mask %08x %s\n", data, offset, mem_mask, machine().describe_context()); break; } } @@ -290,7 +290,7 @@ READ32_MEMBER( nubus_m2video_device::m2video_r ) } else { -// printf("m2video_r: @ %x, mask %08x (PC=%x)\n", offset, mem_mask, space.device().safe_pc()); +// logerror("m2video_r: @ %x, mask %08x %s\n", offset, mem_mask, machine().describe_context()); } return 0; diff --git a/src/devices/bus/nubus/nubus_spec8.cpp b/src/devices/bus/nubus/nubus_spec8.cpp index 1cc905670a6..d9c19173914 100644 --- a/src/devices/bus/nubus/nubus_spec8.cpp +++ b/src/devices/bus/nubus/nubus_spec8.cpp @@ -259,7 +259,7 @@ WRITE32_MEMBER( nubus_spec8s3_device::spec8s3_w ) { int actual_color = bitswap<8>(m_clutoffs, 0, 1, 2, 3, 4, 5, 6, 7); -// printf("RAMDAC: color %d = %02x %02x %02x (PC=%x)\n", actual_color, m_colors[0], m_colors[1], m_colors[2], space.device().safe_pc() ); +// logerror("RAMDAC: color %d = %02x %02x %02x %s\n", actual_color, m_colors[0], m_colors[1], m_colors[2], machine().describe_context() ); m_palette[actual_color] = rgb_t(m_colors[0], m_colors[1], m_colors[2]); m_clutoffs++; if (m_clutoffs > 255) @@ -274,7 +274,7 @@ WRITE32_MEMBER( nubus_spec8s3_device::spec8s3_w ) if ((m_parameter == 2) && (data != 0xffffffff)) { data &= 0xff; -// printf("%x to mode\n", data); +// logerror("%x to mode\n", data); switch (data) { case 0x5f: @@ -305,7 +305,7 @@ WRITE32_MEMBER( nubus_spec8s3_device::spec8s3_w ) break; default: -// if (offset >= 0x3800) printf("spec8s3_w: %08x @ %x (mask %08x PC=%x)\n", data, offset, mem_mask, space.device().safe_pc()); +// if (offset >= 0x3800) logerror("spec8s3_w: %08x @ %x (mask %08x %s)\n", data, offset, mem_mask, machine().describe_context()); break; } } @@ -333,7 +333,7 @@ READ32_MEMBER( nubus_spec8s3_device::spec8s3_r ) return 0; default: -// if (offset >= 0x3800) printf("spec8s3_r: @ %x (mask %08x PC=%x)\n", offset, mem_mask, space.device().safe_pc()); +// if (offset >= 0x3800) logerror("spec8s3_r: @ %x (mask %08x %s)\n", offset, mem_mask, machine().describe_context()); break; } return 0; diff --git a/src/devices/bus/nubus/nubus_specpdq.cpp b/src/devices/bus/nubus/nubus_specpdq.cpp index a16712e53e4..7cc46f46987 100644 --- a/src/devices/bus/nubus/nubus_specpdq.cpp +++ b/src/devices/bus/nubus/nubus_specpdq.cpp @@ -109,7 +109,7 @@ void nubus_specpdq_device::device_start() slotspace = get_slotspace(); -// printf("[specpdq %p] slotspace = %x\n", this, slotspace); +// logerror("[specpdq %p] slotspace = %x\n", this, slotspace); m_vram.resize(VRAM_SIZE); m_vram32 = (uint32_t *)&m_vram[0]; @@ -245,7 +245,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) switch (offset) { case 0xc0054: // mode 1 -// printf("%x to mode1\n", data); +// logerror("%x to mode1\n", data); break; case 0xc005c: // interrupt control @@ -264,7 +264,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) break; case 0xc007a: -// printf("%x to mode2\n", data); +// logerror("%x to mode2\n", data); switch (data) { @@ -281,11 +281,11 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) break; } -// printf("m_mode = %d\n", m_mode); +// logerror("m_mode = %d\n", m_mode); break; case 0x120000: // DAC address -// printf("%08x to DAC control (PC=%x)\n", data, space.device().safe_pc()); +// logerror("%08x to DAC control %s\n", data,machine().describe_context()); m_clutoffs = ((data>>8)&0xff)^0xff; break; @@ -294,7 +294,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) if (m_count == 3) { -// printf("RAMDAC: color %d = %02x %02x %02x (PC=%x)\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], space.device().safe_pc() ); +// logerror("RAMDAC: color %d = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context()); m_palette->set_pen_color(m_clutoffs, rgb_t(m_colors[0], m_colors[1], m_colors[2])); m_palette_val[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]); m_clutoffs++; @@ -371,7 +371,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) case 0x18103d: case 0x18103e: case 0x18103f: -// printf("Pattern %08x @ %x\n", data ^ 0xffffffff, offset); +// logerror("Pattern %08x @ %x\n", data ^ 0xffffffff, offset); m_fillbytes[((offset&0x3f)*4)] = ((data>>24) & 0xff) ^ 0xff; m_fillbytes[((offset&0x3f)*4)+1] = ((data>>16) & 0xff) ^ 0xff; m_fillbytes[((offset&0x3f)*4)+2] = ((data>>8) & 0xff) ^ 0xff; @@ -380,40 +380,40 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) // blitter control case 0x182006: -// printf("%08x (%d) to blitter ctrl 1 (PC=%x)\n", data^0xffffffff, data^0xffffffff, space.device().safe_pc()); +// logerror("%08x (%d) to blitter ctrl 1 %s\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); break; case 0x182008: -// printf("%08x (%d) to blitter ctrl 2 (PC=%x)\n", data^0xffffffff, data^0xffffffff, space.device().safe_pc()); +// logerror("%08x (%d) to blitter ctrl 2 %s\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); m_patofsx = (data ^ 0xffffffff) & 7; m_patofsy = ((data ^ 0xffffffff)>>3) & 7; break; case 0x18200e: -// printf("%08x (%d) to blitter ctrl 3 (PC=%x)\n", data^0xffffffff, data^0xffffffff, space.device().safe_pc()); +// logerror("%08x (%d) to blitter ctrl 3 %s\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); m_width = data ^ 0xffffffff; break; case 0x18200b: -// printf("%08x (%d) to blitter ctrl 4 (PC=%x)\n", data^0xffffffff, data^0xffffffff, space.device().safe_pc()); +// logerror("%08x (%d) to blitter ctrl 4 %s\n", data^0xffffffff, data^0xffffffff, machine().describe_context()); m_height = (data ^ 0xffffffff) & 0xffff; break; case 0x18200a: data ^= 0xffffffff; -// printf("%08x to blitter ctrl 5 (PC=%x)\n", data, space.device().safe_pc()); +// logerror("%08x to blitter ctrl 5 %s\n", data, machine().describe_context()); m_vram_src = data>>2; break; case 0x182009: data ^= 0xffffffff; -// printf("%08x to blitter ctrl 6 (PC=%x)\n", data, space.device().safe_pc()); +// logerror("%08x to blitter ctrl 6 %s\n", data, machine().describe_context()); m_vram_addr = data>>2; break; case 0x182007: data ^= 0xffffffff; -// printf("%08x to blitter ctrl 7 (PC=%x)\n", data, space.device().safe_pc()); +// logerror("%08x to blitter ctrl 7 %s\n", data, machine().describe_context()); // fill rectangle if (data == 2) @@ -421,7 +421,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) int x, y; uint8_t *vram = &m_vram[m_vram_addr + m_patofsx]; // m_vram_addr is missing the low 2 bits, we add them back here -// printf("Fill rectangle with %02x %02x %02x %02x, width %d height %d\n", m_fillbytes[0], m_fillbytes[1], m_fillbytes[2], m_fillbytes[3], m_width, m_height); +// logerror("Fill rectangle with %02x %02x %02x %02x, width %d height %d\n", m_fillbytes[0], m_fillbytes[1], m_fillbytes[2], m_fillbytes[3], m_width, m_height); for (y = 0; y < m_height; y++) { @@ -437,7 +437,7 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) uint8_t *vram = &m_vram[m_vram_addr]; uint8_t *vramsrc = &m_vram[m_vram_src]; -// printf("Copy rectangle, width %d height %d src %x dst %x\n", m_width, m_height, m_vram_addr, m_vram_src); +// logerror("Copy rectangle, width %d height %d src %x dst %x\n", m_width, m_height, m_vram_addr, m_vram_src); for (y = 0; y < m_height; y++) { @@ -449,19 +449,19 @@ WRITE32_MEMBER( nubus_specpdq_device::specpdq_w ) } else { - printf("Unknown blitter command %08x\n", data); + logerror("Unknown blitter command %08x\n", data); } break; default: -// printf("specpdq_w: %08x @ %x (mask %08x PC=%x)\n", data^0xffffffff, offset, mem_mask, space.device().safe_pc()); +// logerror("specpdq_w: %08x @ %x (mask %08x %s)\n", data^0xffffffff, offset, mem_mask, machine().describe_context()); break; } } READ32_MEMBER( nubus_specpdq_device::specpdq_r ) { -// if (offset != 0xc005c && offset != 0xc005e) printf("specpdq_r: @ %x (mask %08x PC=%x)\n", offset, mem_mask, space.device().safe_pc()); +// if (offset != 0xc005c && offset != 0xc005e) logerror("specpdq_r: @ %x (mask %08x %s)\n", offset, mem_mask, machine().describe_context()); if (offset >= 0xc0000 && offset < 0x100000) { diff --git a/src/devices/bus/nubus/nubus_wsportrait.cpp b/src/devices/bus/nubus/nubus_wsportrait.cpp index fd343c9337a..64dc4c0db7d 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.cpp +++ b/src/devices/bus/nubus/nubus_wsportrait.cpp @@ -243,7 +243,7 @@ WRITE32_MEMBER( nubus_wsportrait_device::wsportrait_w ) if (m_count == 3) { -// printf("RAMDAC: color %d = %02x %02x %02x (PC=%x)\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], space.device().safe_pc() ); +// logerror("RAMDAC: color %d = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context()); m_palette[m_clutoffs] = rgb_t(m_colors[2], m_colors[2], m_colors[2]); m_clutoffs++; if (m_clutoffs > 255) diff --git a/src/devices/bus/nubus/pds30_30hr.cpp b/src/devices/bus/nubus/pds30_30hr.cpp index 1ac279f0f35..31e764cd5f6 100644 --- a/src/devices/bus/nubus/pds30_30hr.cpp +++ b/src/devices/bus/nubus/pds30_30hr.cpp @@ -249,18 +249,18 @@ WRITE32_MEMBER( nubus_xceed30hr_device::xceed30hr_w ) break; case 0x100000: -// printf("%08x to DAC control (PC=%x)\n", data, space.device().safe_pc()); +// logerror("%08x to DAC control %s\n", data, machine().describe_context()); m_clutoffs = (data&0xff); m_count = 0; break; case 0x100001: -// printf("%08x to DAC data (PC=%x)\n", data, space.device().safe_pc()); +// logerror("%08x to DAC data %s\n", data, machine().describe_context()); m_colors[m_count++] = (data & 0xff); if (m_count == 3) { -// printf("RAMDAC: color %02x = %02x %02x %02x (PC=%x)\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], space.device().safe_pc() ); +// logerror("RAMDAC: color %02x = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context()); m_palette[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]); m_clutoffs++; if (m_clutoffs > 255) @@ -284,14 +284,14 @@ WRITE32_MEMBER( nubus_xceed30hr_device::xceed30hr_w ) break; default: -// printf("xceed30hr_w: %08x @ %x, mask %08x (PC=%x)\n", data, offset, mem_mask, space.device().safe_pc()); +// logerror("xceed30hr_w: %08x @ %x, mask %08x %s\n", data, offset, mem_mask, machine().describe_context()); break; } } READ32_MEMBER( nubus_xceed30hr_device::xceed30hr_r ) { -// printf("xceed30hr_r: @ %x, mask %08x [PC=%x]\n", offset, mem_mask, machine().device("maincpu")->safe_pc()); +// logerror("xceed30hr_r: @ %x, mask %08x %s\n", offset, mem_mask, machine().describe_context()); if (offset == 0x80008) { m_toggle ^= 0x80; diff --git a/src/devices/bus/nubus/pds30_cb264.cpp b/src/devices/bus/nubus/pds30_cb264.cpp index 65db206749a..86079675739 100644 --- a/src/devices/bus/nubus/pds30_cb264.cpp +++ b/src/devices/bus/nubus/pds30_cb264.cpp @@ -263,7 +263,7 @@ WRITE32_MEMBER( nubus_cb264se30_device::cb264se30_w ) case 0x38000: if (mem_mask == 0xff000000) { - // printf("%08x to DAC control (PC=%x)\n", data, space.device().safe_pc()); + // logerror("%08x to DAC control %s\n", data, machine().describe_context()); m_clutoffs = (data>>24)&0xff; } else if (mem_mask == 0x0000ff00) @@ -272,7 +272,7 @@ WRITE32_MEMBER( nubus_cb264se30_device::cb264se30_w ) if (m_count == 3) { -// printf("RAMDAC: color %02x = %02x %02x %02x (PC=%x)\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], space.device().safe_pc() ); +// logerror("RAMDAC: color %02x = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context()); m_palette[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]); m_clutoffs++; if (m_clutoffs > 255) @@ -297,7 +297,7 @@ WRITE32_MEMBER( nubus_cb264se30_device::cb264se30_w ) break; default: -// printf("cb264se30_w: %08x @ %x, mask %08x (PC=%x)\n", data, offset, mem_mask, space.device().safe_pc()); +// logerror("cb264se30_w: %08x @ %x, mask %08x %s\n", data, offset, mem_mask, machine().describe_context()); break; } } diff --git a/src/devices/bus/nubus/pds30_mc30.cpp b/src/devices/bus/nubus/pds30_mc30.cpp index 0b3ca502b84..2d48fdc5231 100644 --- a/src/devices/bus/nubus/pds30_mc30.cpp +++ b/src/devices/bus/nubus/pds30_mc30.cpp @@ -266,18 +266,18 @@ WRITE32_MEMBER( nubus_xceedmc30_device::xceedmc30_w ) break; case 0x100000: -// printf("%08x to DAC control (PC=%x)\n", data, space.device().safe_pc()); +// logerror("%08x to DAC control %s\n", data, machine().describe_context()); m_clutoffs = (data&0xff); m_count = 0; break; case 0x100001: -// printf("%08x to DAC data (PC=%x)\n", data, space.device().safe_pc()); +// printf("%08x to DAC data %s\n", data, machine().describe_context()); m_colors[m_count++] = ((data>>24) & 0xff); if (m_count == 3) { -// printf("RAMDAC: color %02x = %02x %02x %02x (PC=%x)\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], space.device().safe_pc() ); +// printf("RAMDAC: color %02x = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context()); m_palette[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]); m_clutoffs++; if (m_clutoffs > 255) @@ -301,14 +301,14 @@ WRITE32_MEMBER( nubus_xceedmc30_device::xceedmc30_w ) break; default: -// printf("xceedmc30_w: %08x @ %x, mask %08x (PC=%x)\n", data, offset, mem_mask, space.device().safe_pc()); +// printf("xceedmc30_w: %08x @ %x, mask %08x %s\n", data, offset, mem_mask, machine().describe_context()); break; } } READ32_MEMBER( nubus_xceedmc30_device::xceedmc30_r ) { -// printf("xceedmc30_r: @ %x, mask %08x [PC=%x]\n", offset, mem_mask, machine().device("maincpu")->safe_pc()); +// printf("xceedmc30_r: @ %x, mask %08x [PC=%x]\n", offset, mem_mask, machine().device<cpu_device>("maincpu")->pc()); if (offset == 0x80008) { m_toggle ^= 0x04; diff --git a/src/devices/bus/nubus/pds30_procolor816.cpp b/src/devices/bus/nubus/pds30_procolor816.cpp index 869e91986c0..2333637761d 100644 --- a/src/devices/bus/nubus/pds30_procolor816.cpp +++ b/src/devices/bus/nubus/pds30_procolor816.cpp @@ -271,7 +271,7 @@ WRITE32_MEMBER( nubus_procolor816_device::procolor816_w ) case 0x3d800: if (mem_mask == 0x00ff0000) { - // printf("%08x to DAC control (PC=%x)\n", data, space.device().safe_pc()); + // printf("%08x to DAC control %s\n", data, machine().describe_context()); m_clutoffs = bitswap<8>((data>>16)&0xff, 0, 1, 2, 3, 4, 5, 6, 7); } else if (mem_mask == 0x000000ff) @@ -280,7 +280,7 @@ WRITE32_MEMBER( nubus_procolor816_device::procolor816_w ) if (m_count == 3) { -// printf("RAMDAC: color %02x = %02x %02x %02x (PC=%x)\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], space.device().safe_pc() ); +// printf("RAMDAC: color %02x = %02x %02x %02x %s\n", m_clutoffs, m_colors[0], m_colors[1], m_colors[2], machine().describe_context()); m_palette[m_clutoffs] = rgb_t(m_colors[0], m_colors[1], m_colors[2]); m_clutoffs++; if (m_clutoffs > 255) @@ -308,7 +308,7 @@ WRITE32_MEMBER( nubus_procolor816_device::procolor816_w ) break; default: -// printf("procolor816_w: %08x @ %x, mask %08x (PC=%x)\n", data, offset, mem_mask, space.device().safe_pc()); +// printf("procolor816_w: %08x @ %x, mask %08x %s\n", data, offset, mem_mask, machine().describe_context()); break; } } @@ -326,7 +326,7 @@ READ32_MEMBER( nubus_procolor816_device::procolor816_r ) } else { -// printf("procolor816_r: @ %x, mask %08x [PC=%x]\n", offset, mem_mask, machine().device("maincpu")->safe_pc()); +// printf("procolor816_r: @ %x, mask %08x [PC=%x]\n", offset, mem_mask, machine().device<cpu_device>("maincpu")->pc()); } return 0; diff --git a/src/devices/bus/nubus/pds30_sigmalview.cpp b/src/devices/bus/nubus/pds30_sigmalview.cpp index e2b59954781..860775b2e5d 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.cpp +++ b/src/devices/bus/nubus/pds30_sigmalview.cpp @@ -167,7 +167,7 @@ READ32_MEMBER( nubus_lview_device::lview_r ) // printf("prot_r: @ %x, mask %08x [PC=%x state %d]\n", offset, mem_mask, machine().device("maincpu")->safe_pc(), m_protstate); - if ((m_protstate == 1) || (m_protstate == 10) || (machine().device("maincpu")->safe_pc() == 0x5aac)) + if ((m_protstate == 1) || (m_protstate == 10) || (machine().device<cpu_device>("maincpu")->pc() == 0x5aac)) { rv = 0x02020202; } @@ -183,7 +183,7 @@ READ32_MEMBER( nubus_lview_device::lview_r ) WRITE32_MEMBER( nubus_lview_device::lview_w ) { -// if (offset != 0x7a && offset != 0x3ffb) printf("prot_w: %08x @ %x, mask %08x (PC=%x)\n", data, offset, mem_mask, space.device().safe_pc()); +// if (offset != 0x7a && offset != 0x3ffb) logerror("prot_w: %08x @ %x, mask %08x %s\n", data, offset, mem_mask, machine().describe_context()); if (offset == 0x7a) { diff --git a/src/devices/cpu/sh/sh2comn.cpp b/src/devices/cpu/sh/sh2comn.cpp index fca8070c936..cdc9e78dbf1 100644 --- a/src/devices/cpu/sh/sh2comn.cpp +++ b/src/devices/cpu/sh/sh2comn.cpp @@ -459,7 +459,7 @@ WRITE32_MEMBER( sh2_device::sh7604_w ) // logerror("sh2_internal_w: Write %08x (%x), %08x @ %08x\n", 0xfffffe00+offset*4, offset, data, mem_mask); // if(offset != 0x20) -// printf("sh2_internal_w: Write %08x (%x), %08x @ %08x (PC %x)\n", 0xfffffe00+offset*4, offset, data, mem_mask, space.device().safe_pc()); +// printf("sh2_internal_w: Write %08x (%x), %08x @ %08x (PC %x)\n", 0xfffffe00+offset*4, offset, data, mem_mask, pc()); switch( offset ) { diff --git a/src/devices/machine/53c810.cpp b/src/devices/machine/53c810.cpp index 87165da1cfd..b97999f5ad4 100644 --- a/src/devices/machine/53c810.cpp +++ b/src/devices/machine/53c810.cpp @@ -396,7 +396,7 @@ void lsi53c810_device::dma_exec() uint8_t lsi53c810_device::reg_r(int offset) { -// logerror("53c810: read reg %d:0x%x (PC=%x)\n", offset, offset, space.device().safe_pc()); +// logerror("53c810: read reg %d:0x%x %s\n", offset, offset, machine().describe_context()); switch(offset) { case 0x00: /* SCNTL0 */ @@ -479,7 +479,7 @@ uint8_t lsi53c810_device::reg_r(int offset) void lsi53c810_device::reg_w(int offset, uint8_t data) { -// logerror("53c810: %02x to reg %d:0x%x (PC=%x)\n", data, offset, offset, space.device().safe_pc()); +// logerror("53c810: %02x to reg %d:0x%x %s\n", data, offset, offset, machine().describe_context()); switch(offset) { case 0x00: /* SCNTL0 */ diff --git a/src/devices/machine/gt64xxx.cpp b/src/devices/machine/gt64xxx.cpp index 5c5130495f8..13ff469571e 100644 --- a/src/devices/machine/gt64xxx.cpp +++ b/src/devices/machine/gt64xxx.cpp @@ -643,9 +643,6 @@ READ32_MEMBER (gt64xxx_device::cpu_if_r) result = (result > elapsed) ? (result - elapsed) : 0; } - /* eat some time for those which poll this register */ - //space.device().execute().eat_cycles(100); - LOGTIMERS("%s hires_timer_r = %08X\n", machine().describe_context(), result); break; } @@ -1027,7 +1024,6 @@ TIMER_CALLBACK_MEMBER (gt64xxx_device::perform_dma) bytesleft--; } else { - //space.write_byte(dstaddr, space.read_byte(srcaddr)); dstSpace->write_dword(dstaddr, srcSpace->read_dword(srcaddr)); srcaddr += srcinc * 4; dstaddr += dstinc * 4; diff --git a/src/devices/machine/k056230.cpp b/src/devices/machine/k056230.cpp index dfbdbc41d69..b712885fafd 100644 --- a/src/devices/machine/k056230.cpp +++ b/src/devices/machine/k056230.cpp @@ -49,7 +49,7 @@ READ8_MEMBER(k056230_device::read) } } -// osd_printf_debug("k056230_r: %d at %08X\n", offset, space.device().safe_pc()); +// logerror("k056230_r: %d %s\n", offset, machine().describe_context()); return 0; } @@ -91,17 +91,17 @@ WRITE8_MEMBER(k056230_device::write) break; } } -// osd_printf_debug("k056230_w: %d, %02X at %08X\n", offset, data, space.device().safe_pc()); +// logerror("k056230_w: %d, %02X at %08X\n", offset, data, machine().describe_context()); } READ32_MEMBER(k056230_device::lanc_ram_r) { - //osd_printf_debug("LANC_RAM_r: %08X, %08X at %08X\n", offset, mem_mask, space.device().safe_pc()); + //logerror("LANC_RAM_r: %08X, %08X %s\n", offset, mem_mask, machine().describe_context()); return m_ram[offset & 0x7ff]; } WRITE32_MEMBER(k056230_device::lanc_ram_w) { - //osd_printf_debug("LANC_RAM_w: %08X, %08X, %08X at %08X\n", data, offset, mem_mask, space.device().safe_pc()); + //logerror("LANC_RAM_w: %08X, %08X, %08X %s\n", data, offset, mem_mask, machine().describe_context()); COMBINE_DATA(m_ram + (offset & 0x7ff)); } diff --git a/src/devices/machine/mpu401.cpp b/src/devices/machine/mpu401.cpp index 9cd3ddaff92..74987a918e8 100644 --- a/src/devices/machine/mpu401.cpp +++ b/src/devices/machine/mpu401.cpp @@ -163,7 +163,7 @@ READ8_MEMBER(mpu401_device::regs_mode2_r) case 6: case 7: case 0xf: -// printf("MPU401: read @ unk %x (PC=%x)\n", offset, space.device().safe_pc()); +// logerror("MPU401: read @ unk %x %s\n", offset, machine().describe_context()); break; default: @@ -182,7 +182,7 @@ WRITE8_MEMBER(mpu401_device::regs_mode2_w) case 6: case 7: case 0xf: -// printf("MPU401: %02x @ unk %x (PC=%x)\n", data, offset, space.device().safe_pc()); +// logerror("MPU401: %02x @ unk %x %s\n", data, offset, machine().describe_context()); break; default: @@ -202,7 +202,7 @@ WRITE8_MEMBER(mpu401_device::port1_w) READ8_MEMBER(mpu401_device::port2_r) { -// printf("Read P2 (PC=%x)\n", space.device().safe_pc()); +// printf("Read P2 %s\n", machine().describe_context()); return m_port2; } diff --git a/src/devices/machine/serflash.cpp b/src/devices/machine/serflash.cpp index 616ac78f3d8..a6775374aa0 100644 --- a/src/devices/machine/serflash.cpp +++ b/src/devices/machine/serflash.cpp @@ -215,7 +215,7 @@ WRITE8_MEMBER( serflash_device::flash_cmd_w ) default: { - //logerror("%08x FLASH: unknown cmd1 = %02X\n", cpu_get_pc(space.device()), data); + //logerror("%s FLASH: unknown cmd1 = %02X\n", machine().describe_context(), data); } } } diff --git a/src/devices/sound/nile.cpp b/src/devices/sound/nile.cpp index 2e28d2e4fac..4e78b754db5 100644 --- a/src/devices/sound/nile.cpp +++ b/src/devices/sound/nile.cpp @@ -170,7 +170,7 @@ WRITE16_MEMBER( nile_device::nile_sndctrl_w ) COMBINE_DATA(&m_ctrl); -// printf("CTRL: %04x -> %04x (PC=%x)\n", ctrl, m_ctrl, space.device().safe_pc()); +// logerror("CTRL: %04x -> %04x %s\n", ctrl, m_ctrl, machine().describe_context()); ctrl^=m_ctrl; } @@ -223,5 +223,5 @@ WRITE16_MEMBER( nile_device::nile_snd_w ) m_vpos[v] = m_frac[v] = m_lponce[v] = 0; } - //printf("v%02d: %04x to reg %02d (PC=%x)\n", v, m_sound_regs[offset], r, space.device().safe_pc()); + //logerror("v%02d: %04x to reg %02d (PC=%x)\n", v, m_sound_regs[offset], r, machine().describe_context()); } diff --git a/src/devices/video/315_5313.cpp b/src/devices/video/315_5313.cpp index 579212928ba..c77939f5c1c 100644 --- a/src/devices/video/315_5313.cpp +++ b/src/devices/video/315_5313.cpp @@ -1337,7 +1337,7 @@ READ16_MEMBER( sega315_5313_device::vdp_r ) // if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) osd_printf_debug("8-bit VDP read control port access, offset %04x mem_mask %04x\n",offset,mem_mask); retvalue = ctrl_port_r(); // retvalue = machine().rand(); - // osd_printf_debug("%06x: Read Control Port at scanline %d hpos %d (return %04x)\n",space.device().safe_pc(),get_scanline_counter(), get_hposition(),retvalue); + // logerror("%s: Read Control Port at scanline %d hpos %d (return %04x)\n",machine().describe_context(),get_scanline_counter(), get_hposition(),retvalue); break; case 0x08: @@ -1347,7 +1347,7 @@ READ16_MEMBER( sega315_5313_device::vdp_r ) // if ((!ACCESSING_BITS_8_15) || (!ACCESSING_BITS_0_7)) osd_printf_debug("8-bit VDP read HV counter port access, offset %04x mem_mask %04x\n",offset,mem_mask); retvalue = megadriv_read_hv_counters(); // retvalue = machine().rand(); - // osd_printf_debug("%06x: Read HV counters at scanline %d hpos %d (return %04x)\n",space.device().safe_pc(),get_scanline_counter(), get_hposition(),retvalue); + // osd_printf_debug("%s: Read HV counters at scanline %d hpos %d (return %04x)\n",machine().describe_context(),get_scanline_counter(), get_hposition(),retvalue); break; case 0x10: diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp index c731041069f..f00736f73ba 100644 --- a/src/devices/video/stvvdp1.cpp +++ b/src/devices/video/stvvdp1.cpp @@ -149,7 +149,7 @@ struct shaded_point READ16_MEMBER( saturn_state::saturn_vdp1_regs_r ) { - //logerror ("cpu %s (PC=%08X) VDP1: Read from Registers, Offset %04x\n", space.device().tag(), space.device().safe_pc(), offset); + //logerror ("%s VDP1: Read from Registers, Offset %04x\n", machine().describe_context(), offset); switch(offset) { @@ -176,7 +176,7 @@ READ16_MEMBER( saturn_state::saturn_vdp1_regs_r ) return modr; default: if(!machine().side_effect_disabled()) - printf ("cpu %s (PC=%08X) VDP1: Read from Registers, Offset %04x\n", space.device().tag(), space.device().safe_pc(), offset*2); + logerror("%s VDP1: Read from Registers, Offset %04x\n", machine().describe_context(), offset*2); break; } @@ -346,7 +346,7 @@ WRITE32_MEMBER ( saturn_state::saturn_vdp1_vram_w ) // if (((offset * 4) > 0xdf) && ((offset * 4) < 0x140)) // { -// logerror("cpu %s (PC=%08X): VRAM dword write to %08X = %08X & %08X\n", space.device().tag(), space.device().safe_pc(), offset*4, data, mem_mask); +// logerror("%s: VRAM dword write to %08X = %08X & %08X\n", machine().describe_context(), offset*4, data, mem_mask); // } data = m_vdp1_vram[offset]; diff --git a/src/mame/audio/hng64.cpp b/src/mame/audio/hng64.cpp index d08bb3b4ead..458a69f2fcf 100644 --- a/src/mame/audio/hng64.cpp +++ b/src/mame/audio/hng64.cpp @@ -210,7 +210,7 @@ WRITE16_MEMBER(hng64_state::hng64_sound_port_0008_w) READ16_MEMBER(hng64_state::hng64_sound_port_0008_r) { // read in irq5 - //printf("%08x: hng64_sound_port_0008_r mask (%04x)\n", space.device().safe_pc(), mem_mask); + //logerror("%s: hng64_sound_port_0008_r mask (%04x)\n", machine().describe_context(), mem_mask); return 0; } diff --git a/src/mame/audio/seibu.cpp b/src/mame/audio/seibu.cpp index d6534dec5e2..2a236468b58 100644 --- a/src/mame/audio/seibu.cpp +++ b/src/mame/audio/seibu.cpp @@ -245,7 +245,7 @@ WRITE8_MEMBER( seibu_sound_device::pending_w ) READ8_MEMBER( seibu_sound_device::main_r ) { - //logerror("%06x: seibu_main_r(%x)\n",space.device().safe_pc(),offset); + //logerror("%s: seibu_main_r(%x)\n",machine().describe_context(),offset); switch (offset) { case 2: @@ -254,14 +254,13 @@ READ8_MEMBER( seibu_sound_device::main_r ) case 5: return m_main2sub_pending ? 1 : 0; default: - //logerror("%06x: seibu_main_r(%x)\n",space.device().safe_pc(),offset); + //logerror("%s: seibu_main_r(%x)\n",machine().describe_context(),offset); return 0xff; } } WRITE8_MEMBER( seibu_sound_device::main_w ) { - //printf("%06x: seibu_main_w(%x,%02x)\n",space.device().safe_pc(),offset,data); switch (offset) { case 0: @@ -278,7 +277,7 @@ WRITE8_MEMBER( seibu_sound_device::main_w ) m_main2sub_pending = 1; break; default: - //logerror("%06x: seibu_main_w(%x,%02x)\n",space.device().safe_pc(),offset,data); + //logerror("%s: seibu_main_w(%x,%02x)\n",machine().describe_context(),offset,data); break; } } diff --git a/src/mame/audio/snes_snd.cpp b/src/mame/audio/snes_snd.cpp index 86f6fb80536..e1c6a045487 100644 --- a/src/mame/audio/snes_snd.cpp +++ b/src/mame/audio/snes_snd.cpp @@ -1066,7 +1066,7 @@ READ8_MEMBER( snes_sound_device::spc_io_r ) case 0x5: /* Port 1 */ case 0x6: /* Port 2 */ case 0x7: /* Port 3 */ - // osd_printf_debug("SPC: rd %02x @ %d, PC=%x\n", m_port_in[offset - 4], offset - 4, space.device().safe_pc()); + // osd_printf_debug("SPC: rd %02x @ %d, %s\n", m_port_in[offset - 4], offset - 4, machine().describe_context()); return m_port_in[offset - 4]; case 0x8: //normal RAM, can be read even if the ram disabled flag ($f0 bit 1) is active case 0x9: @@ -1132,7 +1132,7 @@ WRITE8_MEMBER( snes_sound_device::spc_io_w ) case 0x5: /* Port 1 */ case 0x6: /* Port 2 */ case 0x7: /* Port 3 */ - // osd_printf_debug("SPC: %02x to APU @ %d (PC=%x)\n", data, offset & 3, space.device().safe_pc()); + // osd_printf_debug("SPC: %02x to APU @ %d %s\n", data, offset & 3, machine().describe_context()); m_port_out[offset - 4] = data; machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(20)); break; diff --git a/src/mame/audio/taito_en.cpp b/src/mame/audio/taito_en.cpp index 88a776e7f22..e158b5aaa87 100644 --- a/src/mame/audio/taito_en.cpp +++ b/src/mame/audio/taito_en.cpp @@ -128,7 +128,7 @@ WRITE16_MEMBER( taito_en_device::es5510_dsp_w ) uint8_t *snd_mem = (uint8_t *)memregion(":ensoniq.0")->base(); // if (offset>4 && offset!=0x80 && offset!=0xa0 && offset!=0xc0 && offset!=0xe0) -// logerror("%06x: DSP write offset %04x %04x\n",space.device().safe_pc(),offset,data); +// logerror("%06x: DSP write offset %04x %04x\n",m_audiocpu->pc(),offset,data); COMBINE_DATA(&m_es5510_dsp_ram[offset]); diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index 7577cc8999f..5ab66fda70f 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -86,7 +86,6 @@ protected: READ8_MEMBER(_2mindril_state::arm_pwr_r) { int arm_pwr = m_in0->read();//throw - //popmessage("PC=%08x %02x",space.device().safe_pc(),arm_pwr); if(arm_pwr > 0xe0) return ~0x18; if(arm_pwr > 0xc0) return ~0x14; diff --git a/src/mame/drivers/39in1.cpp b/src/mame/drivers/39in1.cpp index 681d960a764..e0454b24515 100644 --- a/src/mame/drivers/39in1.cpp +++ b/src/mame/drivers/39in1.cpp @@ -1355,7 +1355,7 @@ READ32_MEMBER(_39in1_state::unknown_r) READ32_MEMBER(_39in1_state::cpld_r) { - //if (space.device().safe_pc() != 0xe3af4) printf("CPLD read @ %x (PC %x state %d)\n", offset, space.device().safe_pc(), state); + //if (m_maincpu->pc() != 0xe3af4) printf("CPLD read @ %x (PC %x state %d)\n", offset, m_maincpu->pc(), state); if (m_maincpu->pc() == 0x3f04) { diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp index 146e22876c4..a3dd048bd9c 100644 --- a/src/mame/drivers/albazg.cpp +++ b/src/mame/drivers/albazg.cpp @@ -142,13 +142,13 @@ WRITE8_MEMBER(albazg_state::yumefuda_cram_w) /*Custom RAM (Thrash Protection)*/ READ8_MEMBER(albazg_state::custom_ram_r) { -// logerror("Custom RAM read at %02x PC = %x\n", offset + 0xaf80, space.device().safe_pc()); +// logerror("Custom RAM read at %02x PC = %x\n", offset + 0xaf80, m_maincpu->space(AS_PROGRAM).pc()); return m_cus_ram[offset];// ^ 0x55; } WRITE8_MEMBER(albazg_state::custom_ram_w) { -// logerror("Custom RAM write at %02x : %02x PC = %x\n", offset + 0xaf80, data, space.device().safe_pc()); +// logerror("Custom RAM write at %02x : %02x PC = %x\n", offset + 0xaf80, data, m_maincpu->space(AS_PROGRAM).pc()); if(m_prot_lock) m_cus_ram[offset] = data; } @@ -156,7 +156,7 @@ WRITE8_MEMBER(albazg_state::custom_ram_w) /*this might be used as NVRAM commands btw*/ WRITE8_MEMBER(albazg_state::prot_lock_w) { -// logerror("PC %04x Prot lock value written %02x\n", space.device().safe_pc(), data); +// logerror("PC %04x Prot lock value written %02x\n", m_maincpu->space(AS_PROGRAM).pc(), data); m_prot_lock = data; } diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp index 692c73b50ac..a6694589fe2 100644 --- a/src/mame/drivers/apollo.cpp +++ b/src/mame/drivers/apollo.cpp @@ -425,7 +425,6 @@ READ32_MEMBER(apollo_state::ram_with_parity_r){ if (apollo_csr_get_control_register() & APOLLO_CSR_CR_INTERRUPT_ENABLE) { // force parity error (if NMI is enabled) -// cpu_set_input_line_and_vector(&space.device(), 7, ASSERT_LINE, M68K_INT_ACK_AUTOVECTOR); m_maincpu->set_input_line_and_vector(7, ASSERT_LINE, M68K_INT_ACK_AUTOVECTOR); } @@ -453,8 +452,7 @@ WRITE32_MEMBER(apollo_state::ram_with_parity_w){ // no more than 192 read/write handlers may be used // see table_assign_handler in memory.c if (parity_error_handler_install_counter < 40) { - //memory_install_read32_handler(space, ram_base_address+offset*4, ram_base_address+offset*4+3, ram_with_parity_r); - space.install_read_handler(ram_base_address+offset*4, ram_base_address+offset*4+3, read32_delegate(FUNC(apollo_state::ram_with_parity_r),this)); + m_maincpu->space(AS_PROGRAM).install_read_handler(ram_base_address+offset*4, ram_base_address+offset*4+3, read32_delegate(FUNC(apollo_state::ram_with_parity_r),this)); parity_error_handler_is_installed = 1; parity_error_handler_install_counter++; } @@ -466,7 +464,7 @@ WRITE32_MEMBER(apollo_state::ram_with_parity_w){ // uninstall not supported, reinstall previous read handler instead // memory_install_rom(space, ram_base_address, ram_end_address, messram_ptr.v); - space.install_rom(ram_base_address,ram_end_address,&m_messram_ptr[0]); + m_maincpu->space(AS_PROGRAM).install_rom(ram_base_address,ram_end_address,&m_messram_ptr[0]); parity_error_handler_is_installed = 0; parity_error_byte_mask = 0; diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp index e811603b690..56cea09962a 100644 --- a/src/mame/drivers/astrcorp.cpp +++ b/src/mame/drivers/astrcorp.cpp @@ -214,7 +214,7 @@ WRITE16_MEMBER(astrocorp_state::astrocorp_sound_bank_w) if (ACCESSING_BITS_8_15) { m_oki->set_rom_bank((data >> 8) & 1); -// logerror("CPU #0 PC %06X: OKI bank %08X\n", space.device().safe_pc(), data); +// logerror("CPU #0 PC %06X: OKI bank %08X\n", m_maincpu->pc(), data); } } @@ -223,7 +223,7 @@ WRITE16_MEMBER(astrocorp_state::skilldrp_sound_bank_w) if (ACCESSING_BITS_0_7) { m_oki->set_rom_bank(data & 1); -// logerror("CPU #0 PC %06X: OKI bank %08X\n", space.device().safe_pc(), data); +// logerror("CPU #0 PC %06X: OKI bank %08X\n", m_maincpu->pc(), data); } } diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp index aa7bb631dde..01a5891858f 100644 --- a/src/mame/drivers/backfire.cpp +++ b/src/mame/drivers/backfire.cpp @@ -210,14 +210,14 @@ READ32_MEMBER(backfire_state::backfire_eeprom_r) READ32_MEMBER(backfire_state::backfire_control2_r) { -// logerror("%08x:Read eprom %08x (%08x)\n", space.device().safe_pc(), offset << 1, mem_mask); +// logerror("%08x:Read eprom %08x (%08x)\n", m_maincpu->pc(), offset << 1, mem_mask); return (m_eeprom->do_read() << 24) | m_io_in1->read() | (m_io_in1->read() << 16); } #ifdef UNUSED_FUNCTION READ32_MEMBER(backfire_state::backfire_control3_r) { -// logerror("%08x:Read eprom %08x (%08x)\n", space.device().safe_pc(), offset << 1, mem_mask); +// logerror("%08x:Read eprom %08x (%08x)\n", m_maincpu->pc(), offset << 1, mem_mask); return (m_eeprom->do_read() << 24) | m_io_in2->read() | (m_io_in2->read() << 16); } #endif @@ -702,7 +702,7 @@ void backfire_state::descramble_sound() READ32_MEMBER(backfire_state::backfire_speedup_r) { - //osd_printf_debug( "%08x\n",space.device().safe_pc()); + //osd_printf_debug( "%08x\n",m_maincpu->pc()); if (m_maincpu->pc() == 0xce44) m_maincpu->spin_until_time(attotime::from_usec(400)); // backfire if (m_maincpu->pc() == 0xcee4) m_maincpu->spin_until_time(attotime::from_usec(400)); // backfirea diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp index a2b1e00f173..fde0a7c2643 100644 --- a/src/mame/drivers/bfm_sc4.cpp +++ b/src/mame/drivers/bfm_sc4.cpp @@ -286,10 +286,11 @@ READ16_MEMBER(sc4_state::sc4_cs1_r) if (r_D1 == 0x7) { + auto &mspace = m_maincpu->space(AS_PROGRAM); bool valid = true; for (int i=0;i<8;i++) { - uint8_t code = space.read_byte(r_A0+i); + uint8_t code = mspace.read_byte(r_A0+i); if (code != 0xff) // assume our mbus code just returns 0xff for now.. valid = false; } @@ -302,9 +303,9 @@ READ16_MEMBER(sc4_state::sc4_cs1_r) printf("Ident code? "); for (int i=0;i<8;i++) { - uint8_t code = space.read_byte(r_A1+i); + uint8_t code = mspace.read_byte(r_A1+i); printf("%02x",code); - space.write_byte(r_A0+i, code); + mspace.write_byte(r_A0+i, code); } printf("\n"); } @@ -773,8 +774,7 @@ void sc4_state::bfm_sc4_68307_portb_w(address_space &space, bool dedicated, uint { // if (dedicated == false) { - int pc = space.device().safe_pc(); - //_m68ki_cpu_core *m68k = m68k_get_safe_token(&space.device()); + int pc = m_maincpu->pc(); // serial output to the VFD at least.. logerror("%08x bfm_sc4_68307_portb_w %04x %04x\n", pc, data, line_mask); @@ -786,7 +786,7 @@ void sc4_state::bfm_sc4_68307_portb_w(address_space &space, bool dedicated, uint } uint8_t sc4_state::bfm_sc4_68307_porta_r(address_space &space, bool dedicated, uint8_t line_mask) { - int pc = space.device().safe_pc(); + int pc = m_maincpu->pc(); logerror("%08x bfm_sc4_68307_porta_r\n", pc); return 0xbb;// machine().rand(); } diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp index a99b7d22139..48f51cc5793 100644 --- a/src/mame/drivers/cbasebal.cpp +++ b/src/mame/drivers/cbasebal.cpp @@ -35,7 +35,7 @@ WRITE8_MEMBER(cbasebal_state::cbasebal_bankswitch_w) { /* bits 0-4 select ROM bank */ - //logerror("%04x: bankswitch %02x\n", space.device().safe_pc(), data); + //logerror("%04x: bankswitch %02x\n", m_maincpu->pc(), data); membank("bank1")->set_entry(data & 0x1f); membank("bank1d")->set_entry(data & 0x1f); diff --git a/src/mame/drivers/cobra.cpp b/src/mame/drivers/cobra.cpp index ebee01b8c9f..fa5c76229c2 100644 --- a/src/mame/drivers/cobra.cpp +++ b/src/mame/drivers/cobra.cpp @@ -3088,7 +3088,7 @@ WRITE64_MEMBER(cobra_state::gfx_buf_w) // teximage_load() / mbuslib_prc_read(): 0x00A00001 0x10520800 -// printf("prc_read %08X%08X at %08X\n", (uint32_t)(data >> 32), (uint32_t)(data), space.device().safe_pc()); +// printf("prc_read %08X%08X at %08X\n", (uint32_t)(data >> 32), (uint32_t)(data), m_gfxcpu->pc()); m_renderer->gfx_fifo_exec(); diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp index 53888b1c3db..d022a0ca7ec 100644 --- a/src/mame/drivers/coolpool.cpp +++ b/src/mame/drivers/coolpool.cpp @@ -236,7 +236,7 @@ READ_LINE_MEMBER(coolpool_state::amerdart_dsp_bio_line_r) READ16_MEMBER(coolpool_state::amerdart_iop_r) { -// logerror("%08x:IOP read %04x\n",space.device().safe_pc(),m_iop_answer); +// logerror("%08x:IOP read %04x\n",m_maincpu->pc(),m_iop_answer); m_maincpu->set_input_line(1, CLEAR_LINE); return m_iop_answer; @@ -244,21 +244,21 @@ READ16_MEMBER(coolpool_state::amerdart_iop_r) WRITE16_MEMBER(coolpool_state::amerdart_iop_w) { -// logerror("%08x:IOP write %04x\n", space.device().safe_pc(), data); +// logerror("%08x:IOP write %04x\n", m_maincpu->pc(), data); COMBINE_DATA(&m_iop_cmd); m_cmd_pending = 1; } READ16_MEMBER(coolpool_state::amerdart_dsp_cmd_r) { -// logerror("%08x:DSP cmd_r %04x\n", space.device().safe_pc(), m_iop_cmd); +// logerror("%08x:DSP cmd_r %04x\n", m_dsp->pc(), m_iop_cmd); m_cmd_pending = 0; return m_iop_cmd; } WRITE16_MEMBER(coolpool_state::amerdart_dsp_answer_w) { -// logerror("%08x:DSP answer %04x\n", space.device().safe_pc(), data); +// logerror("%08x:DSP answer %04x\n", m_maincpu->pc(), data); m_iop_answer = data; m_maincpu->set_input_line(1, ASSERT_LINE); } @@ -404,7 +404,7 @@ READ16_MEMBER(coolpool_state::amerdart_trackball_r) m_result = (m_result & 0x0fff) | (amerdart_trackball_direction(2, ((m_result >> 12) & 0xf)) << 12); -// logerror("%08X:read port 6 (X=%02X Y=%02X oldX=%02X oldY=%02X oldRes=%04X Res=%04X)\n", space.device().safe_pc(), m_newx, m_newy, m_oldx, m_oldy, m_lastresult, m_result); +// logerror("%08X:read port 6 (X=%02X Y=%02X oldX=%02X oldY=%02X oldRes=%04X Res=%04X)\n", m_dsp->pc(), m_newx, m_newy, m_oldx, m_oldy, m_lastresult, m_result); m_lastresult = m_result; @@ -591,7 +591,7 @@ READ16_MEMBER(coolpool_state::coolpool_input_r) } } -// logerror("%08X:read port 7 (X=%02X Y=%02X oldX=%02X oldY=%02X res=%04X)\n", space.device().safe_pc(), +// logerror("%08X:read port 7 (X=%02X Y=%02X oldX=%02X oldY=%02X res=%04X)\n", m_dsp->pc(), // m_newx[1], m_newy[1], m_oldx[1], m_oldy[1], m_result); m_lastresult = m_result; return m_result; diff --git a/src/mame/drivers/d9final.cpp b/src/mame/drivers/d9final.cpp index 66db5af67b6..947c2c7d356 100644 --- a/src/mame/drivers/d9final.cpp +++ b/src/mame/drivers/d9final.cpp @@ -117,7 +117,7 @@ WRITE8_MEMBER(d9final_state::bank_w) /* game checks this after three attract cycles, otherwise coin inputs stop to work. */ READ8_MEMBER(d9final_state::prot_latch_r) { -// printf("PC=%06x\n",space.device().safe_pc()); +// printf("PC=%06x\n",m_maincpu->pc()); return 0x04; } diff --git a/src/mame/drivers/dccons.cpp b/src/mame/drivers/dccons.cpp index 9f3e959a2ae..553657c96f5 100644 --- a/src/mame/drivers/dccons.cpp +++ b/src/mame/drivers/dccons.cpp @@ -279,18 +279,18 @@ READ64_MEMBER(dc_cons_state::dcus_idle_skip_r ) { - //if (space.device().safe_pc()==0xc0ba52a) - // space.device().execute().spin_until_time(attotime::from_usec(2500)); - // device_spinuntil_int(&space.device()); + //if (m_maincpu->pc()==0xc0ba52a) + // m_maincpu->spin_until_time(attotime::from_usec(2500)); + // device_spinuntil_int(m_maincpu); return dc_ram[0x2303b0/8]; } READ64_MEMBER(dc_cons_state::dcjp_idle_skip_r ) { - //if (space.device().safe_pc()==0xc0bac62) - // space.device().execute().spin_until_time(attotime::from_usec(2500)); - // device_spinuntil_int(&space.device()); + //if (m_maincpu->pc()==0xc0bac62) + // m_maincpu->spin_until_time(attotime::from_usec(2500)); + // device_spinuntil_int(m_maincpu); return dc_ram[0x2302f8/8]; } diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index 3162d85167a..3531b5cb765 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -445,7 +445,7 @@ public: void blit_horiz_line(); void blit_vert_line(); inline void log_blit(int data ); - void blitter_w( address_space &space, int blitter, offs_t offset, uint8_t data, int irq_vector ); + void blitter_w(int blitter, offs_t offset, uint8_t data, int irq_vector ); void blitter_w_funkyfig(int blitter, offs_t offset, uint8_t data, int irq_vector ); void copylayer(bitmap_ind16 &bitmap, const rectangle &cliprect, int layer ); void mmpanic_update_leds(); @@ -966,7 +966,7 @@ inline void ddenlovr_state::log_blit( int data ) #endif } -void ddenlovr_state::blitter_w( address_space &space, int blitter, offs_t offset, uint8_t data, int irq_vector ) +void ddenlovr_state::blitter_w(int blitter, offs_t offset, uint8_t data, int irq_vector ) { int hi_bits; @@ -1097,26 +1097,26 @@ g_profiler.start(PROFILER_VIDEO); ; #ifdef MAME_DEBUG popmessage("unknown blitter command %02x", data); - logerror("%06x: unknown blitter command %02x\n", space.device().safe_pc(), data); + logerror("%06x: unknown blitter command %02x\n", m_maincpu->pc(), data); #endif } if (irq_vector) /* quizchq */ - space.device().execute().set_input_line_and_vector(0, HOLD_LINE, irq_vector); + m_maincpu->set_input_line_and_vector(0, HOLD_LINE, irq_vector); else { /* ddenlovr */ if (m_ddenlovr_blitter_irq_enable) { m_ddenlovr_blitter_irq_flag = 1; - space.device().execute().set_input_line(1, HOLD_LINE); + m_maincpu->set_input_line(1, HOLD_LINE); } } break; default: - logerror("%06x: Blitter %d reg %02x = %02x\n", space.device().safe_pc(), blitter, m_ddenlovr_blit_regs[blitter], data); + logerror("%06x: Blitter %d reg %02x = %02x\n", m_maincpu->pc(), blitter, m_ddenlovr_blit_regs[blitter], data); break; } } @@ -1481,12 +1481,12 @@ g_profiler.stop(); WRITE8_MEMBER(ddenlovr_state::rongrong_blitter_w) { - blitter_w(space, 0, offset, data, 0xf8); + blitter_w(0, offset, data, 0xf8); } WRITE8_MEMBER(ddenlovr_state::ddenlovr_blitter_w) { - blitter_w(space, 0, offset, data, 0); + blitter_w(0, offset, data, 0); } @@ -1789,7 +1789,7 @@ WRITE8_MEMBER(ddenlovr_state::ddenlovr_select2_w) READ8_MEMBER(ddenlovr_state::rongrong_input2_r) { -// logerror("%04x: input2_r offset %d select %x\n", space.device().safe_pc(), offset, m_input_sel); +// logerror("%04x: input2_r offset %d select %x\n", m_maincpu->pc(), offset, m_input_sel); /* 0 and 1 are read from offset 1, 2 from offset 0... */ switch (m_input_sel) { @@ -1813,7 +1813,7 @@ READ8_MEMBER(ddenlovr_state::quiz365_input_r ) READ16_MEMBER(ddenlovr_state::quiz365_input2_r) { -// logerror("%04x: input2_r offset %d select %x\n",space.device().safe_pc(), offset, m_input_sel); +// logerror("%04x: input2_r offset %d select %x\n",m_maincpu->pc(), offset, m_input_sel); /* 0 and 1 are read from offset 1, 2 from offset 0... */ switch (m_input_sel) { @@ -2199,7 +2199,7 @@ READ8_MEMBER(ddenlovr_state::rongrong_input_r) WRITE8_MEMBER(ddenlovr_state::rongrong_select_w) { -//logerror("%04x: rongrong_select_w %02x\n",space.device().safe_pc(),data); +//logerror("%04x: rongrong_select_w %02x\n",m_maincpu->pc(),data); /* bits 0-4 = **both** ROM bank **AND** input select */ membank("bank1")->set_entry(data & 0x1f); @@ -2314,11 +2314,11 @@ WRITE8_MEMBER(ddenlovr_state::mmpanic_soundlatch_w) WRITE8_MEMBER(ddenlovr_state::mmpanic_blitter_w) { - blitter_w(space, 0, offset, data, 0xdf); // RST 18 + blitter_w(0, offset, data, 0xdf); // RST 18 } WRITE8_MEMBER(ddenlovr_state::mmpanic_blitter2_w) { - blitter_w(space, 1, offset, data, 0xdf); // RST 18 + blitter_w(1, offset, data, 0xdf); // RST 18 } void ddenlovr_state::mmpanic_update_leds() @@ -3017,7 +3017,7 @@ ADDRESS_MAP_END WRITE8_MEMBER(ddenlovr_state::mjmyster_rambank_w) { membank("bank2")->set_entry(data & 0x07); - //logerror("%04x: rambank = %02x\n", space.device().safe_pc(), data); + //logerror("%04x: rambank = %02x\n", m_maincpu->pc(), data); } WRITE8_MEMBER(ddenlovr_state::mjmyster_select2_w) @@ -3090,7 +3090,7 @@ WRITE8_MEMBER(ddenlovr_state::mjmyster_coincounter_w) WRITE8_MEMBER(ddenlovr_state::mjmyster_blitter_w) { - blitter_w(space, 0, offset, data, 0xfc); + blitter_w(0, offset, data, 0xfc); } static ADDRESS_MAP_START( mjmyster_portmap, AS_IO, 8, ddenlovr_state ) @@ -3260,7 +3260,7 @@ WRITE8_MEMBER(ddenlovr_state::hginga_blitter_w) break; } } - blitter_w(space, 0, offset, data, 0xfc); + blitter_w(0, offset, data, 0xfc); } static ADDRESS_MAP_START( hginga_portmap, AS_IO, 8, ddenlovr_state ) @@ -3723,7 +3723,7 @@ CUSTOM_INPUT_MEMBER(ddenlovr_state::mjflove_blitter_r) WRITE8_MEMBER(ddenlovr_state::mjflove_blitter_w) { - blitter_w(space, 0, offset, data, 0); + blitter_w(0, offset, data, 0); } WRITE8_MEMBER(ddenlovr_state::mjflove_coincounter_w) @@ -3916,7 +3916,7 @@ WRITE8_MEMBER(ddenlovr_state::sryudens_coincounter_w) WRITE8_MEMBER(ddenlovr_state::sryudens_rambank_w) { membank("bank2")->set_entry(data & 0x0f); - //logerror("%04x: rambank = %02x\n", space.device().safe_pc(), data); + //logerror("%04x: rambank = %02x\n", m_maincpu->pc(), data); } static ADDRESS_MAP_START( sryudens_portmap, AS_IO, 8, ddenlovr_state ) diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp index a561781860e..cf66b1d7371 100644 --- a/src/mame/drivers/deco32.cpp +++ b/src/mame/drivers/deco32.cpp @@ -902,7 +902,7 @@ WRITE32_MEMBER( dragngun_state::gun_irq_ack_w ) // TODO: improve this, Y axis not understood at all READ32_MEMBER( dragngun_state::lockload_gun_mirror_r ) { -//logerror("%08x:Read gun %d\n",space.device().safe_pc(),offset); +//logerror("%08x:Read gun %d\n",m_maincpu->pc(),offset); switch(offset) { diff --git a/src/mame/drivers/deco_mlc.cpp b/src/mame/drivers/deco_mlc.cpp index d9574037d92..f71e4976822 100644 --- a/src/mame/drivers/deco_mlc.cpp +++ b/src/mame/drivers/deco_mlc.cpp @@ -111,14 +111,6 @@ /***************************************************************************/ -READ32_MEMBER(deco_mlc_state::test2_r) -{ -// if (offset==0) -// return ioport("IN0")->read(); //0xffffffff; -// logerror("%08x: Test2_r %d\n",space.device().safe_pc(),offset); - return machine().rand(); //0xffffffff; -} - READ32_MEMBER(deco_mlc_state::mlc_440008_r) { return 0xffffffff; @@ -132,7 +124,7 @@ READ32_MEMBER(deco_mlc_state::mlc_44001c_r) */ //if (offset==0) // return machine().rand()|(machine().rand()<<16); -// logerror("%08x: Test3_r %d\n",space.device().safe_pc(),offset); +// logerror("%08x: Test3_r %d\n",m_maincpu->pc(),offset); // return 0x00100000; return 0xffffffff; } @@ -144,7 +136,7 @@ WRITE32_MEMBER(deco_mlc_state::mlc_44001c_w) READ32_MEMBER(deco_mlc_state::mlc_200070_r) { m_vbl_i ^=0xffffffff; -//logerror("vbl r %08x\n", space.device().safe_pc()); +//logerror("vbl r %08x\n", m_maincpu->pc()); // Todo: Vblank probably in $10 return m_vbl_i; } diff --git a/src/mame/drivers/djmain.cpp b/src/mame/drivers/djmain.cpp index 37a23b46f93..8858207c2b0 100644 --- a/src/mame/drivers/djmain.cpp +++ b/src/mame/drivers/djmain.cpp @@ -318,17 +318,17 @@ WRITE32_MEMBER(djmain_state::light_ctrl_2_w) WRITE32_MEMBER(djmain_state::unknown590000_w) { - //logerror("%08X: unknown 590000 write %08X: %08X & %08X\n", space.device().safe_pcbase(), offset, data, mem_mask); + //logerror("%08X: unknown 590000 write %08X: %08X & %08X\n", m_maincpu->pcbase(), offset, data, mem_mask); } WRITE32_MEMBER(djmain_state::unknown802000_w) { - //logerror("%08X: unknown 802000 write %08X: %08X & %08X\n", space.device().safe_pcbase(), offset, data, mem_mask); + //logerror("%08X: unknown 802000 write %08X: %08X & %08X\n", m_maincpu->pcbase(), offset, data, mem_mask); } WRITE32_MEMBER(djmain_state::unknownc02000_w) { - //logerror("%08X: unknown c02000 write %08X: %08X & %08X\n", space.device().safe_pcbase(), offset, data, mem_mask); + //logerror("%08X: unknown c02000 write %08X: %08X & %08X\n", m_maincpu->pcbase(), offset, data, mem_mask); } diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index e2d627648aa..297d16f1c63 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -429,7 +429,7 @@ WRITE8_MEMBER(dooyong_z80_state::primella_ctrl_w) /* bit 5 used but unknown */ -// logerror("%04x: bankswitch = %02x\n",space.device().safe_pc(),data&0xe0); +// logerror("%04x: bankswitch = %02x\n",m_maincpu->pc(),data&0xe0); } diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp index befe59ca877..12ff4955e77 100644 --- a/src/mame/drivers/dunhuang.cpp +++ b/src/mame/drivers/dunhuang.cpp @@ -295,7 +295,7 @@ WRITE8_MEMBER(dunhuang_state::clear_y_w) WRITE8_MEMBER(dunhuang_state::horiz_clear_w) { int i; -// logerror("%06x: horiz clear, y = %02x, data = %02d\n", space.device().safe_pc(), m_clear_y,data); +// logerror("%06x: horiz clear, y = %02x, data = %02d\n", m_maincpu->pc(), m_clear_y,data); for (i = 0; i < 0x40; i++) { int addr = m_clear_y * 0x40 + i; @@ -311,7 +311,7 @@ WRITE8_MEMBER(dunhuang_state::horiz_clear_w) WRITE8_MEMBER(dunhuang_state::vert_clear_w) { int i; -// logerror("%06x: vert clear, x = %02x, y = %02x, data = %02x\n", space.device().safe_pc(), m_pos_x,m_pos_y,data); +// logerror("%06x: vert clear, x = %02x, y = %02x, data = %02x\n", m_maincpu->pc(), m_pos_x,m_pos_y,data); for (i = 0; i < 0x08; i++) { int addr = (m_pos_x & 0x3f) + (i & 0x07) * 0x40; @@ -369,7 +369,7 @@ WRITE8_MEMBER(dunhuang_state::block_h_w) int i,j, addr; uint8_t *tile_addr; -// logerror("%06x: block dst %x, src %x, xy %x %x, wh %x %x, clr %x\n", space.device().safe_pc(), m_block_dest, (m_block_addr_hi << 8) + m_block_addr_lo, m_block_x,m_block_y,m_block_w+1,m_block_h+1,m_block_c); +// logerror("%06x: block dst %x, src %x, xy %x %x, wh %x %x, clr %x\n", m_maincpu->pc(), m_block_dest, (m_block_addr_hi << 8) + m_block_addr_lo, m_block_x,m_block_y,m_block_w+1,m_block_h+1,m_block_c); m_block_h = data; diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp index d046e0e777d..aad1ade9dba 100644 --- a/src/mame/drivers/eolith.cpp +++ b/src/mame/drivers/eolith.cpp @@ -1612,7 +1612,7 @@ DRIVER_INIT_MEMBER(eolith_state,hidctch3) void eolith_state::speedup_read() { /* for debug */ - //if ((space.device().safe_pc()!=m_speedup_address) && (m_speedup_vblank!=1) ) + //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); if (m_speedup_vblank==0 && m_speedup_scanline < m_speedup_resume_scanline) diff --git a/src/mame/drivers/epos.cpp b/src/mame/drivers/epos.cpp index 8f95c060b1d..8f1c44d3af7 100644 --- a/src/mame/drivers/epos.cpp +++ b/src/mame/drivers/epos.cpp @@ -56,7 +56,7 @@ WRITE8_MEMBER(epos_state::dealer_decrypt_rom) else m_counter = (m_counter - 1) & 0x03; -// logerror("PC %08x: ctr=%04x\n",space.device().safe_pc(), m_counter); +// logerror("PC %08x: ctr=%04x\n",m_maincpu->pc(), m_counter); membank("bank1")->set_entry(m_counter); diff --git a/src/mame/drivers/esd16.cpp b/src/mame/drivers/esd16.cpp index 3894fd0626a..7ea23540101 100644 --- a/src/mame/drivers/esd16.cpp +++ b/src/mame/drivers/esd16.cpp @@ -110,7 +110,7 @@ READ16_MEMBER(esd16_state::esd_eeprom_r) return ((m_eeprom->do_read() & 0x01) << 15); } -// logerror("(0x%06x) unk EEPROM read: %04x\n", space.device().safe_pc(), mem_mask); +// logerror("(0x%06x) unk EEPROM read: %04x\n", m_maincpu->pc(), mem_mask); return 0; } @@ -119,7 +119,7 @@ WRITE16_MEMBER(esd16_state::esd_eeprom_w) if (ACCESSING_BITS_8_15) ioport("EEPROMOUT")->write(data, 0xffff); -// logerror("(0x%06x) Unk EEPROM write: %04x %04x\n", space.device().safe_pc(), data, mem_mask); +// logerror("(0x%06x) Unk EEPROM write: %04x %04x\n", m_maincpu->pc(), data, mem_mask); } diff --git a/src/mame/drivers/firetrap.cpp b/src/mame/drivers/firetrap.cpp index b2656fc1669..4f830782208 100644 --- a/src/mame/drivers/firetrap.cpp +++ b/src/mame/drivers/firetrap.cpp @@ -224,7 +224,7 @@ READ8_MEMBER(firetrap_state::firetrap_8751_bootleg_r) READ8_MEMBER(firetrap_state::firetrap_8751_r) { - //logerror("PC:%04x read from 8751\n",space.device().safe_pc()); + //logerror("PC:%04x read from 8751\n",m_maincpu->pc()); return m_i8751_return; } diff --git a/src/mame/drivers/fitfight.cpp b/src/mame/drivers/fitfight.cpp index 63bcdc943d5..461e9b621be 100644 --- a/src/mame/drivers/fitfight.cpp +++ b/src/mame/drivers/fitfight.cpp @@ -225,35 +225,35 @@ ADDRESS_MAP_END READ8_MEMBER(fitfight_state::snd_porta_r) { - //osd_printf_debug("PA R @%x\n",space.device().safe_pc()); + //logerror("PA R %s\n",machine().describe_context()); return machine().rand(); } READ8_MEMBER(fitfight_state::snd_portb_r) { - //osd_printf_debug("PB R @%x\n",space.device().safe_pc()); + //logerror("PB R %s\n",machine().describe_context()); return machine().rand(); } READ8_MEMBER(fitfight_state::snd_portc_r) { - //osd_printf_debug("PC R @%x\n",space.device().safe_pc()); + //logerror("PC R %s\n",machine().describe_context()); return machine().rand(); } WRITE8_MEMBER(fitfight_state::snd_porta_w) { - //osd_printf_debug("PA W %x @%x\n",data,space.device().safe_pc()); + //logerror("PA W %x %s\n",data,machine().describe_context()); } WRITE8_MEMBER(fitfight_state::snd_portb_w) { - //osd_printf_debug("PB W %x @%x\n",data,space.device().safe_pc()); + //logerror("PB W %x %s\n",data,machine().describe_context()); } WRITE8_MEMBER(fitfight_state::snd_portc_w) { - //osd_printf_debug("PC W %x @%x\n",data,space.device().safe_pc()); + //logerror("PC W %x %s\n",data,machine().describe_context()); } INTERRUPT_GEN_MEMBER(fitfight_state::snd_irq) diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp index 15460fb143f..18955d6f38e 100644 --- a/src/mame/drivers/gcpinbal.cpp +++ b/src/mame/drivers/gcpinbal.cpp @@ -123,7 +123,7 @@ INTERRUPT_GEN_MEMBER(gcpinbal_state::gcpinbal_interrupt) WRITE16_MEMBER(gcpinbal_state::d80010_w) { - //logerror("CPU #0 PC %06x: warning - write ioc offset %06x with %04x\n", m_maincpu->space.device().safe_pc(), offset, data); + //logerror("CPU #0 PC %06x: warning - write ioc offset %06x with %04x\n", m_maincpu->pc(), offset, data); COMBINE_DATA(&m_d80010_ram[offset]); } diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp index 601091cb58a..4719be6fa8d 100644 --- a/src/mame/drivers/m92.cpp +++ b/src/mame/drivers/m92.cpp @@ -260,14 +260,14 @@ TIMER_DEVICE_CALLBACK_MEMBER(m92_state::m92_scanline_interrupt) READ16_MEMBER(m92_state::m92_eeprom_r) { uint8_t *RAM = memregion("eeprom")->base(); -// logerror("%05x: EEPROM RE %04x\n",space.device().safe_pc(),offset); +// logerror("%05x: EEPROM RE %04x\n",m_maincpu->pc(),offset); return RAM[offset] | 0xff00; } WRITE16_MEMBER(m92_state::m92_eeprom_w) { uint8_t *RAM = memregion("eeprom")->base(); -// logerror("%05x: EEPROM WR %04x\n",space.device().safe_pc(),offset); +// logerror("%05x: EEPROM WR %04x\n",m_maincpu->pc(),offset); if (ACCESSING_BITS_0_7) RAM[offset] = data; } diff --git a/src/mame/drivers/neoprint.cpp b/src/mame/drivers/neoprint.cpp index b78c1cc0f63..73993577fcb 100644 --- a/src/mame/drivers/neoprint.cpp +++ b/src/mame/drivers/neoprint.cpp @@ -185,7 +185,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 &&s pace.device().safe_pc() != 0x5f90) + //if(m_maincpu->pc() != 0x1504 && m_maincpu->pc() != 0x5f86 && m_machine->safe_pc() != 0x5f90) // printf("%08x\n",m_maincpu->pc()); return m_vblank| 4 | 3; diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index e872351aba5..5436ed77eed 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -920,7 +920,7 @@ WRITE_LINE_MEMBER(segas32_state::display_enable_1_w) WRITE16_MEMBER(segas32_state::random_number_16_w) { -// osd_printf_debug("%06X:random_seed_w(%04X) = %04X & %04X\n", space.device().safe_pc(), offset*2, data, mem_mask); +// osd_printf_debug("%06X:random_seed_w(%04X) = %04X & %04X\n", m_maincpu->pc(), offset*2, data, mem_mask); } READ16_MEMBER(segas32_state::random_number_16_r) @@ -930,7 +930,7 @@ READ16_MEMBER(segas32_state::random_number_16_r) WRITE32_MEMBER(segas32_state::random_number_32_w) { -// osd_printf_debug("%06X:random_seed_w(%04X) = %04X & %04X\n", space.device().safe_pc(), offset*2, data, mem_mask); +// osd_printf_debug("%06X:random_seed_w(%04X) = %04X & %04X\n", m_maincpu->pc(), offset*2, data, mem_mask); } READ32_MEMBER(segas32_state::random_number_32_r) diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index 73cbe985d11..7fc0f07d3da 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -2164,7 +2164,7 @@ READ32_MEMBER(seibuspi_state::senkyua_speedup_r) READ32_MEMBER(seibuspi_state::batlball_speedup_r) { -// printf("space.device().safe_pc() %06x\n", m_maincpu->pc()); +// printf("m_maincpu->pc() %06x\n", m_maincpu->pc()); /* batlbalu */ if (m_maincpu->pc()==0x00305996) m_maincpu->spin_until_interrupt(); // idle diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index 071c45e3062..a78eb534179 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -201,7 +201,7 @@ WRITE8_MEMBER(suna16_state::bestbest_prot_w) case 0x00: m_prot = m_prot ^ 0x0009; break; case 0x08: m_prot = m_prot ^ 0x0002; break; case 0x0c: m_prot = m_prot ^ 0x0003; break; - //default: logerror("CPU#0 PC %06X - Unknown protection value: %04X\n", space.device().safe_pc(), data); + //default: logerror("CPU#0 PC %06X - Unknown protection value: %04X\n", m_maincpu->pc(), data); } } diff --git a/src/mame/includes/deco_mlc.h b/src/mame/includes/deco_mlc.h index cdf3c238b03..ccbe15303cd 100644 --- a/src/mame/includes/deco_mlc.h +++ b/src/mame/includes/deco_mlc.h @@ -45,7 +45,6 @@ public: std::unique_ptr<uint16_t[]> m_mlc_spriteram; std::unique_ptr<uint16_t[]> m_mlc_spriteram_spare; std::unique_ptr<uint16_t[]> m_mlc_buffered_spriteram; - DECLARE_READ32_MEMBER(test2_r); DECLARE_READ32_MEMBER(mlc_440008_r); DECLARE_READ32_MEMBER(mlc_44001c_r); DECLARE_WRITE32_MEMBER(mlc_44001c_w); diff --git a/src/mame/machine/namcoio.cpp b/src/mame/machine/namcoio.cpp index a575b2ad217..2eaa9079f31 100644 --- a/src/mame/machine/namcoio.cpp +++ b/src/mame/machine/namcoio.cpp @@ -476,7 +476,7 @@ READ8_MEMBER( namcoio_device::read ) // RAM is 4-bit wide; Pac & Pal requires the | 0xf0 otherwise Easter egg doesn't work offset &= 0x3f; -// LOG("%s: I/O read: mode %d, offset %d = %02x\n", machine().describe_context(), space.device().safe_pc(), offset / 16, namcoio_ram[(offset & 0x30) + 8], offset & 0x0f, namcoio_ram[offset]&0x0f); +// LOG("%s: I/O read: mode %d, offset %d = %02x\n", machine().describe_context(), offset / 16, namcoio_ram[(offset & 0x30) + 8], offset & 0x0f, namcoio_ram[offset]&0x0f); return 0xf0 | m_ram[offset]; } |