From 2e857fa8bd45f6b73902945f78f5ff73b2c9516c Mon Sep 17 00:00:00 2001 From: hap Date: Tue, 14 Nov 2017 03:02:39 +0100 Subject: rename misleading i8085cpu.h to i8085ops.hxx (nw) --- scripts/src/cpu.lua | 2 +- src/devices/cpu/i8085/i8085.cpp | 2 +- src/devices/cpu/i8085/i8085cpu.h | 187 ------------------------------------- src/devices/cpu/i8085/i8085ops.hxx | 187 +++++++++++++++++++++++++++++++++++++ 4 files changed, 189 insertions(+), 189 deletions(-) delete mode 100644 src/devices/cpu/i8085/i8085cpu.h create mode 100644 src/devices/cpu/i8085/i8085ops.hxx diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 9ed50cd9db1..7b773a521a5 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -832,7 +832,7 @@ if (CPUS["I8085"]~=null) then files { MAME_DIR .. "src/devices/cpu/i8085/i8085.cpp", MAME_DIR .. "src/devices/cpu/i8085/i8085.h", - MAME_DIR .. "src/devices/cpu/i8085/i8085cpu.h", + MAME_DIR .. "src/devices/cpu/i8085/i8085ops.hxx", } end diff --git a/src/devices/cpu/i8085/i8085.cpp b/src/devices/cpu/i8085/i8085.cpp index d15b6d45994..39f05f69a38 100644 --- a/src/devices/cpu/i8085/i8085.cpp +++ b/src/devices/cpu/i8085/i8085.cpp @@ -103,7 +103,7 @@ #include "emu.h" #include "debugger.h" #include "i8085.h" -#include "i8085cpu.h" +#include "i8085ops.hxx" #define VERBOSE 0 #include "logmacro.h" diff --git a/src/devices/cpu/i8085/i8085cpu.h b/src/devices/cpu/i8085/i8085cpu.h deleted file mode 100644 index 547c4263f29..00000000000 --- a/src/devices/cpu/i8085/i8085cpu.h +++ /dev/null @@ -1,187 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Juergen Buchmueller, hap -/******************************************************* - * - * Portable (hopefully ;-) 8085A emulator - * - * Written by J. Buchmueller for use with MAME - * - * Partially based on Z80Em by Marcel De Kogel - * - * CPU related macros - * - *******************************************************/ - -#define SF 0x80 -#define ZF 0x40 -#define X5F 0x20 -#define HF 0x10 -#define X3F 0x08 -#define PF 0x04 -#define VF 0x02 -#define CF 0x01 - -#define IM_SID 0x80 -#define IM_I75 0x40 -#define IM_I65 0x20 -#define IM_I55 0x10 -#define IM_IE 0x08 -#define IM_M75 0x04 -#define IM_M65 0x02 -#define IM_M55 0x01 - -#define ADDR_TRAP 0x0024 -#define ADDR_RST55 0x002c -#define ADDR_RST65 0x0034 -#define ADDR_RST75 0x003c -#define ADDR_INTR 0x0038 - - -#define M_MVI(R) R=ARG() - -/* rotate */ -#define M_RLC { \ - m_AF.b.h = (m_AF.b.h << 1) | (m_AF.b.h >> 7); \ - m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \ -} - -#define M_RRC { \ - m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \ - m_AF.b.h = (m_AF.b.h >> 1) | (m_AF.b.h << 7); \ -} - -#define M_RAL { \ - int c = m_AF.b.l&CF; \ - m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h >> 7); \ - m_AF.b.h = (m_AF.b.h << 1) | c; \ -} - -#define M_RAR { \ - int c = (m_AF.b.l&CF) << 7; \ - m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \ - m_AF.b.h = (m_AF.b.h >> 1) | c; \ -} - -/* logical */ -#define M_ORA(R) m_AF.b.h|=R; m_AF.b.l=ZSP[m_AF.b.h] -#define M_XRA(R) m_AF.b.h^=R; m_AF.b.l=ZSP[m_AF.b.h] -#define M_ANA(R) {uint8_t hc = ((m_AF.b.h | R)<<1) & HF; m_AF.b.h&=R; m_AF.b.l=ZSP[m_AF.b.h]; if(IS_8085()) { m_AF.b.l |= HF; } else {m_AF.b.l |= hc; } } - -/* increase / decrease */ -#define M_INR(R) {uint8_t hc = ((R & 0x0f) == 0x0f) ? HF : 0; ++R; m_AF.b.l= (m_AF.b.l & CF ) | ZSP[R] | hc; } -#define M_DCR(R) {uint8_t hc = ((R & 0x0f) != 0x00) ? HF : 0; --R; m_AF.b.l= (m_AF.b.l & CF ) | ZSP[R] | hc | VF; } - -/* arithmetic */ -#define M_ADD(R) { \ - int q = m_AF.b.h+R; \ - m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \ - m_AF.b.h=q; \ -} - -#define M_ADC(R) { \ - int q = m_AF.b.h+R+(m_AF.b.l&CF); \ - m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \ - m_AF.b.h=q; \ -} - -#define M_SUB(R) { \ - int q = m_AF.b.h-R; \ - m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \ - m_AF.b.h=q; \ -} - -#define M_SBB(R) { \ - int q = m_AF.b.h-R-(m_AF.b.l&CF); \ - m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \ - m_AF.b.h=q; \ -} - -#define M_CMP(R) { \ - int q = m_AF.b.h-R; \ - m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \ -} - -#define M_DAD(R) { \ - int q = m_HL.d + m_##R.d; \ - m_AF.b.l = (m_AF.b.l & ~CF) | (q>>16 & CF ); \ - m_HL.w.l = q; \ -} - -// DSUB is 8085-only, not sure if H flag handling is correct -#define M_DSUB() { \ - int q = m_HL.b.l-m_BC.b.l; \ - m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \ - ((m_HL.b.l^q^m_BC.b.l)&HF)| \ - (((m_BC.b.l^m_HL.b.l)&(m_HL.b.l^q)&SF)>>5); \ - m_HL.b.l=q; \ - q = m_HL.b.h-m_BC.b.h-(m_AF.b.l&CF); \ - m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \ - ((m_HL.b.h^q^m_BC.b.h)&HF)| \ - (((m_BC.b.h^m_HL.b.h)&(m_HL.b.h^q)&SF)>>5); \ - if (m_HL.b.l!=0) m_AF.b.l&=~ZF; \ -} - -/* i/o */ -#define M_IN \ - set_status(0x42); \ - m_WZ.d=ARG(); \ - m_AF.b.h=m_io->read_byte(m_WZ.d); - -#define M_OUT \ - set_status(0x10); \ - m_WZ.d=ARG(); \ - m_io->write_byte(m_WZ.d,m_AF.b.h) - -/* stack */ -#define M_PUSH(R) { \ - set_status(0x04); \ - m_program->write_byte(--m_SP.w.l, m_##R.b.h); \ - m_program->write_byte(--m_SP.w.l, m_##R.b.l); \ -} - -#define M_POP(R) { \ - set_status(0x86); \ - m_##R.b.l = m_program->read_byte(m_SP.w.l++); \ - m_##R.b.h = m_program->read_byte(m_SP.w.l++); \ -} - -/* jumps */ -// On 8085 jump if condition is not satisfied is shorter -#define M_JMP(cc) { \ - if (cc) { \ - m_PC.w.l = ARG16(); \ - } else { \ - m_PC.w.l += 2; \ - m_icount += (IS_8085()) ? 3 : 0; \ - } \ -} - -// On 8085 call if condition is not satisfied is 9 ticks -#define M_CALL(cc) \ -{ \ - if (cc) \ - { \ - uint16_t a = ARG16(); \ - m_icount -= (IS_8085()) ? 7 : 6 ; \ - M_PUSH(PC); \ - m_PC.d = a; \ - } else { \ - m_PC.w.l += 2; \ - m_icount += (IS_8085()) ? 2 : 0; \ - } \ -} - -// conditional RET only -#define M_RET(cc) \ -{ \ - if (cc) \ - { \ - m_icount -= 6; \ - M_POP(PC); \ - } \ -} - -#define M_RST(nn) { \ - M_PUSH(PC); \ - m_PC.d = 8 * nn; \ -} diff --git a/src/devices/cpu/i8085/i8085ops.hxx b/src/devices/cpu/i8085/i8085ops.hxx new file mode 100644 index 00000000000..547c4263f29 --- /dev/null +++ b/src/devices/cpu/i8085/i8085ops.hxx @@ -0,0 +1,187 @@ +// license:BSD-3-Clause +// copyright-holders:Juergen Buchmueller, hap +/******************************************************* + * + * Portable (hopefully ;-) 8085A emulator + * + * Written by J. Buchmueller for use with MAME + * + * Partially based on Z80Em by Marcel De Kogel + * + * CPU related macros + * + *******************************************************/ + +#define SF 0x80 +#define ZF 0x40 +#define X5F 0x20 +#define HF 0x10 +#define X3F 0x08 +#define PF 0x04 +#define VF 0x02 +#define CF 0x01 + +#define IM_SID 0x80 +#define IM_I75 0x40 +#define IM_I65 0x20 +#define IM_I55 0x10 +#define IM_IE 0x08 +#define IM_M75 0x04 +#define IM_M65 0x02 +#define IM_M55 0x01 + +#define ADDR_TRAP 0x0024 +#define ADDR_RST55 0x002c +#define ADDR_RST65 0x0034 +#define ADDR_RST75 0x003c +#define ADDR_INTR 0x0038 + + +#define M_MVI(R) R=ARG() + +/* rotate */ +#define M_RLC { \ + m_AF.b.h = (m_AF.b.h << 1) | (m_AF.b.h >> 7); \ + m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \ +} + +#define M_RRC { \ + m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \ + m_AF.b.h = (m_AF.b.h >> 1) | (m_AF.b.h << 7); \ +} + +#define M_RAL { \ + int c = m_AF.b.l&CF; \ + m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h >> 7); \ + m_AF.b.h = (m_AF.b.h << 1) | c; \ +} + +#define M_RAR { \ + int c = (m_AF.b.l&CF) << 7; \ + m_AF.b.l = (m_AF.b.l & 0xfe) | (m_AF.b.h & CF); \ + m_AF.b.h = (m_AF.b.h >> 1) | c; \ +} + +/* logical */ +#define M_ORA(R) m_AF.b.h|=R; m_AF.b.l=ZSP[m_AF.b.h] +#define M_XRA(R) m_AF.b.h^=R; m_AF.b.l=ZSP[m_AF.b.h] +#define M_ANA(R) {uint8_t hc = ((m_AF.b.h | R)<<1) & HF; m_AF.b.h&=R; m_AF.b.l=ZSP[m_AF.b.h]; if(IS_8085()) { m_AF.b.l |= HF; } else {m_AF.b.l |= hc; } } + +/* increase / decrease */ +#define M_INR(R) {uint8_t hc = ((R & 0x0f) == 0x0f) ? HF : 0; ++R; m_AF.b.l= (m_AF.b.l & CF ) | ZSP[R] | hc; } +#define M_DCR(R) {uint8_t hc = ((R & 0x0f) != 0x00) ? HF : 0; --R; m_AF.b.l= (m_AF.b.l & CF ) | ZSP[R] | hc | VF; } + +/* arithmetic */ +#define M_ADD(R) { \ + int q = m_AF.b.h+R; \ + m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \ + m_AF.b.h=q; \ +} + +#define M_ADC(R) { \ + int q = m_AF.b.h+R+(m_AF.b.l&CF); \ + m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|((m_AF.b.h^q^R)&HF); \ + m_AF.b.h=q; \ +} + +#define M_SUB(R) { \ + int q = m_AF.b.h-R; \ + m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \ + m_AF.b.h=q; \ +} + +#define M_SBB(R) { \ + int q = m_AF.b.h-R-(m_AF.b.l&CF); \ + m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \ + m_AF.b.h=q; \ +} + +#define M_CMP(R) { \ + int q = m_AF.b.h-R; \ + m_AF.b.l=ZSP[q&255]|((q>>8)&CF)|(~(m_AF.b.h^q^R)&HF)|VF; \ +} + +#define M_DAD(R) { \ + int q = m_HL.d + m_##R.d; \ + m_AF.b.l = (m_AF.b.l & ~CF) | (q>>16 & CF ); \ + m_HL.w.l = q; \ +} + +// DSUB is 8085-only, not sure if H flag handling is correct +#define M_DSUB() { \ + int q = m_HL.b.l-m_BC.b.l; \ + m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \ + ((m_HL.b.l^q^m_BC.b.l)&HF)| \ + (((m_BC.b.l^m_HL.b.l)&(m_HL.b.l^q)&SF)>>5); \ + m_HL.b.l=q; \ + q = m_HL.b.h-m_BC.b.h-(m_AF.b.l&CF); \ + m_AF.b.l=ZS[q&255]|((q>>8)&CF)|VF| \ + ((m_HL.b.h^q^m_BC.b.h)&HF)| \ + (((m_BC.b.h^m_HL.b.h)&(m_HL.b.h^q)&SF)>>5); \ + if (m_HL.b.l!=0) m_AF.b.l&=~ZF; \ +} + +/* i/o */ +#define M_IN \ + set_status(0x42); \ + m_WZ.d=ARG(); \ + m_AF.b.h=m_io->read_byte(m_WZ.d); + +#define M_OUT \ + set_status(0x10); \ + m_WZ.d=ARG(); \ + m_io->write_byte(m_WZ.d,m_AF.b.h) + +/* stack */ +#define M_PUSH(R) { \ + set_status(0x04); \ + m_program->write_byte(--m_SP.w.l, m_##R.b.h); \ + m_program->write_byte(--m_SP.w.l, m_##R.b.l); \ +} + +#define M_POP(R) { \ + set_status(0x86); \ + m_##R.b.l = m_program->read_byte(m_SP.w.l++); \ + m_##R.b.h = m_program->read_byte(m_SP.w.l++); \ +} + +/* jumps */ +// On 8085 jump if condition is not satisfied is shorter +#define M_JMP(cc) { \ + if (cc) { \ + m_PC.w.l = ARG16(); \ + } else { \ + m_PC.w.l += 2; \ + m_icount += (IS_8085()) ? 3 : 0; \ + } \ +} + +// On 8085 call if condition is not satisfied is 9 ticks +#define M_CALL(cc) \ +{ \ + if (cc) \ + { \ + uint16_t a = ARG16(); \ + m_icount -= (IS_8085()) ? 7 : 6 ; \ + M_PUSH(PC); \ + m_PC.d = a; \ + } else { \ + m_PC.w.l += 2; \ + m_icount += (IS_8085()) ? 2 : 0; \ + } \ +} + +// conditional RET only +#define M_RET(cc) \ +{ \ + if (cc) \ + { \ + m_icount -= 6; \ + M_POP(PC); \ + } \ +} + +#define M_RST(nn) { \ + M_PUSH(PC); \ + m_PC.d = 8 * nn; \ +} -- cgit v1.2.3