diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp index da0359e649b..4ed045460d1 100644 --- a/src/devices/cpu/i86/i186.cpp +++ b/src/devices/cpu/i86/i186.cpp @@ -271,7 +271,7 @@ void i80186_cpu_device::execute_run() if (tmphigh) interrupt(5); CLK(BOUND); - logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag(), pc(), high, low, tmp); + logerror("%06x: bound %04x high %04x low %04x tmp\n", pc(), high, low, tmp); } break; @@ -342,7 +342,7 @@ void i80186_cpu_device::execute_run() m_sregs[DS] = m_src; break; default: - logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), pc()); + logerror("%06x: Mov Sreg - Invalid register\n", pc()); m_ip = m_prev_ip; interrupt(6); break; @@ -538,7 +538,7 @@ void i80186_cpu_device::execute_run() if(!common_op(op)) { m_icount -= 10; // UD fault timing? - logerror("%s: %06x: Invalid Opcode %02x\n", tag(), pc(), op); + logerror("%06x: Invalid Opcode %02x\n", pc(), op); m_ip = m_prev_ip; interrupt(6); // 80186 has #UD break; diff --git a/src/devices/cpu/i86/i286.cpp b/src/devices/cpu/i86/i286.cpp index f28438853ea..1cb06fd0298 100644 --- a/src/devices/cpu/i86/i286.cpp +++ b/src/devices/cpu/i86/i286.cpp @@ -1412,7 +1412,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } if (tmphigh) interrupt(5); CLK(BOUND); - logerror("%s: %06x: bound %04x high %04x low %04x tmp\n", tag(), pc(), high, low, tmp); + logerror("%06x: bound %04x high %04x low %04x tmp\n", pc(), high, low, tmp); } break; @@ -1489,7 +1489,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } m_modrm = fetch(); if((m_modrm & 0x38) > 0x18) { - logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), pc()); + logerror("%06x: Mov Sreg - Invalid register\n", pc()); throw TRAP(FAULT_UD, (uint16_t)-1); } PutRMWord(m_sregs[(m_modrm & 0x38) >> 3]); @@ -1513,7 +1513,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } data_descriptor(DS, m_src); break; default: - logerror("%s: %06x: Mov Sreg - Invalid register\n", tag(), pc()); + logerror("%06x: Mov Sreg - Invalid register\n", pc()); throw TRAP(FAULT_UD, (uint16_t)-1); } break; @@ -1776,7 +1776,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } case 0xf0: // i_lock if(PM && (CPL > m_IOPL)) throw TRAP(FAULT_GP, 0); - logerror("%s: %06x: Warning - BUSLOCK\n", tag(), pc()); + logerror("%06x: Warning - BUSLOCK\n", pc()); m_no_interrupt = 1; CLK(NOP); break; @@ -1853,7 +1853,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } CLKM(PUSH_R16,PUSH_M16); break; default: - logerror("%s: %06x: FF Pre with unimplemented mod\n", tag(), pc()); + logerror("%06x: FF Pre with unimplemented mod\n", pc()); throw TRAP(FAULT_UD,(uint16_t)-1); } } @@ -1889,7 +1889,7 @@ reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); } if(!common_op(op)) { m_icount -= 10; // UD fault timing? - logerror("%s: %06x: Invalid Opcode %02x\n", tag(), pc(), op); + logerror("%06x: Invalid Opcode %02x\n", pc(), op); m_ip = m_prev_ip; throw TRAP(FAULT_UD, (uint16_t)-1); } diff --git a/src/devices/cpu/i86/i86.cpp b/src/devices/cpu/i86/i86.cpp index b0076d210ef..ad3efd8a46c 100644 --- a/src/devices/cpu/i86/i86.cpp +++ b/src/devices/cpu/i86/i86.cpp @@ -256,7 +256,7 @@ void i8086_cpu_device::execute_run() if(!common_op(op)) { m_icount -= 10; - logerror("%s: %06x: Invalid Opcode %02x\n", tag(), pc(), op); + logerror("%06x: Invalid Opcode %02x\n", pc(), op); break; } break; @@ -1884,7 +1884,7 @@ bool i8086_common_cpu_device::common_op(uint8_t op) m_modrm = fetch(); GetRMByte(); CLK(NOP); - logerror("%s: %06x: Unimplemented floating point escape %02x%02x\n", tag(), pc(), op, m_modrm); + logerror("%06x: Unimplemented floating point escape %02x%02x\n", pc(), op, m_modrm); break; @@ -2051,7 +2051,7 @@ bool i8086_common_cpu_device::common_op(uint8_t op) case 0xf0: // i_lock case 0xf1: // 0xf1 is 0xf0; verified on real CPU - logerror("%s: %06x: Warning - BUSLOCK\n", tag(), pc()); + logerror("%06x: Warning - BUSLOCK\n", pc()); m_lock = true; m_no_interrupt = 1; CLK(NOP); @@ -2076,7 +2076,7 @@ bool i8086_common_cpu_device::common_op(uint8_t op) case 0xae: CLK(OVERRIDE); if (c) do { i_scasb(); c--; } while (c>0 && !ZF && m_icount>0); m_regs.w[CX]=c; m_seg_prefix = false; m_seg_prefix_next = false; break; case 0xaf: CLK(OVERRIDE); if (c) do { i_scasw(); c--; } while (c>0 && !ZF && m_icount>0); m_regs.w[CX]=c; m_seg_prefix = false; m_seg_prefix_next = false; break; default: - logerror("%s: %06x: REPNE invalid\n", tag(), pc()); + logerror("%06x: REPNE invalid\n", pc()); // Decrement IP so the normal instruction will be executed next m_ip--; invalid = true; @@ -2109,7 +2109,7 @@ bool i8086_common_cpu_device::common_op(uint8_t op) case 0xae: CLK(OVERRIDE); if (c) do { i_scasb(); c--; } while (c>0 && ZF && m_icount>0); m_regs.w[CX]=c; m_seg_prefix = false; m_seg_prefix_next = false; break; case 0xaf: CLK(OVERRIDE); if (c) do { i_scasw(); c--; } while (c>0 && ZF && m_icount>0); m_regs.w[CX]=c; m_seg_prefix = false; m_seg_prefix_next = false; break; default: - logerror("%s: %06x: REPE invalid\n", tag(), pc()); + logerror("%06x: REPE invalid\n", pc()); // Decrement IP so the normal instruction will be executed next m_ip--; invalid = true; @@ -2369,7 +2369,7 @@ bool i8086_common_cpu_device::common_op(uint8_t op) CLKM(INCDEC_R8,INCDEC_M8); break; default: - logerror("%s: %06x: FE Pre with unimplemented mod\n", tag(), pc()); + logerror("%06x: FE Pre with unimplemented mod\n", pc()); break; } } @@ -2425,7 +2425,7 @@ bool i8086_common_cpu_device::common_op(uint8_t op) CLKM(PUSH_R16,PUSH_M16); break; default: - logerror("%s: %06x: FF Pre with unimplemented mod\n", tag(), pc()); + logerror("%06x: FF Pre with unimplemented mod\n", pc()); break; } } diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp index cb8c0ecc8ed..cb0848bda9c 100644 --- a/src/devices/cpu/z80/z80.cpp +++ b/src/devices/cpu/z80/z80.cpp @@ -631,8 +631,8 @@ inline void z80_device::ret_cond(bool cond, uint8_t opcode) ***************************************************************/ inline void z80_device::retn() { - LOG(("Z80 '%s' RETN m_iff1:%d m_iff2:%d\n", - tag(), m_iff1, m_iff2)); + LOG(("Z80 RETN m_iff1:%d m_iff2:%d\n", + m_iff1, m_iff2)); pop(m_pc); WZ = PC; m_iff1 = m_iff2; @@ -2536,8 +2536,8 @@ OP(fd,ff) { illegal_1(); op_ff(); } /* DB FD OP(illegal,2) { - logerror("Z80 '%s' ill. opcode $ed $%02x\n", - tag(), m_decrypted_opcodes_direct->read_byte((PCD-1)&0xffff)); + logerror("Z80 ill. opcode $ed $%02x\n", + m_decrypted_opcodes_direct->read_byte((PCD-1)&0xffff)); } /********************************************************** @@ -3160,7 +3160,7 @@ void z80_device::take_interrupt() // fetch the IRQ vector device_z80daisy_interface *intf = daisy_get_irq_device(); int irq_vector = (intf != nullptr) ? intf->z80daisy_irq_ack() : standard_irq_callback_member(*this, 0); - LOG(("Z80 '%s' single int. irq_vector $%02x\n", tag(), irq_vector)); + LOG(("Z80 single int. irq_vector $%02x\n", irq_vector)); /* Interrupt mode 2. Call [i:databyte] */ if( m_im == 2 ) @@ -3171,7 +3171,7 @@ void z80_device::take_interrupt() irq_vector = (irq_vector & 0xff) | (m_i << 8); push(m_pc); rm16(irq_vector, m_pc); - LOG(("Z80 '%s' IM2 [$%04x] = $%04x\n", tag(), irq_vector, PCD)); + LOG(("Z80 IM2 [$%04x] = $%04x\n", irq_vector, PCD)); /* CALL opcode timing + 'interrupt latency' cycles */ m_icount -= m_cc_op[0xcd] + m_cc_ex[0xff]; } @@ -3190,7 +3190,7 @@ void z80_device::take_interrupt() /* Interrupt mode 0. We check for CALL and JP instructions, */ /* if neither of these were found we assume a 1 byte opcode */ /* was placed on the databus */ - LOG(("Z80 '%s' IM0 $%04x\n", tag(), irq_vector)); + LOG(("Z80 IM0 $%04x\n", irq_vector)); /* check for nop */ if (irq_vector != 0x00) diff --git a/src/devices/imagedev/floppy.cpp b/src/devices/imagedev/floppy.cpp index ac59c9f38cf..2e9b4e4d931 100644 --- a/src/devices/imagedev/floppy.cpp +++ b/src/devices/imagedev/floppy.cpp @@ -658,7 +658,7 @@ void floppy_image_device::stp_w(int state) } if(ocyl != cyl) { - if (TRACE_STEP) logerror("%s: track %d\n", tag(), cyl); + if (TRACE_STEP) logerror("track %d\n", cyl); // Do we want a stepper sound? // We plan for 5 zones with possibly specific sounds if (m_make_sound) m_sound_out->step(cyl*5/tracks); @@ -706,7 +706,7 @@ void floppy_image_device::seek_phase_w(int phases) subcyl = next_pos & 3; if(TRACE_STEP && (next_pos != cur_pos)) - logerror("%s: track %d.%d\n", tag(), cyl, subcyl); + logerror("track %d.%d\n", cyl, subcyl); /* Update disk detection if applicable */ if (exists() && !dskchg_writable)