From 58c4e13490a9b4c2d8483ed43819600972efd761 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 29 Dec 2024 11:04:36 -0500 Subject: [PATCH] cpu/uml.h: Make uml::instruction::is_param_out a member function and really fix build error --- src/devices/cpu/drcbec.cpp | 6 +++--- src/devices/cpu/uml.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/devices/cpu/drcbec.cpp b/src/devices/cpu/drcbec.cpp index 5385d8ca2fd..5e93429dbf6 100644 --- a/src/devices/cpu/drcbec.cpp +++ b/src/devices/cpu/drcbec.cpp @@ -336,7 +336,7 @@ void drcbe_c::generate(drcuml_block &block, const instruction *instlist, uint32_ for (int pnum = 0; pnum < inst.numparams(); pnum++) { - if (uml::instruction::is_param_out(inst.opcode(), pnum) && inst.param(pnum).is_int_register()) + if (inst.is_param_out(pnum) && inst.param(pnum).is_int_register()) regclears++; } } @@ -479,7 +479,7 @@ void drcbe_c::generate(drcuml_block &block, const instruction *instlist, uint32_ { for (int pnum = 0; pnum < inst.numparams(); pnum++) { - if (uml::instruction::is_param_out(inst.opcode(), pnum) && inst.param(pnum).is_int_register() && ireg_needs_clearing[inst.param(pnum).ireg() - REG_I0]) + if (inst.is_param_out(pnum) && inst.param(pnum).is_int_register() && ireg_needs_clearing[inst.param(pnum).ireg() - REG_I0]) { immedwords = (8 + sizeof(drcbec_instruction) - 1) / sizeof(drcbec_instruction); @@ -501,7 +501,7 @@ void drcbe_c::generate(drcuml_block &block, const instruction *instlist, uint32_ { for (int pnum = 0; pnum < inst.numparams(); pnum++) { - if (uml::instruction::is_param_out(inst.opcode(), pnum) && inst.param(pnum).is_int_register()) + if (inst.is_param_out(pnum) && inst.param(pnum).is_int_register()) { ireg_needs_clearing[inst.param(pnum).ireg() - REG_I0] = true; } diff --git a/src/devices/cpu/uml.h b/src/devices/cpu/uml.h index 9ab3b382b07..3149d97f2c0 100644 --- a/src/devices/cpu/uml.h +++ b/src/devices/cpu/uml.h @@ -398,7 +398,7 @@ namespace uml // construction/destruction constexpr instruction() : m_param{ } { } - bool is_param_out(opcode_t opcode, int paramnum) const { assert(opcode < OP_MAX); assert(paramnum < m_numparams); return (s_opcode_info_table[opcode].param[paramnum].output & 0x02) != 0; } + bool is_param_out(int paramnum) const { assert(m_opcode < OP_MAX); assert(paramnum < m_numparams); return (s_opcode_info_table[m_opcode].param[paramnum].output & 0x02) != 0; } // getters constexpr opcode_t opcode() const { return m_opcode; }