summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2015-01-25 22:43:31 +0100
committer couriersud <couriersud@arcor.de>2015-01-25 22:43:31 +0100
commitdd7b5a953e627ab23c28a9848b381a95b256332a (patch)
tree4e19091d318b034919fccbb2c78bd41f2f6e8a67
parent41408bae3b2d761ea53a0f9f826855d4c2542e87 (diff)
parentf72844fdaef103b216c292cd390e3296c54a59ee (diff)
Merge branch 'master' of https://github.com/mamedev/mame.git
-rw-r--r--src/emu/cpu/sh2/sh2drc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/cpu/sh2/sh2drc.c b/src/emu/cpu/sh2/sh2drc.c
index 3ed2807b5c4..42c2cde9434 100644
--- a/src/emu/cpu/sh2/sh2drc.c
+++ b/src/emu/cpu/sh2/sh2drc.c
@@ -91,7 +91,7 @@ void sh2_device::load_fast_iregs(drcuml_block *block)
{
if (m_regmap[regnum].is_int_register())
{
- UML_MOV(block, parameter::make_ireg(m_regmap[regnum].ireg()), mem(&m_sh2_state->r[regnum]));
+ UML_MOV(block, uml::parameter::make_ireg(m_regmap[regnum].ireg()), mem(&m_sh2_state->r[regnum]));
}
}
}
@@ -110,7 +110,7 @@ void sh2_device::save_fast_iregs(drcuml_block *block)
{
if (m_regmap[regnum].is_int_register())
{
- UML_MOV(block, mem(&m_sh2_state->r[regnum]), parameter::make_ireg(m_regmap[regnum].ireg()));
+ UML_MOV(block, mem(&m_sh2_state->r[regnum]), uml::parameter::make_ireg(m_regmap[regnum].ireg()));
}
}
}
@@ -1220,7 +1220,7 @@ void sh2_device::log_add_disasm_comment(drcuml_block *block, UINT32 pc, UINT32 o
subtract cycles from the icount and generate
an exception if out
-------------------------------------------------*/
-void sh2_device::generate_update_cycles(drcuml_block *block, compiler_state *compiler, parameter param, int allow_exception)
+void sh2_device::generate_update_cycles(drcuml_block *block, compiler_state *compiler, uml::parameter param, int allow_exception)
{
/* check full interrupts if pending */
if (compiler->checkints)