diff options
-rw-r--r-- | src/devices/cpu/m6502/deco16.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6502/m4510.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6502/m6502.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6502/m6502.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/m6502/m6504.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6502/m6507.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6502/m6509.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6502/m6510.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6502/m65ce02.cpp | 4 | ||||
-rw-r--r-- | src/devices/cpu/m6809/m6809.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/m6809/m6809.h | 2 | ||||
-rw-r--r-- | src/mame/machine/deco222.cpp | 8 | ||||
-rw-r--r-- | src/mame/machine/decocpu6.cpp | 2 | ||||
-rw-r--r-- | src/mame/machine/decocpu7.cpp | 6 | ||||
-rw-r--r-- | src/mame/machine/konami1.cpp | 4 |
15 files changed, 29 insertions, 29 deletions
diff --git a/src/devices/cpu/m6502/deco16.cpp b/src/devices/cpu/m6502/deco16.cpp index e5121676253..f822436d2ef 100644 --- a/src/devices/cpu/m6502/deco16.cpp +++ b/src/devices/cpu/m6502/deco16.cpp @@ -31,9 +31,9 @@ util::disasm_interface *deco16_device::create_disassembler() void deco16_device::device_start() { if(direct_disabled) - mintf = new mi_default_nd; + mintf = std::make_unique<mi_default_nd>(); else - mintf = new mi_default_normal; + mintf = std::make_unique<mi_default_normal>(); init(); diff --git a/src/devices/cpu/m6502/m4510.cpp b/src/devices/cpu/m6502/m4510.cpp index 4e8a9b4216f..72acc006aea 100644 --- a/src/devices/cpu/m6502/m4510.cpp +++ b/src/devices/cpu/m6502/m4510.cpp @@ -38,9 +38,9 @@ util::disasm_interface *m4510_device::create_disassembler() void m4510_device::device_start() { if(direct_disabled) - mintf = new mi_4510_nd(this); + mintf = std::make_unique<mi_4510_nd>(this); else - mintf = new mi_4510_normal(this); + mintf = std::make_unique<mi_4510_normal>(this); m65ce02_device::init(); diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp index 39975d6127b..e63e622ffe7 100644 --- a/src/devices/cpu/m6502/m6502.cpp +++ b/src/devices/cpu/m6502/m6502.cpp @@ -33,9 +33,9 @@ m6502_device::m6502_device(const machine_config &mconfig, device_type type, cons void m6502_device::device_start() { if(direct_disabled) - mintf = new mi_default_nd; + mintf = std::make_unique<mi_default_nd>(); else - mintf = new mi_default_normal; + mintf = std::make_unique<mi_default_normal>(); init(); } diff --git a/src/devices/cpu/m6502/m6502.h b/src/devices/cpu/m6502/m6502.h index 8f5236818f9..96dfc1f9be3 100644 --- a/src/devices/cpu/m6502/m6502.h +++ b/src/devices/cpu/m6502/m6502.h @@ -123,7 +123,7 @@ protected: uint8_t IR; /* Prefetched instruction register */ int inst_state_base; /* Current instruction bank */ - memory_interface *mintf; + std::unique_ptr<memory_interface> mintf; int inst_state, inst_substate; int icount; bool nmi_state, irq_state, apu_irq_state, v_state; diff --git a/src/devices/cpu/m6502/m6504.cpp b/src/devices/cpu/m6502/m6504.cpp index 0d7322b5fed..36084a12254 100644 --- a/src/devices/cpu/m6502/m6504.cpp +++ b/src/devices/cpu/m6502/m6504.cpp @@ -23,9 +23,9 @@ m6504_device::m6504_device(const machine_config &mconfig, const char *tag, devic void m6504_device::device_start() { if(direct_disabled) - mintf = new mi_6504_nd; + mintf = std::make_unique<mi_6504_nd>(); else - mintf = new mi_6504_normal; + mintf = std::make_unique<mi_6504_normal>(); init(); } diff --git a/src/devices/cpu/m6502/m6507.cpp b/src/devices/cpu/m6502/m6507.cpp index b6d44ae4c21..8909b839c46 100644 --- a/src/devices/cpu/m6502/m6507.cpp +++ b/src/devices/cpu/m6502/m6507.cpp @@ -23,9 +23,9 @@ m6507_device::m6507_device(const machine_config &mconfig, const char *tag, devic void m6507_device::device_start() { if(direct_disabled) - mintf = new mi_6507_nd; + mintf = std::make_unique<mi_6507_nd>(); else - mintf = new mi_6507_normal; + mintf = std::make_unique<mi_6507_normal>(); init(); } diff --git a/src/devices/cpu/m6502/m6509.cpp b/src/devices/cpu/m6502/m6509.cpp index 828d3459b88..5fdf1114f96 100644 --- a/src/devices/cpu/m6502/m6509.cpp +++ b/src/devices/cpu/m6502/m6509.cpp @@ -26,9 +26,9 @@ m6509_device::m6509_device(const machine_config &mconfig, const char *tag, devic void m6509_device::device_start() { if(direct_disabled) - mintf = new mi_6509_nd(this); + mintf = std::make_unique<mi_6509_nd>(this); else - mintf = new mi_6509_normal(this); + mintf = std::make_unique<mi_6509_normal>(this); init(); diff --git a/src/devices/cpu/m6502/m6510.cpp b/src/devices/cpu/m6502/m6510.cpp index a8fb427210b..c9c00b9cb27 100644 --- a/src/devices/cpu/m6502/m6510.cpp +++ b/src/devices/cpu/m6502/m6510.cpp @@ -45,9 +45,9 @@ void m6510_device::device_start() write_port.resolve_safe(); if(direct_disabled) - mintf = new mi_6510_nd(this); + mintf = std::make_unique<mi_6510_nd>(this); else - mintf = new mi_6510_normal(this); + mintf = std::make_unique<mi_6510_normal>(this); init(); diff --git a/src/devices/cpu/m6502/m65ce02.cpp b/src/devices/cpu/m6502/m65ce02.cpp index e416cfa0089..ff5c66b160c 100644 --- a/src/devices/cpu/m6502/m65ce02.cpp +++ b/src/devices/cpu/m6502/m65ce02.cpp @@ -45,9 +45,9 @@ void m65ce02_device::init() void m65ce02_device::device_start() { if(direct_disabled) - mintf = new mi_default_nd; + mintf = std::make_unique<mi_default_nd>(); else - mintf = new mi_default_normal; + mintf = std::make_unique<mi_default_normal>(); init(); } diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp index a1d0026262c..2438d90c304 100644 --- a/src/devices/cpu/m6809/m6809.cpp +++ b/src/devices/cpu/m6809/m6809.cpp @@ -154,7 +154,7 @@ m6809_base_device::m6809_base_device(const machine_config &mconfig, const char * void m6809_base_device::device_start() { if (!m_mintf) - m_mintf = new mi_default; + m_mintf = std::make_unique<mi_default>(); m_mintf->m_program = &space(AS_PROGRAM); m_mintf->m_sprogram = has_space(AS_OPCODES) ? &space(AS_OPCODES) : m_mintf->m_program; diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h index 973bf582c0e..675ec9e2317 100644 --- a/src/devices/cpu/m6809/m6809.h +++ b/src/devices/cpu/m6809/m6809.h @@ -155,7 +155,7 @@ protected: }; // Memory interface - memory_interface * m_mintf; + std::unique_ptr<memory_interface> m_mintf; // CPU registers PAIR16 m_pc; // program counter diff --git a/src/mame/machine/deco222.cpp b/src/mame/machine/deco222.cpp index 1371f8087b4..098c38e0644 100644 --- a/src/mame/machine/deco222.cpp +++ b/src/mame/machine/deco222.cpp @@ -19,14 +19,14 @@ deco_222_device::deco_222_device(const machine_config &mconfig, const char *tag, void deco_222_device::device_start() { - mintf = new mi_decrypt; + mintf = std::make_unique<mi_decrypt>(); init(); } void deco_222_device::device_reset() { m6502_device::device_reset(); - static_cast<mi_decrypt *>(mintf)->had_written = false; + downcast<mi_decrypt &>(*mintf).had_written = false; } uint8_t deco_222_device::mi_decrypt::read_sync(uint16_t adr) @@ -56,14 +56,14 @@ deco_c10707_device::deco_c10707_device(const machine_config &mconfig, const char void deco_c10707_device::device_start() { - mintf = new mi_decrypt; + mintf = std::make_unique<mi_decrypt>(); init(); } void deco_c10707_device::device_reset() { m6502_device::device_reset(); - static_cast<mi_decrypt *>(mintf)->had_written = false; + downcast<mi_decrypt &>(*mintf).had_written = false; } uint8_t deco_c10707_device::mi_decrypt::read_sync(uint16_t adr) diff --git a/src/mame/machine/decocpu6.cpp b/src/mame/machine/decocpu6.cpp index f583887188f..1bf1cabaf6c 100644 --- a/src/mame/machine/decocpu6.cpp +++ b/src/mame/machine/decocpu6.cpp @@ -19,7 +19,7 @@ deco_cpu6_device::deco_cpu6_device(const machine_config &mconfig, const char *ta void deco_cpu6_device::device_start() { - mintf = new mi_decrypt; + mintf = std::make_unique<mi_decrypt>(); init(); } diff --git a/src/mame/machine/decocpu7.cpp b/src/mame/machine/decocpu7.cpp index dd0031ff7b8..006680dea50 100644 --- a/src/mame/machine/decocpu7.cpp +++ b/src/mame/machine/decocpu7.cpp @@ -14,14 +14,14 @@ deco_cpu7_device::deco_cpu7_device(const machine_config &mconfig, const char *ta void deco_cpu7_device::device_start() { - mintf = new mi_decrypt; + mintf = std::make_unique<mi_decrypt>(); init(); } void deco_cpu7_device::device_reset() { m6502_device::device_reset(); - static_cast<mi_decrypt *>(mintf)->had_written = false; + downcast<mi_decrypt &>(*mintf).had_written = false; } uint8_t deco_cpu7_device::mi_decrypt::read_sync(uint16_t adr) @@ -43,7 +43,7 @@ void deco_cpu7_device::mi_decrypt::write(uint16_t adr, uint8_t val) util::disasm_interface *deco_cpu7_device::create_disassembler() { - return new disassembler(static_cast<mi_decrypt *>(mintf)); + return new disassembler(downcast<mi_decrypt *>(mintf.get())); } deco_cpu7_device::disassembler::disassembler(mi_decrypt *mi) : mintf(mi) diff --git a/src/mame/machine/konami1.cpp b/src/mame/machine/konami1.cpp index 501b54c3018..f927158c62e 100644 --- a/src/mame/machine/konami1.cpp +++ b/src/mame/machine/konami1.cpp @@ -19,7 +19,7 @@ konami1_device::konami1_device(const machine_config &mconfig, const char *tag, d void konami1_device::device_start() { - m_mintf = new mi_konami1(m_boundary); + m_mintf = std::make_unique<mi_konami1>(m_boundary); m6809_base_device::device_start(); } @@ -27,7 +27,7 @@ void konami1_device::set_encryption_boundary(uint16_t adr) { m_boundary = adr; if(m_mintf) - static_cast<mi_konami1 *>(m_mintf)->m_boundary = adr; + downcast<mi_konami1 *>(m_mintf.get())->m_boundary = adr; } konami1_device::mi_konami1::mi_konami1(uint16_t adr) |