summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/sh2/sh2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/sh2/sh2.cpp')
-rw-r--r--src/devices/cpu/sh2/sh2.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/cpu/sh2/sh2.cpp b/src/devices/cpu/sh2/sh2.cpp
index a9d76bd2b40..481f2544126 100644
--- a/src/devices/cpu/sh2/sh2.cpp
+++ b/src/devices/cpu/sh2/sh2.cpp
@@ -169,7 +169,7 @@ static ADDRESS_MAP_START( sh7032_map, AS_PROGRAM, 32, sh1_device )
AM_RANGE(0x05fffe00, 0x05ffffff) AM_READWRITE16(sh7032_r,sh7032_w,0xffffffff) // SH-7032H internal i/o
ADDRESS_MAP_END
-sh2_device::sh2_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sh2_device::sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: cpu_device(mconfig, SH2, "SH-2", tag, owner, clock, "sh2", __FILE__)
, m_program_config("program", ENDIANNESS_BIG, 32, 32, 0, ADDRESS_MAP_NAME(sh7604_map))
, m_decrypted_program_config("decrypted_opcodes", ENDIANNESS_BIG, 32, 32, 0)
@@ -202,7 +202,7 @@ void sh2_device::device_stop()
}
-sh2_device::sh2_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, int cpu_type, address_map_constructor internal_map, int addrlines )
+sh2_device::sh2_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, int cpu_type, address_map_constructor internal_map, int addrlines )
: cpu_device(mconfig, type, name, tag, owner, clock, shortname, source)
, m_program_config("program", ENDIANNESS_BIG, 32, addrlines, 0, internal_map)
, m_decrypted_program_config("decrypted_opcodes", ENDIANNESS_BIG, 32, addrlines, 0)
@@ -228,12 +228,12 @@ sh2_device::sh2_device(const machine_config &mconfig, device_type type, const ch
m_isdrc = (mconfig.options().drc() && !mconfig.m_force_no_drc) ? true : false;
}
-sh2a_device::sh2a_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sh2a_device::sh2a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sh2_device(mconfig, SH1, "SH-2A", tag, owner, clock, "sh2a", __FILE__, CPU_TYPE_SH2, ADDRESS_MAP_NAME(sh7021_map), 28 )
{
}
-sh1_device::sh1_device(const machine_config &mconfig, std::string tag, device_t *owner, UINT32 clock)
+sh1_device::sh1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock)
: sh2_device(mconfig, SH1, "SH-1", tag, owner, clock, "sh1", __FILE__, CPU_TYPE_SH1, ADDRESS_MAP_NAME(sh7032_map), 28 )
{
}
@@ -938,7 +938,7 @@ void sh2_device::EXTUW(UINT32 m, UINT32 n)
/* ILLEGAL */
void sh2_device::ILLEGAL()
{
- logerror("SH2.%s: Illegal opcode at %08x\n", tag().c_str(), m_sh2_state->pc - 2);
+ logerror("SH2.%s: Illegal opcode at %08x\n", tag(), m_sh2_state->pc - 2);
m_sh2_state->r[15] -= 4;
WL( m_sh2_state->r[15], m_sh2_state->sr ); /* push SR onto stack */
m_sh2_state->r[15] -= 4;
@@ -2636,11 +2636,11 @@ void sh2_device::execute_set_input(int irqline, int state)
if( state == CLEAR_LINE )
{
- LOG(("SH-2 '%s' cleared nmi\n", tag().c_str()));
+ LOG(("SH-2 '%s' cleared nmi\n", tag()));
}
else
{
- LOG(("SH-2 '%s' assert nmi\n", tag().c_str()));
+ LOG(("SH-2 '%s' assert nmi\n", tag()));
sh2_exception("Set IRQ line", 16);
@@ -2656,12 +2656,12 @@ void sh2_device::execute_set_input(int irqline, int state)
if( state == CLEAR_LINE )
{
- LOG(("SH-2 '%s' cleared irq #%d\n", tag().c_str(), irqline));
+ LOG(("SH-2 '%s' cleared irq #%d\n", tag(), irqline));
m_sh2_state->pending_irq &= ~(1 << irqline);
}
else
{
- LOG(("SH-2 '%s' assert irq #%d\n", tag().c_str(), irqline));
+ LOG(("SH-2 '%s' assert irq #%d\n", tag(), irqline));
m_sh2_state->pending_irq |= 1 << irqline;
if (m_isdrc)
{