summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/m6809/m6809inl.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/m6809/m6809inl.h')
-rw-r--r--src/devices/cpu/m6809/m6809inl.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/devices/cpu/m6809/m6809inl.h b/src/devices/cpu/m6809/m6809inl.h
index 8fd1cfe330d..88c282319c2 100644
--- a/src/devices/cpu/m6809/m6809inl.h
+++ b/src/devices/cpu/m6809/m6809inl.h
@@ -71,8 +71,8 @@ inline ATTR_FORCE_INLINE UINT8 m6809_base_device::read_operand()
{
case ADDRESSING_MODE_EA: return read_memory(m_ea.w);
case ADDRESSING_MODE_IMMEDIATE: return read_opcode_arg();
- case ADDRESSING_MODE_REGISTER_A: return m_d.b.h;
- case ADDRESSING_MODE_REGISTER_B: return m_d.b.l;
+ case ADDRESSING_MODE_REGISTER_A: return m_q.r.a;
+ case ADDRESSING_MODE_REGISTER_B: return m_q.r.b;
default: fatalerror("Unexpected"); return 0x00;
}
}
@@ -103,8 +103,8 @@ inline ATTR_FORCE_INLINE void m6809_base_device::write_operand(UINT8 data)
{
case ADDRESSING_MODE_IMMEDIATE: /* do nothing */ break;
case ADDRESSING_MODE_EA: write_memory(m_ea.w, data); break;
- case ADDRESSING_MODE_REGISTER_A: m_d.b.h = data; break;
- case ADDRESSING_MODE_REGISTER_B: m_d.b.l = data; break;
+ case ADDRESSING_MODE_REGISTER_A: m_q.r.a = data; break;
+ case ADDRESSING_MODE_REGISTER_B: m_q.r.b = data; break;
default: fatalerror("Unexpected"); break;
}
}
@@ -132,8 +132,8 @@ inline ATTR_FORCE_INLINE void m6809_base_device::write_operand(int ordinal, UINT
inline ATTR_FORCE_INLINE void m6809_base_device::daa()
{
UINT16 t, cf = 0;
- UINT8 msn = m_d.b.h & 0xF0;
- UINT8 lsn = m_d.b.h & 0x0F;
+ UINT8 msn = m_q.r.a & 0xF0;
+ UINT8 lsn = m_q.r.a & 0x0F;
// compute the carry
if (lsn > 0x09 || m_cc & CC_H) cf |= 0x06;
@@ -141,14 +141,14 @@ inline ATTR_FORCE_INLINE void m6809_base_device::daa()
if (msn > 0x90 || m_cc & CC_C) cf |= 0x60;
// calculate the result
- t = m_d.b.h + cf;
+ t = m_q.r.a + cf;
m_cc &= ~CC_V;
if (t & 0x0100) // keep carry from previous operation
m_cc |= CC_C;
// and put it back into A
- m_d.b.h = set_flags(CC_NZ, (UINT8) t);
+ m_q.r.a = set_flags(CC_NZ, (UINT8) t);
}
@@ -159,13 +159,13 @@ inline ATTR_FORCE_INLINE void m6809_base_device::daa()
inline ATTR_FORCE_INLINE void m6809_base_device::mul()
{
// perform multiply
- UINT16 result = ((UINT16) m_d.b.h) * ((UINT16) m_d.b.l);
+ UINT16 result = ((UINT16) m_q.r.a) * ((UINT16) m_q.r.b);
// set result and Z flag
- m_d.w = set_flags(CC_Z, result);
+ m_q.r.d = set_flags(CC_Z, result);
// set C flag
- if (m_d.w & 0x0080)
+ if (m_q.r.d & 0x0080)
m_cc |= CC_C;
else
m_cc &= ~CC_C;