diff options
Diffstat (limited to 'src/devices/cpu/z8000/z8000.cpp')
-rw-r--r-- | src/devices/cpu/z8000/z8000.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp index dcc52f92fb0..ee56855815d 100644 --- a/src/devices/cpu/z8000/z8000.cpp +++ b/src/devices/cpu/z8000/z8000.cpp @@ -33,7 +33,7 @@ const device_type Z8001 = &device_creator<z8001_device>; const device_type Z8002 = &device_creator<z8002_device>; -z8002_device::z8002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z8002_device::z8002_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : cpu_device(mconfig, Z8002, "Z8002", tag, owner, clock, "z8002", __FILE__) , m_program_config("program", ENDIANNESS_BIG, 16, 16, 0) , m_io_config("io", ENDIANNESS_BIG, 8, 16, 0) @@ -43,7 +43,7 @@ z8002_device::z8002_device(const machine_config &mconfig, const char *tag, devic } -z8002_device::z8002_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) +z8002_device::z8002_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) : cpu_device(mconfig, type, name, tag, owner, clock, shortname, source) , m_program_config("program", ENDIANNESS_BIG, 16, 20, 0) , m_io_config("io", ENDIANNESS_BIG, 16, 16, 0) @@ -53,7 +53,7 @@ z8002_device::z8002_device(const machine_config &mconfig, device_type type, cons } -z8001_device::z8001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) +z8001_device::z8001_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock) : z8002_device(mconfig, Z8001, "Zilog Z8001", tag, owner, clock, "z8001", __FILE__) , m_data_config("data", ENDIANNESS_BIG, 16, 20, 0) { @@ -384,7 +384,7 @@ void z8002_device::set_irq(int type) m_irq_req = type; break; case Z8000_SYSCALL >> 8: - LOG(("Z8K '%s' SYSCALL $%02x\n", tag(), type & 0xff)); + LOG(("Z8K '%s' SYSCALL $%02x\n", tag().c_str(), type & 0xff)); m_irq_req = type; break; default: @@ -473,7 +473,7 @@ void z8002_device::Interrupt() m_irq_req &= ~Z8000_EPU; CHANGE_FCW(GET_FCW(EPU)); m_pc = GET_PC(EPU); - LOG(("Z8K '%s' ext instr trap $%04x\n", tag(), m_pc)); + LOG(("Z8K '%s' ext instr trap $%04x\n", tag().c_str(), m_pc)); } else if (m_irq_req & Z8000_TRAP) @@ -485,7 +485,7 @@ void z8002_device::Interrupt() m_irq_req &= ~Z8000_TRAP; CHANGE_FCW(GET_FCW(TRAP)); m_pc = GET_PC(TRAP); - LOG(("Z8K '%s' priv instr trap $%04x\n", tag(), m_pc)); + LOG(("Z8K '%s' priv instr trap $%04x\n", tag().c_str(), m_pc)); } else if (m_irq_req & Z8000_SYSCALL) @@ -497,7 +497,7 @@ void z8002_device::Interrupt() m_irq_req &= ~Z8000_SYSCALL; CHANGE_FCW(GET_FCW(SYSCALL)); m_pc = GET_PC(SYSCALL); - LOG(("Z8K '%s' syscall $%04x\n", tag(), m_pc)); + LOG(("Z8K '%s' syscall $%04x\n", tag().c_str(), m_pc)); } else if (m_irq_req & Z8000_SEGTRAP) @@ -509,7 +509,7 @@ void z8002_device::Interrupt() m_irq_req &= ~Z8000_SEGTRAP; CHANGE_FCW(GET_FCW(SEGTRAP)); m_pc = GET_PC(SEGTRAP); - LOG(("Z8K '%s' segtrap $%04x\n", tag(), m_pc)); + LOG(("Z8K '%s' segtrap $%04x\n", tag().c_str(), m_pc)); } else if (m_irq_req & Z8000_NMI) @@ -522,7 +522,7 @@ void z8002_device::Interrupt() m_irq_req &= ~Z8000_NMI; CHANGE_FCW(GET_FCW(NMI)); m_pc = GET_PC(NMI); - LOG(("Z8K '%s' NMI $%04x\n", tag(), m_pc)); + LOG(("Z8K '%s' NMI $%04x\n", tag().c_str(), m_pc)); } else if ((m_irq_req & Z8000_NVI) && (m_fcw & F_NVIE)) @@ -534,7 +534,7 @@ void z8002_device::Interrupt() m_pc = GET_PC(NVI); m_irq_req &= ~Z8000_NVI; CHANGE_FCW(GET_FCW(NVI)); - LOG(("Z8K '%s' NVI $%04x\n", tag(), m_pc)); + LOG(("Z8K '%s' NVI $%04x\n", tag().c_str(), m_pc)); } else if ((m_irq_req & Z8000_VI) && (m_fcw & F_VIE)) @@ -546,7 +546,7 @@ void z8002_device::Interrupt() m_pc = read_irq_vector(); m_irq_req &= ~Z8000_VI; CHANGE_FCW(GET_FCW(VI)); - LOG(("Z8K '%s' VI [$%04x/$%04x] fcw $%04x, pc $%04x\n", tag(), m_irq_vec, VEC00 + ( m_vector_mult * 2 ) * (m_irq_req & 0xff), m_fcw, m_pc)); + LOG(("Z8K '%s' VI [$%04x/$%04x] fcw $%04x, pc $%04x\n", tag().c_str(), m_irq_vec, VEC00 + ( m_vector_mult * 2 ) * (m_irq_req & 0xff), m_fcw, m_pc)); } } |