summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/ucom4
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/ucom4')
-rw-r--r--src/devices/cpu/ucom4/ucom4.cpp16
-rw-r--r--src/devices/cpu/ucom4/ucom4.h10
-rw-r--r--src/devices/cpu/ucom4/ucom4op.cpp10
3 files changed, 18 insertions, 18 deletions
diff --git a/src/devices/cpu/ucom4/ucom4.cpp b/src/devices/cpu/ucom4/ucom4.cpp
index 4a1a6968dbe..69b608a6592 100644
--- a/src/devices/cpu/ucom4/ucom4.cpp
+++ b/src/devices/cpu/ucom4/ucom4.cpp
@@ -58,19 +58,19 @@ ADDRESS_MAP_END
// device definitions
-upd553_cpu_device::upd553_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd553_cpu_device::upd553_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ucom4_cpu_device(mconfig, NEC_D553, "uPD553", tag, owner, clock, NEC_UCOM43, 3 /* stack levels */, 11 /* prg width */, ADDRESS_MAP_NAME(program_2k), 7 /* data width */, ADDRESS_MAP_NAME(data_96x4), "upd553", __FILE__)
{ }
-upd557l_cpu_device::upd557l_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd557l_cpu_device::upd557l_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ucom4_cpu_device(mconfig, NEC_D557L, "uPD557L", tag, owner, clock, NEC_UCOM43, 3, 11, ADDRESS_MAP_NAME(program_2k), 7, ADDRESS_MAP_NAME(data_96x4), "upd557l", __FILE__)
{ }
-upd650_cpu_device::upd650_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd650_cpu_device::upd650_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ucom4_cpu_device(mconfig, NEC_D650, "uPD650", tag, owner, clock, NEC_UCOM43, 3, 11, ADDRESS_MAP_NAME(program_2k), 7, ADDRESS_MAP_NAME(data_96x4), "upd650", __FILE__)
{ }
-upd552_cpu_device::upd552_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+upd552_cpu_device::upd552_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: ucom4_cpu_device(mconfig, NEC_D552, "uPD552", tag, owner, clock, NEC_UCOM44, 1, 10, ADDRESS_MAP_NAME(program_1k), 6, ADDRESS_MAP_NAME(data_64x4), "upd552", __FILE__)
{ }
@@ -232,7 +232,7 @@ UINT8 ucom4_cpu_device::input_r(int index)
case NEC_UCOM4_PORTD: inp = m_read_d(index, 0xff) | m_port_out[index]; break;
default:
- logerror("%s read from unknown port %c at $%03X\n", tag().c_str(), 'A' + index, m_prev_pc);
+ logerror("%s read from unknown port %c at $%03X\n", tag(), 'A' + index, m_prev_pc);
break;
}
@@ -255,7 +255,7 @@ void ucom4_cpu_device::output_w(int index, UINT8 data)
case NEC_UCOM4_PORTI: m_write_i(index, data & 7, 0xff); break;
default:
- logerror("%s write to unknown port %c = $%X at $%03X\n", tag().c_str(), 'A' + index, data, m_prev_pc);
+ logerror("%s write to unknown port %c = $%X at $%03X\n", tag(), 'A' + index, data, m_prev_pc);
break;
}
@@ -270,7 +270,7 @@ UINT8 upd557l_cpu_device::input_r(int index)
index &= 0xf;
if (index == NEC_UCOM4_PORTB)
- logerror("%s read from unknown port %c at $%03X\n", tag().c_str(), 'A' + index, m_prev_pc);
+ logerror("%s read from unknown port %c at $%03X\n", tag(), 'A' + index, m_prev_pc);
else
return ucom4_cpu_device::input_r(index);
@@ -283,7 +283,7 @@ void upd557l_cpu_device::output_w(int index, UINT8 data)
data &= 0xf;
if (index == NEC_UCOM4_PORTH || index == NEC_UCOM4_PORTI)
- logerror("%s write to unknown port %c = $%X at $%03X\n", tag().c_str(), 'A' + index, data, m_prev_pc);
+ logerror("%s write to unknown port %c = $%X at $%03X\n", tag(), 'A' + index, data, m_prev_pc);
else
{
// only G0 for port G
diff --git a/src/devices/cpu/ucom4/ucom4.h b/src/devices/cpu/ucom4/ucom4.h
index 518603a9aef..01a7f2ecc1c 100644
--- a/src/devices/cpu/ucom4/ucom4.h
+++ b/src/devices/cpu/ucom4/ucom4.h
@@ -100,7 +100,7 @@ class ucom4_cpu_device : public cpu_device
{
public:
// construction/destruction
- ucom4_cpu_device(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, int family, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
+ ucom4_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, int family, int stack_levels, int prgwidth, address_map_constructor program, int datawidth, address_map_constructor data, const char *shortname, const char *source)
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 8, prgwidth, 0, program)
, m_data_config("data", ENDIANNESS_BIG, 8, datawidth, 0, data)
@@ -316,14 +316,14 @@ protected:
class upd553_cpu_device : public ucom4_cpu_device
{
public:
- upd553_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd553_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class upd557l_cpu_device : public ucom4_cpu_device
{
public:
- upd557l_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd557l_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
protected:
virtual UINT8 input_r(int index) override;
@@ -334,14 +334,14 @@ protected:
class upd650_cpu_device : public ucom4_cpu_device
{
public:
- upd650_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd650_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
class upd552_cpu_device : public ucom4_cpu_device
{
public:
- upd552_cpu_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock);
+ upd552_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
};
diff --git a/src/devices/cpu/ucom4/ucom4op.cpp b/src/devices/cpu/ucom4/ucom4op.cpp
index 91e5db6dccb..a9c5c0fe892 100644
--- a/src/devices/cpu/ucom4/ucom4op.cpp
+++ b/src/devices/cpu/ucom4/ucom4op.cpp
@@ -40,7 +40,7 @@ void ucom4_cpu_device::push_stack()
void ucom4_cpu_device::op_illegal()
{
- logerror("%s unknown opcode $%02X at $%03X\n", tag().c_str(), m_op, m_prev_pc);
+ logerror("%s unknown opcode $%02X at $%03X\n", tag(), m_op, m_prev_pc);
}
@@ -336,7 +336,7 @@ void ucom4_cpu_device::op_ci()
m_skip = (m_acc == (m_arg & 0x0f));
if ((m_arg & 0xf0) != 0xc0)
- logerror("%s CI opcode unexpected upper arg $%02X at $%03X\n", tag().c_str(), m_arg & 0xf0, m_prev_pc);
+ logerror("%s CI opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xf0, m_prev_pc);
}
void ucom4_cpu_device::op_cm()
@@ -363,7 +363,7 @@ void ucom4_cpu_device::op_cli()
m_skip = (m_dpl == (m_arg & 0x0f));
if ((m_arg & 0xf0) != 0xe0)
- logerror("%s CLI opcode unexpected upper arg $%02X at $%03X\n", tag().c_str(), m_arg & 0xf0, m_prev_pc);
+ logerror("%s CLI opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xf0, m_prev_pc);
}
void ucom4_cpu_device::op_tmb()
@@ -446,7 +446,7 @@ inline bool ucom4_cpu_device::check_op_43()
{
// these opcodes are officially only supported on uCOM-43
if (m_family != NEC_UCOM43)
- logerror("%s using uCOM-43 opcode $%02X at $%03X\n", tag().c_str(), m_op, m_prev_pc);
+ logerror("%s using uCOM-43 opcode $%02X at $%03X\n", tag(), m_op, m_prev_pc);
return (m_family == NEC_UCOM43);
}
@@ -688,7 +688,7 @@ void ucom4_cpu_device::op_stm()
m_timer->adjust(base * ((m_arg & 0x3f) + 1));
if ((m_arg & 0xc0) != 0x80)
- logerror("%s STM opcode unexpected upper arg $%02X at $%03X\n", tag().c_str(), m_arg & 0xc0, m_prev_pc);
+ logerror("%s STM opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xc0, m_prev_pc);
}
void ucom4_cpu_device::op_ttm()