summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/cpu/h6280
diff options
context:
space:
mode:
author smf- <smf-@users.noreply.github.com>2014-01-22 13:04:52 +0000
committer smf- <smf-@users.noreply.github.com>2014-01-22 13:04:52 +0000
commit6b04d984cca2790da137b07590a80b06a11468a5 (patch)
tree3cff83febb961ae99b3e33d06d9a38a67df69ec4 /src/emu/cpu/h6280
parentb8f4843e1efe574573b35ba68aaa7b442270f6a4 (diff)
rename functions with upper case names to lower case to avoid #define collisions (nw)
Diffstat (limited to 'src/emu/cpu/h6280')
-rw-r--r--src/emu/cpu/h6280/h6280.c1279
-rw-r--r--src/emu/cpu/h6280/h6280.h279
2 files changed, 774 insertions, 784 deletions
diff --git a/src/emu/cpu/h6280/h6280.c b/src/emu/cpu/h6280/h6280.c
index 720de2364b3..377e84fc304 100644
--- a/src/emu/cpu/h6280/h6280.c
+++ b/src/emu/cpu/h6280/h6280.c
@@ -111,8 +111,6 @@
#include "h6280.h"
#include "debugger.h"
-#undef BIT
-
/* 6280 flags */
enum
{
@@ -320,12 +318,12 @@ void h6280_device::device_stop()
}
-inline UINT32 h6280_device::TRANSLATED(UINT16 addr)
+inline UINT32 h6280_device::translated(UINT16 addr)
{
return ((m_mmr[((addr) >> 13) & 7] << 13) | ((addr) & 0x1fff));
}
-inline void h6280_device::H6280_CYCLES(int cyc)
+inline void h6280_device::h6280_cycles(int cyc)
{
m_icount -= ((cyc) * m_clocks_per_cycle);
m_timer_value -= ((cyc) * m_clocks_per_cycle);
@@ -334,7 +332,7 @@ inline void h6280_device::H6280_CYCLES(int cyc)
#if LAZY_FLAGS
#define NZ m_NZ
-inline void h6280_device::SET_NZ(UINT8 n)
+inline void h6280_device::set_nz(UINT8 n)
{
P &= ~_fT;
NZ = ((n & _fN) << 8) | n;
@@ -342,7 +340,7 @@ inline void h6280_device::SET_NZ(UINT8 n)
#else
-inline void h6280_device::SET_NZ(UINT8 n)
+inline void h6280_device::set_nz(UINT8 n)
{
P = (P & ~(_fN|_fT|_fZ)) |
(n & _fN) |
@@ -351,52 +349,52 @@ inline void h6280_device::SET_NZ(UINT8 n)
#endif
-inline void h6280_device::CLEAR_T()
+inline void h6280_device::clear_t()
{
P &= ~_fT;
}
-inline void h6280_device::DO_INTERRUPT(UINT16 vector)
+inline void h6280_device::do_interrupt(UINT16 vector)
{
- H6280_CYCLES(7); /* 7 cycles for an int */
+ h6280_cycles(7); /* 7 cycles for an int */
push(PCH);
push(PCL);
- COMPOSE_P(0, _fB);
+ compose_p(0, _fB);
push(P);
P = (P & ~_fD) | _fI; /* knock out D and set I flag */
PCL = program_read8(vector);
PCH = program_read8(vector + 1);
}
-inline void h6280_device::CHECK_AND_TAKE_IRQ_LINES()
+inline void h6280_device::check_and_take_irq_lines()
{
if ( m_nmi_state != CLEAR_LINE ) {
m_nmi_state = CLEAR_LINE;
- DO_INTERRUPT(H6280_NMI_VEC);
+ do_interrupt(H6280_NMI_VEC);
}
else if( !(P & _fI) )
{
if ( m_irq_state[2] != CLEAR_LINE &&
!(m_irq_mask & 0x4) )
{
- DO_INTERRUPT(H6280_TIMER_VEC);
+ do_interrupt(H6280_TIMER_VEC);
} else
if ( m_irq_state[0] != CLEAR_LINE &&
!(m_irq_mask & 0x2) )
{
- DO_INTERRUPT(H6280_IRQ1_VEC);
+ do_interrupt(H6280_IRQ1_VEC);
standard_irq_callback(0);
} else
if ( m_irq_state[1] != CLEAR_LINE &&
!(m_irq_mask & 0x1) )
{
- DO_INTERRUPT(H6280_IRQ2_VEC);
+ do_interrupt(H6280_IRQ2_VEC);
standard_irq_callback(1);
}
}
}
-inline void h6280_device::CHECK_IRQ_LINES()
+inline void h6280_device::check_irq_lines()
{
if (!m_irq_pending)
m_irq_pending = 2;
@@ -407,22 +405,22 @@ inline void h6280_device::CHECK_IRQ_LINES()
* The CPU inserts 1 clock delay when accessing the VDC or VCE
* area.
***************************************************************/
-inline void h6280_device::CHECK_VDC_VCE_PENALTY(UINT16 addr)
+inline void h6280_device::check_vdc_vce_penalty(UINT16 addr)
{
- if ( ( TRANSLATED(addr) & 0x1FF800 ) == 0x1FE000 ) {
- H6280_CYCLES(1);
+ if ( ( translated(addr) & 0x1FF800 ) == 0x1FE000 ) {
+ h6280_cycles(1);
}
}
/***************************************************************
* BRA branch relative
***************************************************************/
-inline void h6280_device::BRA(bool cond)
+inline void h6280_device::bra(bool cond)
{
- CLEAR_T();
+ clear_t();
if (cond)
{
- H6280_CYCLES(4);
+ h6280_cycles(4);
UINT8 tmp = read_opcode_arg();
PCW++;
EAW = PCW + (signed char)tmp;
@@ -431,7 +429,7 @@ inline void h6280_device::BRA(bool cond)
else
{
PCW++;
- H6280_CYCLES(2);
+ h6280_cycles(2);
}
}
@@ -444,7 +442,7 @@ inline void h6280_device::BRA(bool cond)
/***************************************************************
* EA = zero page address
***************************************************************/
-inline void h6280_device::EA_ZPG()
+inline void h6280_device::ea_zpg()
{
ZPL = read_opcode_arg();
PCW++;
@@ -454,7 +452,7 @@ inline void h6280_device::EA_ZPG()
/***************************************************************
* EA = zero page address - T flag
***************************************************************/
-inline void h6280_device::EA_TFLG()
+inline void h6280_device::ea_tflg()
{
ZPL = X;
EAD = ZPD;
@@ -463,7 +461,7 @@ inline void h6280_device::EA_TFLG()
/***************************************************************
* EA = zero page address + X
***************************************************************/
-inline void h6280_device::EA_ZPX()
+inline void h6280_device::ea_zpx()
{
ZPL = read_opcode_arg() + X;
PCW++;
@@ -473,7 +471,7 @@ inline void h6280_device::EA_ZPX()
/***************************************************************
* EA = zero page address + Y
***************************************************************/
-inline void h6280_device::EA_ZPY()
+inline void h6280_device::ea_zpy()
{
ZPL = read_opcode_arg() + Y;
PCW++;
@@ -483,7 +481,7 @@ inline void h6280_device::EA_ZPY()
/***************************************************************
* EA = absolute address
***************************************************************/
-inline void h6280_device::EA_ABS()
+inline void h6280_device::ea_abs()
{
EAL = read_opcode_arg();
PCW++;
@@ -494,25 +492,25 @@ inline void h6280_device::EA_ABS()
/***************************************************************
* EA = absolute address + X
***************************************************************/
-inline void h6280_device::EA_ABX()
+inline void h6280_device::ea_abx()
{
- EA_ABS();
+ ea_abs();
EAW += X;
}
/***************************************************************
* EA = absolute address + Y
***************************************************************/
-inline void h6280_device::EA_ABY()
+inline void h6280_device::ea_aby()
{
- EA_ABS();
+ ea_abs();
EAW += Y;
}
/***************************************************************
* EA = zero page indirect (65c02 pre indexed w/o X)
***************************************************************/
-inline void h6280_device::EA_ZPI()
+inline void h6280_device::ea_zpi()
{
ZPL = read_opcode_arg();
PCW++;
@@ -522,7 +520,7 @@ inline void h6280_device::EA_ZPI()
/***************************************************************
* EA = zero page + X indirect (pre indexed)
***************************************************************/
-inline void h6280_device::EA_IDX()
+inline void h6280_device::ea_idx()
{
ZPL = read_opcode_arg() + X;
PCW++;
@@ -532,7 +530,7 @@ inline void h6280_device::EA_IDX()
/***************************************************************
* EA = zero page indirect + Y (post indexed)
***************************************************************/
-inline void h6280_device::EA_IDY()
+inline void h6280_device::ea_idy()
{
ZPL = read_opcode_arg();
PCW++;
@@ -543,9 +541,9 @@ inline void h6280_device::EA_IDY()
/***************************************************************
* EA = indirect (only used by JMP)
***************************************************************/
-inline void h6280_device::EA_IND()
+inline void h6280_device::ea_ind()
{
- EA_ABS();
+ ea_abs();
UINT8 tmp = program_read8(EAD);
EAD++;
EAH = program_read8(EAD);
@@ -555,9 +553,9 @@ inline void h6280_device::EA_IND()
/***************************************************************
* EA = indirect plus x (only used by JMP)
***************************************************************/
-inline void h6280_device::EA_IAX()
+inline void h6280_device::ea_iax()
{
- EA_ABS();
+ ea_abs();
EAD+=X;
UINT8 tmp = program_read8(EAD);
EAD++;
@@ -565,133 +563,133 @@ inline void h6280_device::EA_IAX()
EAL = tmp;
}
-inline UINT8 h6280_device::RD_IMM()
+inline UINT8 h6280_device::rd_imm()
{
UINT8 tmp = read_opcode_arg();
PCW++;
return tmp;
}
-inline UINT8 h6280_device::RD_ZPG()
+inline UINT8 h6280_device::rd_zpg()
{
- EA_ZPG();
+ ea_zpg();
return program_read8z(EAD);
}
-inline UINT8 h6280_device::RD_ZPX()
+inline UINT8 h6280_device::rd_zpx()
{
- EA_ZPX();
+ ea_zpx();
return program_read8z(EAD);
}
-inline UINT8 h6280_device::RD_ZPY()
+inline UINT8 h6280_device::rd_zpy()
{
- EA_ZPY();
+ ea_zpy();
return program_read8z(EAD);
}
-inline UINT8 h6280_device::RD_ABS()
+inline UINT8 h6280_device::rd_abs()
{
- EA_ABS();
+ ea_abs();
return program_read8(EAD);
}
-inline UINT8 h6280_device::RD_ABX()
+inline UINT8 h6280_device::rd_abx()
{
- EA_ABX();
+ ea_abx();
return program_read8(EAD);
}
-inline UINT8 h6280_device::RD_ABY()
+inline UINT8 h6280_device::rd_aby()
{
- EA_ABY();
+ ea_aby();
return program_read8(EAD);
}
-inline UINT8 h6280_device::RD_ZPI()
+inline UINT8 h6280_device::rd_zpi()
{
- EA_ZPI();
+ ea_zpi();
return program_read8(EAD);
}
-inline UINT8 h6280_device::RD_IDX()
+inline UINT8 h6280_device::rd_idx()
{
- EA_IDX();
+ ea_idx();
return program_read8(EAD);
}
-inline UINT8 h6280_device::RD_IDY()
+inline UINT8 h6280_device::rd_idy()
{
- EA_IDY();
+ ea_idy();
return program_read8(EAD);
}
-inline UINT8 h6280_device::RD_TFL()
+inline UINT8 h6280_device::rd_tfl()
{
- EA_TFLG();
+ ea_tflg();
return program_read8z(EAD);
}
-inline void h6280_device::WR_ZPG(UINT8 tmp)
+inline void h6280_device::wr_zpg(UINT8 tmp)
{
- EA_ZPG();
- WB_EAZ(tmp);
+ ea_zpg();
+ wb_eaz(tmp);
}
-inline void h6280_device::WR_ZPX(UINT8 tmp)
+inline void h6280_device::wr_zpx(UINT8 tmp)
{
- EA_ZPX();
- WB_EAZ(tmp);
+ ea_zpx();
+ wb_eaz(tmp);
}
-inline void h6280_device::WR_ZPY(UINT8 tmp)
+inline void h6280_device::wr_zpy(UINT8 tmp)
{
- EA_ZPY();
- WB_EAZ(tmp);
+ ea_zpy();
+ wb_eaz(tmp);
}
-inline void h6280_device::WR_ABS(UINT8 tmp)
+inline void h6280_device::wr_abs(UINT8 tmp)
{
- EA_ABS();
- WB_EA(tmp);
+ ea_abs();
+ wb_ea(tmp);
}
-inline void h6280_device::WR_ABX(UINT8 tmp)
+inline void h6280_device::wr_abx(UINT8 tmp)
{
- EA_ABX();
- WB_EA(tmp);
+ ea_abx();
+ wb_ea(tmp);
}
-inline void h6280_device::WR_ABY(UINT8 tmp)
+inline void h6280_device::wr_aby(UINT8 tmp)
{
- EA_ABY();
- WB_EA(tmp);
+ ea_aby();
+ wb_ea(tmp);
}
-inline void h6280_device::WR_ZPI(UINT8 tmp)
+inline void h6280_device::wr_zpi(UINT8 tmp)
{
- EA_ZPI();
- WB_EA(tmp);
+ ea_zpi();
+ wb_ea(tmp);
}
-inline void h6280_device::WR_IDX(UINT8 tmp)
+inline void h6280_device::wr_idx(UINT8 tmp)
{
- EA_IDX();
- WB_EA(tmp);
+ ea_idx();
+ wb_ea(tmp);
}
-inline void h6280_device::WR_IDY(UINT8 tmp)
+inline void h6280_device::wr_idy(UINT8 tmp)
{
- EA_IDY();
- WB_EA(tmp);
+ ea_idy();
+ wb_ea(tmp);
}
-inline void h6280_device::WB_EA(UINT8 tmp)
+inline void h6280_device::wb_ea(UINT8 tmp)
{
program_write8(EAD, tmp);
}
-inline void h6280_device::WB_EAZ(UINT8 tmp)
+inline void h6280_device::wb_eaz(UINT8 tmp)
{
program_write8z(EAD, tmp);
}
@@ -709,7 +707,7 @@ inline void h6280_device::WB_EAZ(UINT8 tmp)
***************************************************************/
#if LAZY_FLAGS
-inline void h6280_device::COMPOSE_P(UINT8 SET, UINT8 CLR)
+inline void h6280_device::compose_p(UINT8 SET, UINT8 CLR)
{
P = (P & ~(_fN | _fZ | CLR)) |
(NZ >> 8) |
@@ -719,7 +717,7 @@ inline void h6280_device::COMPOSE_P(UINT8 SET, UINT8 CLR)
#else
-inline void h6280_device::COMPOSE_P(UINT8 SET, UINT8 CLR)
+inline void h6280_device::compose_p(UINT8 SET, UINT8 CLR)
{
P = (P & ~CLR) | SET;
}
@@ -729,10 +727,10 @@ inline void h6280_device::COMPOSE_P(UINT8 SET, UINT8 CLR)
/* 6280 ********************************************************
* ADC Add with carry
***************************************************************/
-inline void h6280_device::TADC(UINT8 tmp)
+inline void h6280_device::tadc(UINT8 tmp)
{
- CLEAR_T();
- int tflagtemp = RD_TFL();
+ clear_t();
+ int tflagtemp = rd_tfl();
if (P & _fD)
{
int c = (P & _fC);
@@ -749,7 +747,7 @@ inline void h6280_device::TADC(UINT8 tmp)
if (hi & 0xff00)
P |= _fC;
tflagtemp = (lo & 0x0f) + (hi & 0xf0);
- H6280_CYCLES(1);
+ h6280_cycles(1);
}
else
{
@@ -762,16 +760,16 @@ inline void h6280_device::TADC(UINT8 tmp)
P |= _fC;
tflagtemp = (UINT8) sum;
}
- SET_NZ(tflagtemp);
- WB_EAZ(tflagtemp);
- H6280_CYCLES(3);
+ set_nz(tflagtemp);
+ wb_eaz(tflagtemp);
+ h6280_cycles(3);
}
-inline void h6280_device::ADC(UINT8 tmp)
+inline void h6280_device::adc(UINT8 tmp)
{
if(P & _fT)
- TADC(tmp);
+ tadc(tmp);
else {
if (P & _fD)
{
@@ -789,7 +787,7 @@ inline void h6280_device::ADC(UINT8 tmp)
if (hi & 0xff00)
P |= _fC;
A = (lo & 0x0f) + (hi & 0xf0);
- H6280_CYCLES(1);
+ h6280_cycles(1);
}
else
{
@@ -802,93 +800,93 @@ inline void h6280_device::ADC(UINT8 tmp)
P |= _fC;
A = (UINT8) sum;
}
- SET_NZ(A);
+ set_nz(A);
}
}
/* 6280 ********************************************************
* AND Logical and
***************************************************************/
-inline void h6280_device::TAND(UINT8 tmp)
+inline void h6280_device::tand(UINT8 tmp)
{
- CLEAR_T();
- int tflagtemp = RD_TFL();
+ clear_t();
+ int tflagtemp = rd_tfl();
tflagtemp = (UINT8)(tflagtemp & tmp);
- WB_EAZ(tflagtemp);
- SET_NZ(tflagtemp);
- H6280_CYCLES(3);
+ wb_eaz(tflagtemp);
+ set_nz(tflagtemp);
+ h6280_cycles(3);
}
-inline void h6280_device::AND(UINT8 tmp)
+inline void h6280_device::and_a(UINT8 tmp)
{
if(P & _fT)
- TAND(tmp);
+ tand(tmp);
else {
A = (UINT8)(A & tmp);
- SET_NZ(A);
+ set_nz(A);
}
}
/* 6280 ********************************************************
* ASL Arithmetic shift left
***************************************************************/
-inline UINT8 h6280_device::ASL(UINT8 tmp)
+inline UINT8 h6280_device::asl(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
P = (P & ~_fC) | ((tmp >> 7) & _fC);
tmp = (UINT8)(tmp << 1);
- SET_NZ(tmp);
+ set_nz(tmp);
return tmp;
}
/* 6280 ********************************************************
* BBR Branch if bit is reset
***************************************************************/
-inline void h6280_device::BBR(int bit, UINT8 tmp)
+inline void h6280_device::bbr(int bit, UINT8 tmp)
{
- BRA(!(tmp & (1<<bit)));
+ bra(!(tmp & (1<<bit)));
}
/* 6280 ********************************************************
* BBS Branch if bit is set
***************************************************************/
-inline void h6280_device::BBS(int bit, UINT8 tmp)
+inline void h6280_device::bbs(int bit, UINT8 tmp)
{
- BRA(tmp & (1<<bit));
+ bra(tmp & (1<<bit));
}
/* 6280 ********************************************************
* BCC Branch if carry clear
***************************************************************/
-inline void h6280_device::BCC()
+inline void h6280_device::bcc()
{
- BRA(!(P & _fC));
+ bra(!(P & _fC));
}
/* 6280 ********************************************************
* BCS Branch if carry set
***************************************************************/
-inline void h6280_device::BCS()
+inline void h6280_device::bcs()
{
- BRA(P & _fC);
+ bra(P & _fC);
}
/* 6280 ********************************************************
* BEQ Branch if equal
***************************************************************/
-inline void h6280_device::BEQ()
+inline void h6280_device::beq()
{
#if LAZY_FLAGS
- BRA(!(NZ & 0xff));
+ bra(!(NZ & 0xff));
#else
- BRA(P & _fZ);
+ bra(P & _fZ);
#endif
}
/* 6280 ********************************************************
* BIT Bit test
***************************************************************/
-inline void h6280_device::BIT(UINT8 tmp)
+inline void h6280_device::bit(UINT8 tmp)
{
P = (P & ~(_fN|_fV|_fT|_fZ))
| ((tmp&0x80) ? _fN:0)
@@ -899,36 +897,36 @@ inline void h6280_device::BIT(UINT8 tmp)
/* 6280 ********************************************************
* BMI Branch if minus
***************************************************************/
-inline void h6280_device::BMI()
+inline void h6280_device::bmi()
{
#if LAZY_FLAGS
- BRA(NZ & 0x8000);
+ bra(NZ & 0x8000);
#else
- BRA(P & _fN);
+ bra(P & _fN);
#endif
}
/* 6280 ********************************************************
* BNE Branch if not equal
***************************************************************/
-inline void h6280_device::BNE()
+inline void h6280_device::bne()
{
#if LAZY_FLAGS
- BRA(NZ & 0xff);
+ bra(NZ & 0xff);
#else
- BRA(!(P & _fZ));
+ bra(!(P & _fZ));
#endif
}
/* 6280 ********************************************************
* BPL Branch if plus
***************************************************************/
-inline void h6280_device::BPL()
+inline void h6280_device::bpl()
{
#if LAZY_FLAGS
- BRA(!(NZ & 0x8000));
+ bra(!(NZ & 0x8000));
#else
- BRA(!(P & _fN));
+ bra(!(P & _fN));
#endif
}
@@ -937,10 +935,10 @@ inline void h6280_device::BPL()
* increment PC, push PC hi, PC lo, flags (with B bit set),
* set I flag, reset D flag and jump via IRQ vector
***************************************************************/
-inline void h6280_device::BRK()
+inline void h6280_device::brk()
{
logerror("BRK %04xn",PCW);
- CLEAR_T();
+ clear_t();
PCW++;
push(PCH);
push(PCL);
@@ -953,67 +951,67 @@ inline void h6280_device::BRK()
/* 6280 ********************************************************
* BSR Branch to subroutine
***************************************************************/
-inline void h6280_device::BSR()
+inline void h6280_device::bsr()
{
push(PCH);
push(PCL);
- H6280_CYCLES(4); /* 4 cycles here, 4 in BRA */
- BRA(1);
+ h6280_cycles(4); /* 4 cycles here, 4 in BRA */
+ bra(1);
}
/* 6280 ********************************************************
* BVC Branch if overflow clear
***************************************************************/
-inline void h6280_device::BVC()
+inline void h6280_device::bvc()
{
- BRA(!(P & _fV));
+ bra(!(P & _fV));
}
/* 6280 ********************************************************
* BVS Branch if overflow set
***************************************************************/
-inline void h6280_device::BVS()
+inline void h6280_device::bvs()
{
- BRA(P & _fV);
+ bra(P & _fV);
}
/* 6280 ********************************************************
* CLA Clear accumulator
***************************************************************/
-inline void h6280_device::CLA()
+inline void h6280_device::cla()
{
- CLEAR_T();
+ clear_t();
A = 0;
}
/* 6280 ********************************************************
* CLC Clear carry flag
***************************************************************/
-inline void h6280_device::CLC()
+inline void h6280_device::clc()
{
- CLEAR_T();
+ clear_t();
P &= ~_fC;
}
/* 6280 ********************************************************
* CLD Clear decimal flag
***************************************************************/
-inline void h6280_device::CLD()
+inline void h6280_device::cld()
{
- CLEAR_T();
+ clear_t();
P &= ~_fD;
}
/* 6280 ********************************************************
* CLI Clear interrupt flag
***************************************************************/
-inline void h6280_device::CLI()
+inline void h6280_device::cli()
{
- CLEAR_T();
+ clear_t();
if( P & _fI )
{
P &= ~_fI;
- CHECK_IRQ_LINES();
+ check_irq_lines();
}
}
@@ -1021,158 +1019,158 @@ inline void h6280_device::CLI()
/* 6280 ********************************************************
* CLV Clear overflow flag
***************************************************************/
-inline void h6280_device::CLV()
+inline void h6280_device::clv()
{
- CLEAR_T();
+ clear_t();
P &= ~_fV;
}
/* 6280 ********************************************************
* CLX Clear index X
***************************************************************/
-inline void h6280_device::CLX()
+inline void h6280_device::clx()
{
- CLEAR_T();
+ clear_t();
X = 0;
}
/* 6280 ********************************************************
* CLY Clear index Y
***************************************************************/
-inline void h6280_device::CLY()
+inline void h6280_device::cly()
{
- CLEAR_T();
+ clear_t();
Y = 0;
}
/* 6280 ********************************************************
* CMP Compare accumulator
***************************************************************/
-inline void h6280_device::CMP(UINT8 tmp)
+inline void h6280_device::cmp(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
P &= ~_fC;
if (A >= tmp)
P |= _fC;
- SET_NZ((UINT8)(A - tmp));
+ set_nz((UINT8)(A - tmp));
}
/* 6280 ********************************************************
* CPX Compare index X
***************************************************************/
-inline void h6280_device::CPX(UINT8 tmp)
+inline void h6280_device::cpx(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
P &= ~_fC;
if (X >= tmp)
P |= _fC;
- SET_NZ((UINT8)(X - tmp));
+ set_nz((UINT8)(X - tmp));
}
/* 6280 ********************************************************
* CPY Compare index Y
***************************************************************/
-inline void h6280_device::CPY(UINT8 tmp)
+inline void h6280_device::cpy(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
P &= ~_fC;
if (Y >= tmp)
P |= _fC;
- SET_NZ((UINT8)(Y - tmp));
+ set_nz((UINT8)(Y - tmp));
}
/* 6280 ********************************************************
* DEC Decrement memory
***************************************************************/
-inline UINT8 h6280_device::DEC(UINT8 tmp)
+inline UINT8 h6280_device::dec(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
tmp = (UINT8)(tmp-1);
- SET_NZ(tmp);
+ set_nz(tmp);
return tmp;
}
/* 6280 ********************************************************
* DEX Decrement index X
***************************************************************/
-inline void h6280_device::DEX()
+inline void h6280_device::dex()
{
- CLEAR_T();
+ clear_t();
X = (UINT8)(X - 1);
- SET_NZ(X);
+ set_nz(X);
}
/* 6280 ********************************************************
* DEY Decrement index Y
***************************************************************/
-inline void h6280_device::DEY()
+inline void h6280_device::dey()
{
- CLEAR_T();
+ clear_t();
Y = (UINT8)(Y - 1);
- SET_NZ(Y);
+ set_nz(Y);
}
/* 6280 ********************************************************
* EOR Logical exclusive or
***************************************************************/
-inline void h6280_device::TEOR(UINT8 tmp)
+inline void h6280_device::teor(UINT8 tmp)
{
- CLEAR_T();
- int tflagtemp = RD_TFL();
+ clear_t();
+ int tflagtemp = rd_tfl();
tflagtemp = (UINT8)(tflagtemp ^ tmp);
- WB_EAZ(tflagtemp);
- SET_NZ(tflagtemp);
- H6280_CYCLES(3);
+ wb_eaz(tflagtemp);
+ set_nz(tflagtemp);
+ h6280_cycles(3);
}
-inline void h6280_device::EOR(UINT8 tmp)
+inline void h6280_device::eor(UINT8 tmp)
{
if(P & _fT)
- TEOR(tmp);
+ teor(tmp);
else {
A = (UINT8)(A ^ tmp);
- SET_NZ(A);
+ set_nz(A);
}
}
/* 6280 ********************************************************
* INC Increment memory
***************************************************************/
-inline UINT8 h6280_device::INC(UINT8 tmp)
+inline UINT8 h6280_device::inc(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
tmp = (UINT8)(tmp+1);
- SET_NZ(tmp);
+ set_nz(tmp);
return tmp;
}
/* 6280 ********************************************************
* INX Increment index X
***************************************************************/
-inline void h6280_device::INX()
+inline void h6280_device::inx()
{
- CLEAR_T();
+ clear_t();
X = (UINT8)(X + 1);
- SET_NZ(X);
+ set_nz(X);
}
/* 6280 ********************************************************
* INY Increment index Y
***************************************************************/
-inline void h6280_device::INY()
+inline void h6280_device::iny()
{
- CLEAR_T();
+ clear_t();
Y = (UINT8)(Y + 1);
- SET_NZ(Y);
+ set_nz(Y);
}
/* 6280 ********************************************************
* JMP Jump to address
* set PC to the effective address
***************************************************************/
-inline void h6280_device::JMP()
+inline void h6280_device::jmp()
{
- CLEAR_T();
+ clear_t();
PCD = EAD;
}
@@ -1181,9 +1179,9 @@ inline void h6280_device::JMP()
* decrement PC (sic!) push PC hi, push PC lo and set
* PC to the effective address
***************************************************************/
-inline void h6280_device::JSR()
+inline void h6280_device::jsr()
{
- CLEAR_T();
+ clear_t();
PCW--;
push(PCH);
push(PCL);
@@ -1193,169 +1191,169 @@ inline void h6280_device::JSR()
/* 6280 ********************************************************
* LDA Load accumulator
***************************************************************/
-inline void h6280_device::LDA(UINT8 tmp)
+inline void h6280_device::lda(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
A = (UINT8)tmp;
- SET_NZ(A);
+ set_nz(A);
}
/* 6280 ********************************************************
* LDX Load index X
***************************************************************/
-inline void h6280_device::LDX(UINT8 tmp)
+inline void h6280_device::ldx(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
X = (UINT8)tmp;
- SET_NZ(X);
+ set_nz(X);
}
/* 6280 ********************************************************
* LDY Load index Y
***************************************************************/
-inline void h6280_device::LDY(UINT8 tmp)
+inline void h6280_device::ldy(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
Y = (UINT8)tmp;
- SET_NZ(Y);
+ set_nz(Y);
}
/* 6280 ********************************************************
* LSR Logic shift right
* 0 -> [7][6][5][4][3][2][1][0] -> C
***************************************************************/
-inline UINT8 h6280_device::LSR(UINT8 tmp)
+inline UINT8 h6280_device::lsr(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
P = (P & ~_fC) | (tmp & _fC);
tmp = (UINT8)tmp >> 1;
- SET_NZ(tmp);
+ set_nz(tmp);
return tmp;
}
/* 6280 ********************************************************
* NOP No operation
***************************************************************/
-inline void h6280_device::NOP()
+inline void h6280_device::nop()
{
- CLEAR_T();
+ clear_t();
}
/* 6280 ********************************************************
* ORA Logical inclusive or
***************************************************************/
-inline void h6280_device::TORA(UINT8 tmp)
+inline void h6280_device::tora(UINT8 tmp)
{
- CLEAR_T();
- int tflagtemp = RD_TFL();
+ clear_t();
+ int tflagtemp = rd_tfl();
tflagtemp = (UINT8)(tflagtemp | tmp);
- WB_EAZ(tflagtemp);
- SET_NZ(tflagtemp);
- H6280_CYCLES(3);
+ wb_eaz(tflagtemp);
+ set_nz(tflagtemp);
+ h6280_cycles(3);
}
-inline void h6280_device::ORA(UINT8 tmp)
+inline void h6280_device::ora(UINT8 tmp)
{
if(P & _fT)
- TORA(tmp);
+ tora(tmp);
else {
A = (UINT8)(A | tmp);
- SET_NZ(A);
+ set_nz(A);
}
}
/* 6280 ********************************************************
* PHA Push accumulator
***************************************************************/
-inline void h6280_device::PHA()
+inline void h6280_device::pha()
{
- CLEAR_T();
+ clear_t();
push(A);
}
/* 6280 ********************************************************
* PHP Push processor status (flags)
***************************************************************/
-inline void h6280_device::PHP()
+inline void h6280_device::php()
{
- CLEAR_T();
- COMPOSE_P(0,0);
+ clear_t();
+ compose_p(0,0);
push(P);
}
/* 6280 ********************************************************
* PHX Push index X
***************************************************************/
-inline void h6280_device::PHX()
+inline void h6280_device::phx()
{
- CLEAR_T();
+ clear_t();
push(X);
}
/* 6280 ********************************************************
* PHY Push index Y
***************************************************************/
-inline void h6280_device::PHY()
+inline void h6280_device::phy()
{
- CLEAR_T();
+ clear_t();
push(Y);
}
/* 6280 ********************************************************
* PLA Pull accumulator
***************************************************************/
-inline void h6280_device::PLA()
+inline void h6280_device::pla()
{
- CLEAR_T();
+ clear_t();
pull(A);
- SET_NZ(A);
+ set_nz(A);
}
/* 6280 ********************************************************
* PLP Pull processor status (flags)
***************************************************************/
-inline void h6280_device::PLP()
+inline void h6280_device::plp()
{
#if LAZY_FLAGS
pull(P);
P |= _fB;
NZ = ((P & _fN) << 8) |
((P & _fZ) ^ _fZ);
- CHECK_IRQ_LINES();
+ check_irq_lines();
#else
pull(P);
P |= _fB;
- CHECK_IRQ_LINES();
+ check_irq_lines();
#endif
}
/* 6280 ********************************************************
* PLX Pull index X
***************************************************************/
-inline void h6280_device::PLX()
+inline void h6280_device::plx()
{
- CLEAR_T();
+ clear_t();
pull(X);
- SET_NZ(X);
+ set_nz(X);
}
/* 6280 ********************************************************
* PLY Pull index Y
***************************************************************/
-inline void h6280_device::PLY()
+inline void h6280_device::ply()
{
- CLEAR_T();
+ clear_t();
pull(Y);
- SET_NZ(Y);
+ set_nz(Y);
}
/* 6280 ********************************************************
* RMB Reset memory bit
***************************************************************/
-inline UINT8 h6280_device::RMB(int bit, UINT8 tmp)
+inline UINT8 h6280_device::rmb(int bit, UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
tmp &= ~(1<<bit);
return tmp;
}
@@ -1364,13 +1362,13 @@ inline UINT8 h6280_device::RMB(int bit, UINT8 tmp)
* ROL Rotate left
* new C <- [7][6][5][4][3][2][1][0] <- C
***************************************************************/
-inline UINT8 h6280_device::ROL(UINT8 tmp)
+inline UINT8 h6280_device::rol(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
int tmp9 = (tmp << 1) | (P & _fC);
P = (P & ~_fC) | ((tmp9 >> 8) & _fC);
tmp = (UINT8)tmp9;
- SET_NZ(tmp);
+ set_nz(tmp);
return tmp;
}
@@ -1378,13 +1376,13 @@ inline UINT8 h6280_device::ROL(UINT8 tmp)
* ROR Rotate right
* C -> [7][6][5][4][3][2][1][0] -> new C
***************************************************************/
-inline UINT8 h6280_device::ROR(UINT8 tmp)
+inline UINT8 h6280_device::ror(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
int tmp9 = tmp | (P & _fC) << 8;
P = (P & ~_fC) | (tmp & _fC);
tmp = (UINT8)(tmp9 >> 1);
- SET_NZ(tmp);
+ set_nz(tmp);
return tmp;
}
@@ -1392,7 +1390,7 @@ inline UINT8 h6280_device::ROR(UINT8 tmp)
* RTI Return from interrupt
* pull flags, pull PC lo, pull PC hi and increment PC
***************************************************************/
-inline void h6280_device::RTI()
+inline void h6280_device::rti()
{
#if LAZY_FLAGS
pull(P);
@@ -1401,13 +1399,13 @@ inline void h6280_device::RTI()
((P & _fZ) ^ _fZ);
pull(PCL);
pull(PCH);
- CHECK_IRQ_LINES();
+ check_irq_lines();
#else
pull(P);
P |= _fB;
pull(PCL);
pull(PCH);
- CHECK_IRQ_LINES();
+ check_irq_lines();
#endif
}
@@ -1415,9 +1413,9 @@ inline void h6280_device::RTI()
* RTS Return from subroutine
* pull PC lo, PC hi and increment PC
***************************************************************/
-inline void h6280_device::RTS()
+inline void h6280_device::rts()
{
- CLEAR_T();
+ clear_t();
pull(PCL);
pull(PCH);
PCW++;
@@ -1426,9 +1424,9 @@ inline void h6280_device::RTS()
/* 6280 ********************************************************
* SAX Swap accumulator and index X
***************************************************************/
-inline void h6280_device::SAX()
+inline void h6280_device::sax()
{
- CLEAR_T();
+ clear_t();
UINT8 tmp = X;
X = A;
A = tmp;
@@ -1437,9 +1435,9 @@ inline void h6280_device::SAX()
/* 6280 ********************************************************
* SAY Swap accumulator and index Y
***************************************************************/
-inline void h6280_device::SAY()
+inline void h6280_device::say()
{
- CLEAR_T();
+ clear_t();
UINT8 tmp = Y;
Y = A;
A = tmp;
@@ -1448,10 +1446,10 @@ inline void h6280_device::SAY()
/* 6280 ********************************************************
* SBC Subtract with carry
***************************************************************/
-inline void h6280_device::TSBC(UINT8 tmp)
+inline void h6280_device::tsbc(UINT8 tmp)
{
- CLEAR_T();
- int tflagtemp = RD_TFL();
+ clear_t();
+ int tflagtemp = rd_tfl();
if (P & _fD)
{
int c = (P & _fC) ^ _fC;
@@ -1468,7 +1466,7 @@ inline void h6280_device::TSBC(UINT8 tmp)
if ((sum & 0xff00) == 0)
P |= _fC;
tflagtemp = (lo & 0x0f) + (hi & 0xf0);
- H6280_CYCLES(1);
+ h6280_cycles(1);
}
else
{
@@ -1481,15 +1479,15 @@ inline void h6280_device::TSBC(UINT8 tmp)
P |= _fC;
tflagtemp = (UINT8) sum;
}
- SET_NZ(tflagtemp);
- WB_EAZ(tflagtemp);
- H6280_CYCLES(3);
+ set_nz(tflagtemp);
+ wb_eaz(tflagtemp);
+ h6280_cycles(3);
}
-inline void h6280_device::SBC(UINT8 tmp)
+inline void h6280_device::sbc(UINT8 tmp)
{
if(P & _fT)
- TSBC(tmp);
+ tsbc(tmp);
else {
if (P & _fD)
{
@@ -1507,7 +1505,7 @@ inline void h6280_device::SBC(UINT8 tmp)
if ((sum & 0xff00) == 0)
P |= _fC;
A = (lo & 0x0f) + (hi & 0xf0);
- H6280_CYCLES(1);
+ h6280_cycles(1);
}
else
{
@@ -1520,44 +1518,41 @@ inline void h6280_device::SBC(UINT8 tmp)
P |= _fC;
A = (UINT8) sum;
}
- SET_NZ(A);
+ set_nz(A);
}
}
/* 6280 ********************************************************
* SEC Set carry flag
***************************************************************/
-#if defined(SEC)
-#undef SEC
-#endif
-inline void h6280_device::SEC()
+inline void h6280_device::sec()
{
- CLEAR_T();
+ clear_t();
P |= _fC;
}
/* 6280 ********************************************************
* SED Set decimal flag
***************************************************************/
-inline void h6280_device::SED()
+inline void h6280_device::sed()
{
- CLEAR_T();
+ clear_t();
P |= _fD;
}
/* 6280 ********************************************************
* SEI Set interrupt flag
***************************************************************/
-inline void h6280_device::SEI()
+inline void h6280_device::sei()
{
- CLEAR_T();
+ clear_t();
P |= _fI;
}
/* 6280 ********************************************************
* SET Set t flag
***************************************************************/
-inline void h6280_device::SET()
+inline void h6280_device::set()
{
P |= _fT;
}
@@ -1565,9 +1560,9 @@ inline void h6280_device::SET()
/* 6280 ********************************************************
* SMB Set memory bit
***************************************************************/
-inline UINT8 h6280_device::SMB(int bit, UINT8 tmp)
+inline UINT8 h6280_device::smb(int bit, UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
tmp |= (1<<bit);
return tmp;
}
@@ -1575,72 +1570,72 @@ inline UINT8 h6280_device::SMB(int bit, UINT8 tmp)
/* 6280 ********************************************************
* ST0 Store at hardware address 0
***************************************************************/
-inline void h6280_device::ST0(UINT8 tmp)
+inline void h6280_device::st0(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
m_io->write_byte(0x0000,tmp);
}
/* 6280 ********************************************************
* ST1 Store at hardware address 2
***************************************************************/
-inline void h6280_device::ST1(UINT8 tmp)
+inline void h6280_device::st1(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
m_io->write_byte(0x0002,tmp);
}
/* 6280 ********************************************************
* ST2 Store at hardware address 3
***************************************************************/
-inline void h6280_device::ST2(UINT8 tmp)
+inline void h6280_device::st2(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
m_io->write_byte(0x0003,tmp);
}
/* 6280 ********************************************************
* STA Store accumulator
***************************************************************/
-inline UINT8 h6280_device::STA()
+inline UINT8 h6280_device::sta()
{
- CLEAR_T();
+ clear_t();
return A;
}
/* 6280 ********************************************************
* STX Store index X
***************************************************************/
-inline UINT8 h6280_device::STX()
+inline UINT8 h6280_device::stx()
{
- CLEAR_T();
+ clear_t();
return X;
}
/* 6280 ********************************************************
* STY Store index Y
***************************************************************/
-inline UINT8 h6280_device::STY()
+inline UINT8 h6280_device::sty()
{
- CLEAR_T();
+ clear_t();
return Y;
}
/* 6280 ********************************************************
* STZ Store zero
***************************************************************/
-inline UINT8 h6280_device::STZ()
+inline UINT8 h6280_device::stz()
{
- CLEAR_T();
+ clear_t();
return 0;
}
/* H6280 *******************************************************
* SXY Swap index X and index Y
***************************************************************/
-inline void h6280_device::SXY()
+inline void h6280_device::sxy()
{
- CLEAR_T();
+ clear_t();
UINT8 tmp = X;
X = Y;
Y = tmp;
@@ -1649,16 +1644,16 @@ inline void h6280_device::SXY()
/* H6280 *******************************************************
* TAI Transfer Alternate Increment
***************************************************************/
-inline void h6280_device::TAI()
+inline void h6280_device::tai()
{
- CLEAR_T();
+ clear_t();
int from = program_read16(PCW);
int to = program_read16(PCW + 2);
int length = program_read16(PCW + 4);
PCW += 6;
int alternate = 0;
if (!length) length = 0x10000;
- H6280_CYCLES( ((6 * length) + 17) );
+ h6280_cycles( ((6 * length) + 17) );
while ((length--) != 0)
{
program_write8(to, program_read8(from + alternate));
@@ -1670,9 +1665,9 @@ inline void h6280_device::TAI()
/* H6280 *******************************************************
* TAM Transfer accumulator to memory mapper register(s)
***************************************************************/
-inline void h6280_device::TAM(UINT8 tmp)
+inline void h6280_device::tam(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
if (tmp&0x01) m_mmr[0] = A;
if (tmp&0x02) m_mmr[1] = A;
if (tmp&0x04) m_mmr[2] = A;
@@ -1686,35 +1681,35 @@ inline void h6280_device::TAM(UINT8 tmp)
/* 6280 ********************************************************
* TAX Transfer accumulator to index X
***************************************************************/
-inline void h6280_device::TAX()
+inline void h6280_device::tax()
{
- CLEAR_T();
+ clear_t();
X = A;
- SET_NZ(X);
+ set_nz(X);
}
/* 6280 ********************************************************
* TAY Transfer accumulator to index Y
***************************************************************/
-inline void h6280_device::TAY()
+inline void h6280_device::tay()
{
- CLEAR_T();
+ clear_t();
Y = A;
- SET_NZ(Y);
+ set_nz(Y);
}
/* 6280 ********************************************************
* TDD Transfer Decrement Decrement
***************************************************************/
-inline void h6280_device::TDD()
+inline void h6280_device::tdd()
{
- CLEAR_T();
+ clear_t();
int from = program_read16(PCW);
int to = program_read16(PCW + 2);
int length = program_read16(PCW + 4);
PCW+=6;
if (!length) length = 0x10000;
- H6280_CYCLES( ((6 * length) + 17) );
+ h6280_cycles( ((6 * length) + 17) );
while ((length--) != 0) {
program_write8(to, program_read8(from));
to--;
@@ -1725,16 +1720,16 @@ inline void h6280_device::TDD()
/* 6280 ********************************************************
* TIA Transfer Increment Alternate
***************************************************************/
-inline void h6280_device::TIA()
+inline void h6280_device::tia()
{
- CLEAR_T();
+ clear_t();
int from = program_read16(PCW);
int to = program_read16(PCW + 2);
int length = program_read16(PCW + 4);
PCW+=6;
int alternate=0;
if (!length) length = 0x10000;
- H6280_CYCLES( ((6 * length) + 17) );
+ h6280_cycles( ((6 * length) + 17) );
while ((length--) != 0) {
program_write8(to + alternate, program_read8(from));
from++;
@@ -1745,15 +1740,15 @@ inline void h6280_device::TIA()
/* 6280 ********************************************************
* TII Transfer Increment Increment
***************************************************************/
-inline void h6280_device::TII()
+inline void h6280_device::tii()
{
- CLEAR_T();
+ clear_t();
int from = program_read16(PCW);
int to = program_read16(PCW + 2);
int length = program_read16(PCW + 4);
PCW += 6;
if (!length) length = 0x10000;
- H6280_CYCLES( ((6 * length) + 17) );
+ h6280_cycles( ((6 * length) + 17) );
while ((length--) != 0) {
program_write8(to, program_read8(from));
to++;
@@ -1764,15 +1759,15 @@ inline void h6280_device::TII()
/* 6280 ********************************************************
* TIN Transfer block, source increments every loop
***************************************************************/
-inline void h6280_device::TIN()
+inline void h6280_device::tin()
{
- CLEAR_T();
+ clear_t();
int from = program_read16(PCW);
int to = program_read16(PCW + 2);
int length = program_read16(PCW + 4);
PCW+=6;
if (!length) length = 0x10000;
- H6280_CYCLES( ((6 * length) + 17) );
+ h6280_cycles( ((6 * length) + 17) );
while ((length--) != 0) {
program_write8(to, program_read8(from));
from++;
@@ -1783,9 +1778,9 @@ inline void h6280_device::TIN()
* TMA Transfer memory mapper register(s) to accumulator
* the highest bit set in tmp is the one that counts
***************************************************************/
-inline void h6280_device::TMA(UINT8 tmp)
+inline void h6280_device::tma(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
if (tmp&0x01) A = m_mmr[0];
if (tmp&0x02) A = m_mmr[1];
if (tmp&0x04) A = m_mmr[2];
@@ -1799,9 +1794,9 @@ inline void h6280_device::TMA(UINT8 tmp)
/* 6280 ********************************************************
* TRB Test and reset bits
***************************************************************/
-inline UINT8 h6280_device::TRB(UINT8 tmp)
+inline UINT8 h6280_device::trb(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
P = (P & ~(_fN|_fV|_fT|_fZ))
| ((tmp&0x80) ? _fN:0)
| ((tmp&0x40) ? _fV:0)
@@ -1813,9 +1808,9 @@ inline UINT8 h6280_device::TRB(UINT8 tmp)
/* 6280 ********************************************************
* TSB Test and set bits
***************************************************************/
-inline UINT8 h6280_device::TSB(UINT8 tmp)
+inline UINT8 h6280_device::tsb(UINT8 tmp)
{
- CLEAR_T();
+ clear_t();
P = (P & ~(_fN|_fV|_fT|_fZ))
| ((tmp&0x80) ? _fN:0)
| ((tmp&0x40) ? _fV:0)
@@ -1827,17 +1822,17 @@ inline UINT8 h6280_device::TSB(UINT8 tmp)
/* 6280 ********************************************************
* TSX Transfer stack LSB to index X
***************************************************************/
-inline void h6280_device::TSX()
+inline void h6280_device::tsx()
{
- CLEAR_T();
+ clear_t();
X = S;
- SET_NZ(X);
+ set_nz(X);
}
/* 6280 ********************************************************
* TST
***************************************************************/
-inline void h6280_device::TST(UINT8 imm, UINT8 tmp)
+inline void h6280_device::tst(UINT8 imm, UINT8 tmp)
{
P = (P & ~(_fN|_fV|_fT|_fZ))
| ((tmp&0x80) ? _fN:0)
@@ -1848,37 +1843,37 @@ inline void h6280_device::TST(UINT8 imm, UINT8 tmp)
/* 6280 ********************************************************
* TXA Transfer index X to accumulator
***************************************************************/
-inline void h6280_device::TXA()
+inline void h6280_device::txa()
{
- CLEAR_T();
+ clear_t();
A = X;
- SET_NZ(A);
+ set_nz(A);
}
/* 6280 ********************************************************
* TXS Transfer index X to stack LSB
* no flags changed (sic!)
***************************************************************/
-inline void h6280_device::TXS()
+inline void h6280_device::txs()
{
- CLEAR_T();
+ clear_t();
S = X;
}
/* 6280 ********************************************************
* TYA Transfer index Y to accumulator
***************************************************************/
-inline void h6280_device::TYA()
+inline void h6280_device::tya()
{
- CLEAR_T();
+ clear_t();
A = Y;
- SET_NZ(A);
+ set_nz(A);
}
/* 6280 ********************************************************
* CSH Set CPU in high speed mode
***************************************************************/
-inline void h6280_device::CSH()
+inline void h6280_device::csh()
{
m_clocks_per_cycle = 1;
}
@@ -1886,7 +1881,7 @@ inline void h6280_device::CSH()
/* 6280 ********************************************************
* CSL Set CPU in low speed mode
***************************************************************/
-inline void h6280_device::CSL()
+inline void h6280_device::csl()
{
m_clocks_per_cycle = 4;
}
@@ -1901,293 +1896,293 @@ inline void h6280_device::CSL()
*
*****************************************************************************
* op cycles opc ***********************/
-OP(op,00) { H6280_CYCLES(8); BRK(); } // 8 BRK
-OP(op,20) { H6280_CYCLES(7); EA_ABS(); JSR(); } // 7 JSR ABS
-OP(op,40) { H6280_CYCLES(7); RTI(); } // 7 RTI
-OP(op,60) { H6280_CYCLES(7); RTS(); } // 7 RTS
-OP(op,80) { BRA(1); } // 4 BRA REL
-OP(op,a0) { H6280_CYCLES(2); LDY(RD_IMM()); } // 2 LDY IMM
-OP(op,c0) { H6280_CYCLES(2); CPY(RD_IMM()); } // 2 CPY IMM
-OP(op,e0) { H6280_CYCLES(2); CPX(RD_IMM()); } // 2 CPX IMM
-
-OP(op,10) { BPL(); } // 2/4 BPL REL
-OP(op,30) { BMI(); } // 2/4 BMI REL
-OP(op,50) { BVC(); } // 2/4 BVC REL
-OP(op,70) { BVS(); } // 2/4 BVS REL
-OP(op,90) { BCC(); } // 2/4 BCC REL
-OP(op,b0) { BCS(); } // 2/4 BCS REL
-OP(op,d0) { BNE(); } // 2/4 BNE REL
-OP(op,f0) { BEQ(); } // 2/4 BEQ REL
-
-OP(op,01) { H6280_CYCLES(7); ORA(RD_IDX()); } // 7 ORA IDX
-OP(op,21) { H6280_CYCLES(7); AND(RD_IDX()); } // 7 AND IDX
-OP(op,41) { H6280_CYCLES(7); EOR(RD_IDX()); } // 7 EOR IDX
-OP(op,61) { H6280_CYCLES(7); ADC(RD_IDX()); } // 7 ADC IDX
-OP(op,81) { H6280_CYCLES(7); WR_IDX(STA()); } // 7 STA IDX
-OP(op,a1) { H6280_CYCLES(7); LDA(RD_IDX()); } // 7 LDA IDX
-OP(op,c1) { H6280_CYCLES(7); CMP(RD_IDX()); } // 7 CMP IDX
-OP(op,e1) { H6280_CYCLES(7); SBC(RD_IDX()); } // 7 SBC IDX
-
-OP(op,11) { H6280_CYCLES(7); ORA(RD_IDY()); } // 7 ORA IDY
-OP(op,31) { H6280_CYCLES(7); AND(RD_IDY()); } // 7 AND IDY
-OP(op,51) { H6280_CYCLES(7); EOR(RD_IDY()); } // 7 EOR IDY
-OP(op,71) { H6280_CYCLES(7); ADC(RD_IDY()); } // 7 ADC AZP
-OP(op,91) { H6280_CYCLES(7); WR_IDY(STA()); } // 7 STA IDY
-OP(op,b1) { H6280_CYCLES(7); LDA(RD_IDY()); } // 7 LDA IDY
-OP(op,d1) { H6280_CYCLES(7); CMP(RD_IDY()); } // 7 CMP IDY
-OP(op,f1) { H6280_CYCLES(7); SBC(RD_IDY()); } // 7 SBC IDY
-
-OP(op,02) { H6280_CYCLES(3); SXY(); } // 3 SXY
-OP(op,22) { H6280_CYCLES(3); SAX(); } // 3 SAX
-OP(op,42) { H6280_CYCLES(3); SAY(); } // 3 SAY
-OP(op,62) { H6280_CYCLES(2); CLA(); } // 2 CLA
-OP(op,82) { H6280_CYCLES(2); CLX(); } // 2 CLX
-OP(op,a2) { H6280_CYCLES(2); LDX(RD_IMM()); } // 2 LDX IMM
-OP(op,c2) { H6280_CYCLES(2); CLY(); } // 2 CLY
-OP(op,e2) { H6280_CYCLES(2); NOP(); } // 2 NOP
-
-OP(op,12) { H6280_CYCLES(7); ORA(RD_ZPI()); } // 7 ORA ZPI
-OP(op,32) { H6280_CYCLES(7); AND(RD_ZPI()); } // 7 AND ZPI
-OP(op,52) { H6280_CYCLES(7); EOR(RD_ZPI()); } // 7 EOR ZPI
-OP(op,72) { H6280_CYCLES(7); ADC(RD_ZPI()); } // 7 ADC ZPI
-OP(op,92) { H6280_CYCLES(7); WR_ZPI(STA()); } // 7 STA ZPI
-OP(op,b2) { H6280_CYCLES(7); LDA(RD_ZPI()); } // 7 LDA ZPI
-OP(op,d2) { H6280_CYCLES(7); CMP(RD_ZPI()); } // 7 CMP ZPI
-OP(op,f2) { H6280_CYCLES(7); SBC(RD_ZPI()); } // 7 SBC ZPI
-
-OP(op,03) { H6280_CYCLES(5); ST0(RD_IMM()); } // 4 + 1 penalty cycle ST0 IMM
-OP(op,23) { H6280_CYCLES(5); ST2(RD_IMM()); } // 4 + 1 penalty cycle ST2 IMM
-OP(op,43) { H6280_CYCLES(4); TMA(RD_IMM()); } // 4 TMA
-OP(op,63) { H6280_CYCLES(4); NOP(); } // 2 NOP
-OP(op,83) { H6280_CYCLES(7); int imm = RD_IMM(); TST(imm, RD_ZPG()); } // 7 TST IMM,ZPG
-OP(op,a3) { H6280_CYCLES(7); int imm = RD_IMM(); TST(imm, RD_ZPX()); } // 7 TST IMM,ZPX
-OP(op,c3) { TDD(); } // 6*l+17 TDD XFER
-OP(op,e3) { TIA(); } // 6*l+17 TIA XFER
-
-OP(op,13) { H6280_CYCLES(5); ST1(RD_IMM()); } // 4 + 1 penalty cycle ST1
-OP(op,33) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,53) { H6280_CYCLES(5); TAM(RD_IMM()); } // 5 TAM IMM
-OP(op,73) { TII(); } // 6*l+17 TII XFER
-OP(op,93) { H6280_CYCLES(8); int imm = RD_IMM(); TST(imm, RD_ABS()); } // 8 TST IMM,ABS
-OP(op,b3) { H6280_CYCLES(8); int imm = RD_IMM(); TST(imm, RD_ABX()); } // 8 TST IMM,ABX
-OP(op,d3) { TIN(); } // 6*l+17 TIN XFER
-OP(op,f3) { TAI(); } // 6*l+17 TAI XFER
-
-OP(op,04) { H6280_CYCLES(6); WB_EAZ(TSB(RD_ZPG())); } // 6 TSB ZPG
-OP(op,24) { H6280_CYCLES(4); BIT(RD_ZPG()); } // 4 BIT ZPG
-OP(op,44) { BSR(); } // 8 BSR REL
-OP(op,64) { H6280_CYCLES(4); WR_ZPG(STZ()); } // 4 STZ ZPG
-OP(op,84) { H6280_CYCLES(4); WR_ZPG(STY()); } // 4 STY ZPG
-OP(op,a4) { H6280_CYCLES(4); LDY(RD_ZPG()); } // 4 LDY ZPG
-OP(op,c4) { H6280_CYCLES(4); CPY(RD_ZPG()); } // 4 CPY ZPG
-OP(op,e4) { H6280_CYCLES(4); CPX(RD_ZPG()); } // 4 CPX ZPG
-
-OP(op,14) { H6280_CYCLES(6); WB_EAZ(TRB(RD_ZPG())); } // 6 TRB ZPG
-OP(op,34) { H6280_CYCLES(4); BIT(RD_ZPX()); } // 4 BIT ZPX
-OP(op,54) { H6280_CYCLES(3); CSL(); } // 3 CSL
-OP(op,74) { H6280_CYCLES(4); WR_ZPX(STZ()); } // 4 STZ ZPX
-OP(op,94) { H6280_CYCLES(4); WR_ZPX(STY()); } // 4 STY ZPX
-OP(op,b4) { H6280_CYCLES(4); LDY(RD_ZPX()); } // 4 LDY ZPX
-OP(op,d4) { H6280_CYCLES(3); CSH(); } // 3 CSH
-OP(op,f4) { H6280_CYCLES(2); SET(); } // 2 SET
-
-OP(op,05) { H6280_CYCLES(4); ORA(RD_ZPG()); } // 4 ORA ZPG
-OP(op,25) { H6280_CYCLES(4); AND(RD_ZPG()); } // 4 AND ZPG
-OP(op,45) { H6280_CYCLES(4); EOR(RD_ZPG()); } // 4 EOR ZPG
-OP(op,65) { H6280_CYCLES(4); ADC(RD_ZPG()); } // 4 ADC ZPG
-OP(op,85) { H6280_CYCLES(4); WR_ZPG(STA()); } // 4 STA ZPG
-OP(op,a5) { H6280_CYCLES(4); LDA(RD_ZPG()); } // 4 LDA ZPG
-OP(op,c5) { H6280_CYCLES(4); CMP(RD_ZPG()); } // 4 CMP ZPG
-OP(op,e5) { H6280_CYCLES(4); SBC(RD_ZPG()); } // 4 SBC ZPG
-
-OP(op,15) { H6280_CYCLES(4); ORA(RD_ZPX()); } // 4 ORA ZPX
-OP(op,35) { H6280_CYCLES(4); AND(RD_ZPX()); } // 4 AND ZPX
-OP(op,55) { H6280_CYCLES(4); EOR(RD_ZPX()); } // 4 EOR ZPX
-OP(op,75) { H6280_CYCLES(4); ADC(RD_ZPX()); } // 4 ADC ZPX
-OP(op,95) { H6280_CYCLES(4); WR_ZPX(STA()); } // 4 STA ZPX
-OP(op,b5) { H6280_CYCLES(4); LDA(RD_ZPX()); } // 4 LDA ZPX
-OP(op,d5) { H6280_CYCLES(4); CMP(RD_ZPX()); } // 4 CMP ZPX
-OP(op,f5) { H6280_CYCLES(4); SBC(RD_ZPX()); } // 4 SBC ZPX
-
-OP(op,06) { H6280_CYCLES(6); WB_EAZ(ASL(RD_ZPG())); } // 6 ASL ZPG
-OP(op,26) { H6280_CYCLES(6); WB_EAZ(ROL(RD_ZPG())); } // 6 ROL ZPG
-OP(op,46) { H6280_CYCLES(6); WB_EAZ(LSR(RD_ZPG())); } // 6 LSR ZPG
-OP(op,66) { H6280_CYCLES(6); WB_EAZ(ROR(RD_ZPG())); } // 6 ROR ZPG
-OP(op,86) { H6280_CYCLES(4); WR_ZPG(STX()); } // 4 STX ZPG
-OP(op,a6) { H6280_CYCLES(4); LDX(RD_ZPG()); } // 4 LDX ZPG
-OP(op,c6) { H6280_CYCLES(6); WB_EAZ(DEC(RD_ZPG())); } // 6 DEC ZPG
-OP(op,e6) { H6280_CYCLES(6); WB_EAZ(INC(RD_ZPG())); } // 6 INC ZPG
-
-OP(op,16) { H6280_CYCLES(6); WB_EAZ(ASL(RD_ZPX())); } // 6 ASL ZPX
-OP(op,36) { H6280_CYCLES(6); WB_EAZ(ROL(RD_ZPX())); } // 6 ROL ZPX
-OP(op,56) { H6280_CYCLES(6); WB_EAZ(LSR(RD_ZPX())); } // 6 LSR ZPX
-OP(op,76) { H6280_CYCLES(6); WB_EAZ(ROR(RD_ZPX())); } // 6 ROR ZPX
-OP(op,96) { H6280_CYCLES(4); WR_ZPY(STX()); } // 4 STX ZPY
-OP(op,b6) { H6280_CYCLES(4); LDX(RD_ZPY()); } // 4 LDX ZPY
-OP(op,d6) { H6280_CYCLES(6); WB_EAZ(DEC(RD_ZPX())); } // 6 DEC ZPX
-OP(op,f6) { H6280_CYCLES(6); WB_EAZ(INC(RD_ZPX())); } // 6 INC ZPX
-
-OP(op,07) { H6280_CYCLES(7); WB_EAZ(RMB(0, RD_ZPG())); } // 7 RMB0 ZPG
-OP(op,27) { H6280_CYCLES(7); WB_EAZ(RMB(2, RD_ZPG())); } // 7 RMB2 ZPG
-OP(op,47) { H6280_CYCLES(7); WB_EAZ(RMB(4, RD_ZPG())); } // 7 RMB4 ZPG
-OP(op,67) { H6280_CYCLES(7); WB_EAZ(RMB(6, RD_ZPG())); } // 7 RMB6 ZPG
-OP(op,87) { H6280_CYCLES(7); WB_EAZ(SMB(0, RD_ZPG())); } // 7 SMB0 ZPG
-OP(op,a7) { H6280_CYCLES(7); WB_EAZ(SMB(2, RD_ZPG())); } // 7 SMB2 ZPG
-OP(op,c7) { H6280_CYCLES(7); WB_EAZ(SMB(4, RD_ZPG())); } // 7 SMB4 ZPG
-OP(op,e7) { H6280_CYCLES(7); WB_EAZ(SMB(6, RD_ZPG())); } // 7 SMB6 ZPG
-
-OP(op,17) { H6280_CYCLES(7); WB_EAZ(RMB(1, RD_ZPG())); } // 7 RMB1 ZPG
-OP(op,37) { H6280_CYCLES(7); WB_EAZ(RMB(3, RD_ZPG())); } // 7 RMB3 ZPG
-OP(op,57) { H6280_CYCLES(7); WB_EAZ(RMB(5, RD_ZPG())); } // 7 RMB5 ZPG
-OP(op,77) { H6280_CYCLES(7); WB_EAZ(RMB(7, RD_ZPG())); } // 7 RMB7 ZPG
-OP(op,97) { H6280_CYCLES(7); WB_EAZ(SMB(1, RD_ZPG())); } // 7 SMB1 ZPG
-OP(op,b7) { H6280_CYCLES(7); WB_EAZ(SMB(3, RD_ZPG())); } // 7 SMB3 ZPG
-OP(op,d7) { H6280_CYCLES(7); WB_EAZ(SMB(5, RD_ZPG())); } // 7 SMB5 ZPG
-OP(op,f7) { H6280_CYCLES(7); WB_EAZ(SMB(7, RD_ZPG())); } // 7 SMB7 ZPG
-
-OP(op,08) { H6280_CYCLES(3); PHP(); } // 3 PHP
-OP(op,28) { H6280_CYCLES(4); PLP(); } // 4 PLP
-OP(op,48) { H6280_CYCLES(3); PHA(); } // 3 PHA
-OP(op,68) { H6280_CYCLES(4); PLA(); } // 4 PLA
-OP(op,88) { H6280_CYCLES(2); DEY(); } // 2 DEY
-OP(op,a8) { H6280_CYCLES(2); TAY(); } // 2 TAY
-OP(op,c8) { H6280_CYCLES(2); INY(); } // 2 INY
-OP(op,e8) { H6280_CYCLES(2); INX(); } // 2 INX
-
-OP(op,18) { H6280_CYCLES(2); CLC(); } // 2 CLC
-OP(op,38) { H6280_CYCLES(2); SEC(); } // 2 SEC
-OP(op,58) { H6280_CYCLES(2); CLI(); } // 2 CLI
-OP(op,78) { H6280_CYCLES(2); SEI(); } // 2 SEI
-OP(op,98) { H6280_CYCLES(2); TYA(); } // 2 TYA
-OP(op,b8) { H6280_CYCLES(2); CLV(); } // 2 CLV
-OP(op,d8) { H6280_CYCLES(2); CLD(); } // 2 CLD
-OP(op,f8) { H6280_CYCLES(2); SED(); } // 2 SED
-
-OP(op,09) { H6280_CYCLES(2); ORA(RD_IMM()); } // 2 ORA IMM
-OP(op,29) { H6280_CYCLES(2); AND(RD_IMM()); } // 2 AND IMM
-OP(op,49) { H6280_CYCLES(2); EOR(RD_IMM()); } // 2 EOR IMM
-OP(op,69) { H6280_CYCLES(2); ADC(RD_IMM()); } // 2 ADC IMM
-OP(op,89) { H6280_CYCLES(2); BIT(RD_IMM()); } // 2 BIT IMM
-OP(op,a9) { H6280_CYCLES(2); LDA(RD_IMM()); } // 2 LDA IMM
-OP(op,c9) { H6280_CYCLES(2); CMP(RD_IMM()); } // 2 CMP IMM
-OP(op,e9) { H6280_CYCLES(2); SBC(RD_IMM()); } // 2 SBC IMM
-
-OP(op,19) { H6280_CYCLES(5); ORA(RD_ABY()); } // 5 ORA ABY
-OP(op,39) { H6280_CYCLES(5); AND(RD_ABY()); } // 5 AND ABY
-OP(op,59) { H6280_CYCLES(5); EOR(RD_ABY()); } // 5 EOR ABY
-OP(op,79) { H6280_CYCLES(5); ADC(RD_ABY()); } // 5 ADC ABY
-OP(op,99) { H6280_CYCLES(5); WR_ABY(STA()); } // 5 STA ABY
-OP(op,b9) { H6280_CYCLES(5); LDA(RD_ABY()); } // 5 LDA ABY
-OP(op,d9) { H6280_CYCLES(5); CMP(RD_ABY()); } // 5 CMP ABY
-OP(op,f9) { H6280_CYCLES(5); SBC(RD_ABY()); } // 5 SBC ABY
-
-OP(op,0a) { H6280_CYCLES(2); A = ASL(A); } // 2 ASL A
-OP(op,2a) { H6280_CYCLES(2); A = ROL(A); } // 2 ROL A
-OP(op,4a) { H6280_CYCLES(2); A = LSR(A); } // 2 LSR A
-OP(op,6a) { H6280_CYCLES(2); A = ROR(A); } // 2 ROR A
-OP(op,8a) { H6280_CYCLES(2); TXA(); } // 2 TXA
-OP(op,aa) { H6280_CYCLES(2); TAX(); } // 2 TAX
-OP(op,ca) { H6280_CYCLES(2); DEX(); } // 2 DEX
-OP(op,ea) { H6280_CYCLES(2); NOP(); } // 2 NOP
-
-OP(op,1a) { H6280_CYCLES(2); A = INC(A); } // 2 INC A
-OP(op,3a) { H6280_CYCLES(2); A = DEC(A); } // 2 DEC A
-OP(op,5a) { H6280_CYCLES(3); PHY(); } // 3 PHY
-OP(op,7a) { H6280_CYCLES(4); PLY(); } // 4 PLY
-OP(op,9a) { H6280_CYCLES(2); TXS(); } // 2 TXS
-OP(op,ba) { H6280_CYCLES(2); TSX(); } // 2 TSX
-OP(op,da) { H6280_CYCLES(3); PHX(); } // 3 PHX
-OP(op,fa) { H6280_CYCLES(4); PLX(); } // 4 PLX
-
-OP(op,0b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,2b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,4b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,6b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,8b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,ab) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,cb) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,eb) { H6280_CYCLES(2); NOP(); } // 2 NOP
-
-OP(op,1b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,3b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,5b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,7b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,9b) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,bb) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,db) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,fb) { H6280_CYCLES(2); NOP(); } // 2 NOP
-
-OP(op,0c) { H6280_CYCLES(7); WB_EA(TSB(RD_ABS())); } // 7 TSB ABS
-OP(op,2c) { H6280_CYCLES(5); BIT(RD_ABS()); } // 5 BIT ABS
-OP(op,4c) { H6280_CYCLES(4); EA_ABS(); JMP(); } // 4 JMP ABS
-OP(op,6c) { H6280_CYCLES(7); EA_IND(); JMP(); } // 7 JMP IND
-OP(op,8c) { H6280_CYCLES(5); WR_ABS(STY()); } // 5 STY ABS
-OP(op,ac) { H6280_CYCLES(5); LDY(RD_ABS()); } // 5 LDY ABS
-OP(op,cc) { H6280_CYCLES(5); CPY(RD_ABS()); } // 5 CPY ABS
-OP(op,ec) { H6280_CYCLES(5); CPX(RD_ABS()); } // 5 CPX ABS
-
-OP(op,1c) { H6280_CYCLES(7); WB_EA(TRB(RD_ABS())); } // 7 TRB ABS
-OP(op,3c) { H6280_CYCLES(5); BIT(RD_ABX()); } // 5 BIT ABX
-OP(op,5c) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,7c) { H6280_CYCLES(7); EA_IAX(); JMP(); } // 7 JMP IAX
-OP(op,9c) { H6280_CYCLES(5); WR_ABS(STZ()); } // 5 STZ ABS
-OP(op,bc) { H6280_CYCLES(5); LDY(RD_ABX()); } // 5 LDY ABX
-OP(op,dc) { H6280_CYCLES(2); NOP(); } // 2 NOP
-OP(op,fc) { H6280_CYCLES(2); NOP(); } // 2 NOP
-
-OP(op,0d) { H6280_CYCLES(5); ORA(RD_ABS()); } // 5 ORA ABS
-OP(op,2d) { H6280_CYCLES(5); AND(RD_ABS()); } // 5 AND ABS
-OP(op,4d) { H6280_CYCLES(5); EOR(RD_ABS()); } // 5 EOR ABS
-OP(op,6d) { H6280_CYCLES(5); ADC(RD_ABS()); } // 5 ADC ABS
-OP(op,8d) { H6280_CYCLES(5); WR_ABS(STA()); } // 5 STA ABS
-OP(op,ad) { H6280_CYCLES(5); LDA(RD_ABS()); } // 5 LDA ABS
-OP(op,cd) { H6280_CYCLES(5); CMP(RD_ABS()); } // 5 CMP ABS
-OP(op,ed) { H6280_CYCLES(5); SBC(RD_ABS()); } // 5 SBC ABS
-
-OP(op,1d) { H6280_CYCLES(5); ORA(RD_ABX()); } // 5 ORA ABX
-OP(op,3d) { H6280_CYCLES(5); AND(RD_ABX()); } // 5 AND ABX
-OP(op,5d) { H6280_CYCLES(5); EOR(RD_ABX()); } // 5 EOR ABX
-OP(op,7d) { H6280_CYCLES(5); ADC(RD_ABX()); } // 5 ADC ABX
-OP(op,9d) { H6280_CYCLES(5); WR_ABX(STA()); } // 5 STA ABX
-OP(op,bd) { H6280_CYCLES(5); LDA(RD_ABX()); } // 5 LDA ABX
-OP(op,dd) { H6280_CYCLES(5); CMP(RD_ABX()); } // 5 CMP ABX
-OP(op,fd) { H6280_CYCLES(5); SBC(RD_ABX()); } // 5 SBC ABX
-
-OP(op,0e) { H6280_CYCLES(7); WB_EA(ASL(RD_ABS())); } // 7 ASL ABS
-OP(op,2e) { H6280_CYCLES(7); WB_EA(ROL(RD_ABS())); } // 7 ROL ABS
-OP(op,4e) { H6280_CYCLES(7); WB_EA(LSR(RD_ABS())); } // 7 LSR ABS
-OP(op,6e) { H6280_CYCLES(7); WB_EA(ROR(RD_ABS())); } // 7 ROR ABS
-OP(op,8e) { H6280_CYCLES(5); WR_ABS(STX()); } // 5 STX ABS
-OP(op,ae) { H6280_CYCLES(5); LDX(RD_ABS()); } // 5 LDX ABS
-OP(op,ce) { H6280_CYCLES(7); WB_EA(DEC(RD_ABS())); } // 7 DEC ABS
-OP(op,ee) { H6280_CYCLES(7); WB_EA(INC(RD_ABS())); } // 7 INC ABS
-
-OP(op,1e) { H6280_CYCLES(7); WB_EA(ASL(RD_ABX())); } // 7 ASL ABX
-OP(op,3e) { H6280_CYCLES(7); WB_EA(ROL(RD_ABX())); } // 7 ROL ABX
-OP(op,5e) { H6280_CYCLES(7); WB_EA(LSR(RD_ABX())); } // 7 LSR ABX
-OP(op,7e) { H6280_CYCLES(7); WB_EA(ROR(RD_ABX())); } // 7 ROR ABX
-OP(op,9e) { H6280_CYCLES(5); WR_ABX(STZ()); } // 5 STZ ABX
-OP(op,be) { H6280_CYCLES(5); LDX(RD_ABY()); } // 5 LDX ABY
-OP(op,de) { H6280_CYCLES(7); WB_EA(DEC(RD_ABX())); } // 7 DEC ABX
-OP(op,fe) { H6280_CYCLES(7); WB_EA(INC(RD_ABX())); } // 7 INC ABX
-
-OP(op,0f) { H6280_CYCLES(4); BBR(0, RD_ZPG()); } // 6/8 BBR0 ZPG,REL
-OP(op,2f) { H6280_CYCLES(4); BBR(2, RD_ZPG()); } // 6/8 BBR2 ZPG,REL
-OP(op,4f) { H6280_CYCLES(4); BBR(4, RD_ZPG()); } // 6/8 BBR4 ZPG,REL
-OP(op,6f) { H6280_CYCLES(4); BBR(6, RD_ZPG()); } // 6/8 BBR6 ZPG,REL
-OP(op,8f) { H6280_CYCLES(4); BBS(0, RD_ZPG()); } // 6/8 BBS0 ZPG,REL
-OP(op,af) { H6280_CYCLES(4); BBS(2, RD_ZPG()); } // 6/8 BBS2 ZPG,REL
-OP(op,cf) { H6280_CYCLES(4); BBS(4, RD_ZPG()); } // 6/8 BBS4 ZPG,REL
-OP(op,ef) { H6280_CYCLES(4); BBS(6, RD_ZPG()); } // 6/8 BBS6 ZPG,REL
-
-OP(op,1f) { H6280_CYCLES(4); BBR(1, RD_ZPG()); } // 6/8 BBR1 ZPG,REL
-OP(op,3f) { H6280_CYCLES(4); BBR(3, RD_ZPG()); } // 6/8 BBR3 ZPG,REL
-OP(op,5f) { H6280_CYCLES(4); BBR(5, RD_ZPG()); } // 6/8 BBR5 ZPG,REL
-OP(op,7f) { H6280_CYCLES(4); BBR(7, RD_ZPG()); } // 6/8 BBR7 ZPG,REL
-OP(op,9f) { H6280_CYCLES(4); BBS(1, RD_ZPG()); } // 6/8 BBS1 ZPG,REL
-OP(op,bf) { H6280_CYCLES(4); BBS(3, RD_ZPG()); } // 6/8 BBS3 ZPG,REL
-OP(op,df) { H6280_CYCLES(4); BBS(5, RD_ZPG()); } // 6/8 BBS5 ZPG,REL
-OP(op,ff) { H6280_CYCLES(4); BBS(7, RD_ZPG()); } // 6/8 BBS7 ZPG,REL
+OP(op,00) { h6280_cycles(8); brk(); } // 8 BRK
+OP(op,20) { h6280_cycles(7); ea_abs(); jsr(); } // 7 JSR ABS
+OP(op,40) { h6280_cycles(7); rti(); } // 7 RTI
+OP(op,60) { h6280_cycles(7); rts(); } // 7 RTS
+OP(op,80) { bra(1); } // 4 BRA REL
+OP(op,a0) { h6280_cycles(2); ldy(rd_imm()); } // 2 LDY IMM
+OP(op,c0) { h6280_cycles(2); cpy(rd_imm()); } // 2 CPY IMM
+OP(op,e0) { h6280_cycles(2); cpx(rd_imm()); } // 2 CPX IMM
+
+OP(op,10) { bpl(); } // 2/4 BPL REL
+OP(op,30) { bmi(); } // 2/4 BMI REL
+OP(op,50) { bvc(); } // 2/4 BVC REL
+OP(op,70) { bvs(); } // 2/4 BVS REL
+OP(op,90) { bcc(); } // 2/4 BCC REL
+OP(op,b0) { bcs(); } // 2/4 BCS REL
+OP(op,d0) { bne(); } // 2/4 BNE REL
+OP(op,f0) { beq(); } // 2/4 BEQ REL
+
+OP(op,01) { h6280_cycles(7); ora(rd_idx()); } // 7 ORA IDX
+OP(op,21) { h6280_cycles(7); and_a(rd_idx()); } // 7 AND IDX
+OP(op,41) { h6280_cycles(7); eor(rd_idx()); } // 7 EOR IDX
+OP(op,61) { h6280_cycles(7); adc(rd_idx()); } // 7 ADC IDX
+OP(op,81) { h6280_cycles(7); wr_idx(sta()); } // 7 STA IDX
+OP(op,a1) { h6280_cycles(7); lda(rd_idx()); } // 7 LDA IDX
+OP(op,c1) { h6280_cycles(7); cmp(rd_idx()); } // 7 CMP IDX
+OP(op,e1) { h6280_cycles(7); sbc(rd_idx()); } // 7 SBC IDX
+
+OP(op,11) { h6280_cycles(7); ora(rd_idy()); } // 7 ORA IDY
+OP(op,31) { h6280_cycles(7); and_a(rd_idy()); } // 7 AND IDY
+OP(op,51) { h6280_cycles(7); eor(rd_idy()); } // 7 EOR IDY
+OP(op,71) { h6280_cycles(7); adc(rd_idy()); } // 7 ADC AZP
+OP(op,91) { h6280_cycles(7); wr_idy(sta()); } // 7 STA IDY
+OP(op,b1) { h6280_cycles(7); lda(rd_idy()); } // 7 LDA IDY
+OP(op,d1) { h6280_cycles(7); cmp(rd_idy()); } // 7 CMP IDY
+OP(op,f1) { h6280_cycles(7); sbc(rd_idy()); } // 7 SBC IDY
+
+OP(op,02) { h6280_cycles(3); sxy(); } // 3 SXY
+OP(op,22) { h6280_cycles(3); sax(); } // 3 SAX
+OP(op,42) { h6280_cycles(3); say(); } // 3 SAY
+OP(op,62) { h6280_cycles(2); cla(); } // 2 CLA
+OP(op,82) { h6280_cycles(2); clx(); } // 2 CLX
+OP(op,a2) { h6280_cycles(2); ldx(rd_imm()); } // 2 LDX IMM
+OP(op,c2) { h6280_cycles(2); cly(); } // 2 CLY
+OP(op,e2) { h6280_cycles(2); nop(); } // 2 NOP
+
+OP(op,12) { h6280_cycles(7); ora(rd_zpi()); } // 7 ORA ZPI
+OP(op,32) { h6280_cycles(7); and_a(rd_zpi()); } // 7 AND ZPI
+OP(op,52) { h6280_cycles(7); eor(rd_zpi()); } // 7 EOR ZPI
+OP(op,72) { h6280_cycles(7); adc(rd_zpi()); } // 7 ADC ZPI
+OP(op,92) { h6280_cycles(7); wr_zpi(sta()); } // 7 STA ZPI
+OP(op,b2) { h6280_cycles(7); lda(rd_zpi()); } // 7 LDA ZPI
+OP(op,d2) { h6280_cycles(7); cmp(rd_zpi()); } // 7 CMP ZPI
+OP(op,f2) { h6280_cycles(7); sbc(rd_zpi()); } // 7 SBC ZPI
+
+OP(op,03) { h6280_cycles(5); st0(rd_imm()); } // 4 + 1 penalty cycle ST0 IMM
+OP(op,23) { h6280_cycles(5); st2(rd_imm()); } // 4 + 1 penalty cycle ST2 IMM
+OP(op,43) { h6280_cycles(4); tma(rd_imm()); } // 4 TMA
+OP(op,63) { h6280_cycles(4); nop(); } // 2 NOP
+OP(op,83) { h6280_cycles(7); int imm = rd_imm(); tst(imm, rd_zpg()); } // 7 TST IMM,ZPG
+OP(op,a3) { h6280_cycles(7); int imm = rd_imm(); tst(imm, rd_zpx()); } // 7 TST IMM,ZPX
+OP(op,c3) { tdd(); } // 6*l+17 TDD XFER
+OP(op,e3) { tia(); } // 6*l+17 TIA XFER
+
+OP(op,13) { h6280_cycles(5); st1(rd_imm()); } // 4 + 1 penalty cycle ST1
+OP(op,33) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,53) { h6280_cycles(5); tam(rd_imm()); } // 5 TAM IMM
+OP(op,73) { tii(); } // 6*l+17 TII XFER
+OP(op,93) { h6280_cycles(8); int imm = rd_imm(); tst(imm, rd_abs()); } // 8 TST IMM,ABS
+OP(op,b3) { h6280_cycles(8); int imm = rd_imm(); tst(imm, rd_abx()); } // 8 TST IMM,ABX
+OP(op,d3) { tin(); } // 6*l+17 TIN XFER
+OP(op,f3) { tai(); } // 6*l+17 TAI XFER
+
+OP(op,04) { h6280_cycles(6); wb_eaz(tsb(rd_zpg())); } // 6 TSB ZPG
+OP(op,24) { h6280_cycles(4); bit(rd_zpg()); } // 4 BIT ZPG
+OP(op,44) { bsr(); } // 8 BSR REL
+OP(op,64) { h6280_cycles(4); wr_zpg(stz()); } // 4 STZ ZPG
+OP(op,84) { h6280_cycles(4); wr_zpg(sty()); } // 4 STY ZPG
+OP(op,a4) { h6280_cycles(4); ldy(rd_zpg()); } // 4 LDY ZPG
+OP(op,c4) { h6280_cycles(4); cpy(rd_zpg()); } // 4 CPY ZPG
+OP(op,e4) { h6280_cycles(4); cpx(rd_zpg()); } // 4 CPX ZPG
+
+OP(op,14) { h6280_cycles(6); wb_eaz(trb(rd_zpg())); } // 6 TRB ZPG
+OP(op,34) { h6280_cycles(4); bit(rd_zpx()); } // 4 BIT ZPX
+OP(op,54) { h6280_cycles(3); csl(); } // 3 CSL
+OP(op,74) { h6280_cycles(4); wr_zpx(stz()); } // 4 STZ ZPX
+OP(op,94) { h6280_cycles(4); wr_zpx(sty()); } // 4 STY ZPX
+OP(op,b4) { h6280_cycles(4); ldy(rd_zpx()); } // 4 LDY ZPX
+OP(op,d4) { h6280_cycles(3); csh(); } // 3 CSH
+OP(op,f4) { h6280_cycles(2); set(); } // 2 SET
+
+OP(op,05) { h6280_cycles(4); ora(rd_zpg()); } // 4 ORA ZPG
+OP(op,25) { h6280_cycles(4); and_a(rd_zpg()); } // 4 AND ZPG
+OP(op,45) { h6280_cycles(4); eor(rd_zpg()); } // 4 EOR ZPG
+OP(op,65) { h6280_cycles(4); adc(rd_zpg()); } // 4 ADC ZPG
+OP(op,85) { h6280_cycles(4); wr_zpg(sta()); } // 4 STA ZPG
+OP(op,a5) { h6280_cycles(4); lda(rd_zpg()); } // 4 LDA ZPG
+OP(op,c5) { h6280_cycles(4); cmp(rd_zpg()); } // 4 CMP ZPG
+OP(op,e5) { h6280_cycles(4); sbc(rd_zpg()); } // 4 SBC ZPG
+
+OP(op,15) { h6280_cycles(4); ora(rd_zpx()); } // 4 ORA ZPX
+OP(op,35) { h6280_cycles(4); and_a(rd_zpx()); } // 4 AND ZPX
+OP(op,55) { h6280_cycles(4); eor(rd_zpx()); } // 4 EOR ZPX
+OP(op,75) { h6280_cycles(4); adc(rd_zpx()); } // 4 ADC ZPX
+OP(op,95) { h6280_cycles(4); wr_zpx(sta()); } // 4 STA ZPX
+OP(op,b5) { h6280_cycles(4); lda(rd_zpx()); } // 4 LDA ZPX
+OP(op,d5) { h6280_cycles(4); cmp(rd_zpx()); } // 4 CMP ZPX
+OP(op,f5) { h6280_cycles(4); sbc(rd_zpx()); } // 4 SBC ZPX
+
+OP(op,06) { h6280_cycles(6); wb_eaz(asl(rd_zpg())); } // 6 ASL ZPG
+OP(op,26) { h6280_cycles(6); wb_eaz(rol(rd_zpg())); } // 6 ROL ZPG
+OP(op,46) { h6280_cycles(6); wb_eaz(lsr(rd_zpg())); } // 6 LSR ZPG
+OP(op,66) { h6280_cycles(6); wb_eaz(ror(rd_zpg())); } // 6 ROR ZPG
+OP(op,86) { h6280_cycles(4); wr_zpg(stx()); } // 4 STX ZPG
+OP(op,a6) { h6280_cycles(4); ldx(rd_zpg()); } // 4 LDX ZPG
+OP(op,c6) { h6280_cycles(6); wb_eaz(dec(rd_zpg())); } // 6 DEC ZPG
+OP(op,e6) { h6280_cycles(6); wb_eaz(inc(rd_zpg())); } // 6 INC ZPG
+
+OP(op,16) { h6280_cycles(6); wb_eaz(asl(rd_zpx())); } // 6 ASL ZPX
+OP(op,36) { h6280_cycles(6); wb_eaz(rol(rd_zpx())); } // 6 ROL ZPX
+OP(op,56) { h6280_cycles(6); wb_eaz(lsr(rd_zpx())); } // 6 LSR ZPX
+OP(op,76) { h6280_cycles(6); wb_eaz(ror(rd_zpx())); } // 6 ROR ZPX
+OP(op,96) { h6280_cycles(4); wr_zpy(stx()); } // 4 STX ZPY
+OP(op,b6) { h6280_cycles(4); ldx(rd_zpy()); } // 4 LDX ZPY
+OP(op,d6) { h6280_cycles(6); wb_eaz(dec(rd_zpx())); } // 6 DEC ZPX
+OP(op,f6) { h6280_cycles(6); wb_eaz(inc(rd_zpx())); } // 6 INC ZPX
+
+OP(op,07) { h6280_cycles(7); wb_eaz(rmb(0, rd_zpg())); } // 7 RMB0 ZPG
+OP(op,27) { h6280_cycles(7); wb_eaz(rmb(2, rd_zpg())); } // 7 RMB2 ZPG
+OP(op,47) { h6280_cycles(7); wb_eaz(rmb(4, rd_zpg())); } // 7 RMB4 ZPG
+OP(op,67) { h6280_cycles(7); wb_eaz(rmb(6, rd_zpg())); } // 7 RMB6 ZPG
+OP(op,87) { h6280_cycles(7); wb_eaz(smb(0, rd_zpg())); } // 7 SMB0 ZPG
+OP(op,a7) { h6280_cycles(7); wb_eaz(smb(2, rd_zpg())); } // 7 SMB2 ZPG
+OP(op,c7) { h6280_cycles(7); wb_eaz(smb(4, rd_zpg())); } // 7 SMB4 ZPG
+OP(op,e7) { h6280_cycles(7); wb_eaz(smb(6, rd_zpg())); } // 7 SMB6 ZPG
+
+OP(op,17) { h6280_cycles(7); wb_eaz(rmb(1, rd_zpg())); } // 7 RMB1 ZPG
+OP(op,37) { h6280_cycles(7); wb_eaz(rmb(3, rd_zpg())); } // 7 RMB3 ZPG
+OP(op,57) { h6280_cycles(7); wb_eaz(rmb(5, rd_zpg())); } // 7 RMB5 ZPG
+OP(op,77) { h6280_cycles(7); wb_eaz(rmb(7, rd_zpg())); } // 7 RMB7 ZPG
+OP(op,97) { h6280_cycles(7); wb_eaz(smb(1, rd_zpg())); } // 7 SMB1 ZPG
+OP(op,b7) { h6280_cycles(7); wb_eaz(smb(3, rd_zpg())); } // 7 SMB3 ZPG
+OP(op,d7) { h6280_cycles(7); wb_eaz(smb(5, rd_zpg())); } // 7 SMB5 ZPG
+OP(op,f7) { h6280_cycles(7); wb_eaz(smb(7, rd_zpg())); } // 7 SMB7 ZPG
+
+OP(op,08) { h6280_cycles(3); php(); } // 3 PHP
+OP(op,28) { h6280_cycles(4); plp(); } // 4 PLP
+OP(op,48) { h6280_cycles(3); pha(); } // 3 PHA
+OP(op,68) { h6280_cycles(4); pla(); } // 4 PLA
+OP(op,88) { h6280_cycles(2); dey(); } // 2 DEY
+OP(op,a8) { h6280_cycles(2); tay(); } // 2 TAY
+OP(op,c8) { h6280_cycles(2); iny(); } // 2 INY
+OP(op,e8) { h6280_cycles(2); inx(); } // 2 INX
+
+OP(op,18) { h6280_cycles(2); clc(); } // 2 CLC
+OP(op,38) { h6280_cycles(2); sec(); } // 2 SEC
+OP(op,58) { h6280_cycles(2); cli(); } // 2 CLI
+OP(op,78) { h6280_cycles(2); sei(); } // 2 SEI
+OP(op,98) { h6280_cycles(2); tya(); } // 2 TYA
+OP(op,b8) { h6280_cycles(2); clv(); } // 2 CLV
+OP(op,d8) { h6280_cycles(2); cld(); } // 2 CLD
+OP(op,f8) { h6280_cycles(2); sed(); } // 2 SED
+
+OP(op,09) { h6280_cycles(2); ora(rd_imm()); } // 2 ORA IMM
+OP(op,29) { h6280_cycles(2); and_a(rd_imm()); } // 2 AND IMM
+OP(op,49) { h6280_cycles(2); eor(rd_imm()); } // 2 EOR IMM
+OP(op,69) { h6280_cycles(2); adc(rd_imm()); } // 2 ADC IMM
+OP(op,89) { h6280_cycles(2); bit(rd_imm()); } // 2 BIT IMM
+OP(op,a9) { h6280_cycles(2); lda(rd_imm()); } // 2 LDA IMM
+OP(op,c9) { h6280_cycles(2); cmp(rd_imm()); } // 2 CMP IMM
+OP(op,e9) { h6280_cycles(2); sbc(rd_imm()); } // 2 SBC IMM
+
+OP(op,19) { h6280_cycles(5); ora(rd_aby()); } // 5 ORA ABY
+OP(op,39) { h6280_cycles(5); and_a(rd_aby()); } // 5 AND ABY
+OP(op,59) { h6280_cycles(5); eor(rd_aby()); } // 5 EOR ABY
+OP(op,79) { h6280_cycles(5); adc(rd_aby()); } // 5 ADC ABY
+OP(op,99) { h6280_cycles(5); wr_aby(sta()); } // 5 STA ABY
+OP(op,b9) { h6280_cycles(5); lda(rd_aby()); } // 5 LDA ABY
+OP(op,d9) { h6280_cycles(5); cmp(rd_aby()); } // 5 CMP ABY
+OP(op,f9) { h6280_cycles(5); sbc(rd_aby()); } // 5 SBC ABY
+
+OP(op,0a) { h6280_cycles(2); A = asl(A); } // 2 ASL A
+OP(op,2a) { h6280_cycles(2); A = rol(A); } // 2 ROL A
+OP(op,4a) { h6280_cycles(2); A = lsr(A); } // 2 LSR A
+OP(op,6a) { h6280_cycles(2); A = ror(A); } // 2 ROR A
+OP(op,8a) { h6280_cycles(2); txa(); } // 2 TXA
+OP(op,aa) { h6280_cycles(2); tax(); } // 2 TAX
+OP(op,ca) { h6280_cycles(2); dex(); } // 2 DEX
+OP(op,ea) { h6280_cycles(2); nop(); } // 2 NOP
+
+OP(op,1a) { h6280_cycles(2); A = inc(A); } // 2 INC A
+OP(op,3a) { h6280_cycles(2); A = dec(A); } // 2 DEC A
+OP(op,5a) { h6280_cycles(3); phy(); } // 3 PHY
+OP(op,7a) { h6280_cycles(4); ply(); } // 4 PLY
+OP(op,9a) { h6280_cycles(2); txs(); } // 2 TXS
+OP(op,ba) { h6280_cycles(2); tsx(); } // 2 TSX
+OP(op,da) { h6280_cycles(3); phx(); } // 3 PHX
+OP(op,fa) { h6280_cycles(4); plx(); } // 4 PLX
+
+OP(op,0b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,2b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,4b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,6b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,8b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,ab) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,cb) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,eb) { h6280_cycles(2); nop(); } // 2 NOP
+
+OP(op,1b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,3b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,5b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,7b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,9b) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,bb) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,db) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,fb) { h6280_cycles(2); nop(); } // 2 NOP
+
+OP(op,0c) { h6280_cycles(7); wb_ea(tsb(rd_abs())); } // 7 TSB ABS
+OP(op,2c) { h6280_cycles(5); bit(rd_abs()); } // 5 BIT ABS
+OP(op,4c) { h6280_cycles(4); ea_abs(); jmp(); } // 4 JMP ABS
+OP(op,6c) { h6280_cycles(7); ea_ind(); jmp(); } // 7 JMP IND
+OP(op,8c) { h6280_cycles(5); wr_abs(sty()); } // 5 STY ABS
+OP(op,ac) { h6280_cycles(5); ldy(rd_abs()); } // 5 LDY ABS
+OP(op,cc) { h6280_cycles(5); cpy(rd_abs()); } // 5 CPY ABS
+OP(op,ec) { h6280_cycles(5); cpx(rd_abs()); } // 5 CPX ABS
+
+OP(op,1c) { h6280_cycles(7); wb_ea(trb(rd_abs())); } // 7 TRB ABS
+OP(op,3c) { h6280_cycles(5); bit(rd_abx()); } // 5 BIT ABX
+OP(op,5c) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,7c) { h6280_cycles(7); ea_iax(); jmp(); } // 7 JMP IAX
+OP(op,9c) { h6280_cycles(5); wr_abs(stz()); } // 5 STZ ABS
+OP(op,bc) { h6280_cycles(5); ldy(rd_abx()); } // 5 LDY ABX
+OP(op,dc) { h6280_cycles(2); nop(); } // 2 NOP
+OP(op,fc) { h6280_cycles(2); nop(); } // 2 NOP
+
+OP(op,0d) { h6280_cycles(5); ora(rd_abs()); } // 5 ORA ABS
+OP(op,2d) { h6280_cycles(5); and_a(rd_abs()); } // 5 AND ABS
+OP(op,4d) { h6280_cycles(5); eor(rd_abs()); } // 5 EOR ABS
+OP(op,6d) { h6280_cycles(5); adc(rd_abs()); } // 5 ADC ABS
+OP(op,8d) { h6280_cycles(5); wr_abs(sta()); } // 5 STA ABS
+OP(op,ad) { h6280_cycles(5); lda(rd_abs()); } // 5 LDA ABS
+OP(op,cd) { h6280_cycles(5); cmp(rd_abs()); } // 5 CMP ABS
+OP(op,ed) { h6280_cycles(5); sbc(rd_abs()); } // 5 SBC ABS
+
+OP(op,1d) { h6280_cycles(5); ora(rd_abx()); } // 5 ORA ABX
+OP(op,3d) { h6280_cycles(5); and_a(rd_abx()); } // 5 AND ABX
+OP(op,5d) { h6280_cycles(5); eor(rd_abx()); } // 5 EOR ABX
+OP(op,7d) { h6280_cycles(5); adc(rd_abx()); } // 5 ADC ABX
+OP(op,9d) { h6280_cycles(5); wr_abx(sta()); } // 5 STA ABX
+OP(op,bd) { h6280_cycles(5); lda(rd_abx()); } // 5 LDA ABX
+OP(op,dd) { h6280_cycles(5); cmp(rd_abx()); } // 5 CMP ABX
+OP(op,fd) { h6280_cycles(5); sbc(rd_abx()); } // 5 SBC ABX
+
+OP(op,0e) { h6280_cycles(7); wb_ea(asl(rd_abs())); } // 7 ASL ABS
+OP(op,2e) { h6280_cycles(7); wb_ea(rol(rd_abs())); } // 7 ROL ABS
+OP(op,4e) { h6280_cycles(7); wb_ea(lsr(rd_abs())); } // 7 LSR ABS
+OP(op,6e) { h6280_cycles(7); wb_ea(ror(rd_abs())); } // 7 ROR ABS
+OP(op,8e) { h6280_cycles(5); wr_abs(stx()); } // 5 STX ABS
+OP(op,ae) { h6280_cycles(5); ldx(rd_abs()); } // 5 LDX ABS
+OP(op,ce) { h6280_cycles(7); wb_ea(dec(rd_abs())); } // 7 DEC ABS
+OP(op,ee) { h6280_cycles(7); wb_ea(inc(rd_abs())); } // 7 INC ABS
+
+OP(op,1e) { h6280_cycles(7); wb_ea(asl(rd_abx())); } // 7 ASL ABX
+OP(op,3e) { h6280_cycles(7); wb_ea(rol(rd_abx())); } // 7 ROL ABX
+OP(op,5e) { h6280_cycles(7); wb_ea(lsr(rd_abx())); } // 7 LSR ABX
+OP(op,7e) { h6280_cycles(7); wb_ea(ror(rd_abx())); } // 7 ROR ABX
+OP(op,9e) { h6280_cycles(5); wr_abx(stz()); } // 5 STZ ABX
+OP(op,be) { h6280_cycles(5); ldx(rd_aby()); } // 5 LDX ABY
+OP(op,de) { h6280_cycles(7); wb_ea(dec(rd_abx())); } // 7 DEC ABX
+OP(op,fe) { h6280_cycles(7); wb_ea(inc(rd_abx())); } // 7 INC ABX
+
+OP(op,0f) { h6280_cycles(4); bbr(0, rd_zpg()); } // 6/8 BBR0 ZPG,REL
+OP(op,2f) { h6280_cycles(4); bbr(2, rd_zpg()); } // 6/8 BBR2 ZPG,REL
+OP(op,4f) { h6280_cycles(4); bbr(4, rd_zpg()); } // 6/8 BBR4 ZPG,REL
+OP(op,6f) { h6280_cycles(4); bbr(6, rd_zpg()); } // 6/8 BBR6 ZPG,REL
+OP(op,8f) { h6280_cycles(4); bbs(0, rd_zpg()); } // 6/8 BBS0 ZPG,REL
+OP(op,af) { h6280_cycles(4); bbs(2, rd_zpg()); } // 6/8 BBS2 ZPG,REL
+OP(op,cf) { h6280_cycles(4); bbs(4, rd_zpg()); } // 6/8 BBS4 ZPG,REL
+OP(op,ef) { h6280_cycles(4); bbs(6, rd_zpg()); } // 6/8 BBS6 ZPG,REL
+
+OP(op,1f) { h6280_cycles(4); bbr(1, rd_zpg()); } // 6/8 BBR1 ZPG,REL
+OP(op,3f) { h6280_cycles(4); bbr(3, rd_zpg()); } // 6/8 BBR3 ZPG,REL
+OP(op,5f) { h6280_cycles(4); bbr(5, rd_zpg()); } // 6/8 BBR5 ZPG,REL
+OP(op,7f) { h6280_cycles(4); bbr(7, rd_zpg()); } // 6/8 BBR7 ZPG,REL
+OP(op,9f) { h6280_cycles(4); bbs(1, rd_zpg()); } // 6/8 BBS1 ZPG,REL
+OP(op,bf) { h6280_cycles(4); bbs(3, rd_zpg()); } // 6/8 BBS3 ZPG,REL
+OP(op,df) { h6280_cycles(4); bbs(5, rd_zpg()); } // 6/8 BBS5 ZPG,REL
+OP(op,ff) { h6280_cycles(4); bbs(7, rd_zpg()); } // 6/8 BBS7 ZPG,REL
//-------------------------------------------------
// state_string_export - export state as a string
@@ -2313,8 +2308,8 @@ void h6280_device::execute_set_input(int inputnum, int state)
***************************************************************/
UINT8 h6280_device::program_read8(offs_t addr)
{
- CHECK_VDC_VCE_PENALTY(addr);
- return m_program->read_byte(TRANSLATED(addr));
+ check_vdc_vce_penalty(addr);
+ return m_program->read_byte(translated(addr));
}
/***************************************************************
@@ -2322,8 +2317,8 @@ UINT8 h6280_device::program_read8(offs_t addr)
***************************************************************/
void h6280_device::program_write8(offs_t addr, UINT8 data)
{
- CHECK_VDC_VCE_PENALTY(addr);
- m_program->write_byte(TRANSLATED(addr), data);
+ check_vdc_vce_penalty(addr);
+ m_program->write_byte(translated(addr), data);
}
/***************************************************************
@@ -2347,8 +2342,8 @@ void h6280_device::program_write8z(offs_t addr, UINT8 data)
***************************************************************/
UINT16 h6280_device::program_read16(offs_t addr)
{
- return m_program->read_byte(TRANSLATED(addr)) |
- (m_program->read_byte(TRANSLATED(addr + 1)) << 8);
+ return m_program->read_byte(translated(addr)) |
+ (m_program->read_byte(translated(addr + 1)) << 8);
}
/***************************************************************
@@ -2391,7 +2386,7 @@ void h6280_device::pull(UINT8 &value)
***************************************************************/
UINT8 h6280_device::read_opcode()
{
- return m_direct->read_decrypted_byte(TRANSLATED(PCW));
+ return m_direct->read_decrypted_byte(translated(PCW));
}
/***************************************************************
@@ -2399,7 +2394,7 @@ UINT8 h6280_device::read_opcode()
***************************************************************/
UINT8 h6280_device::read_opcode_arg()
{
- return m_direct->read_raw_byte(TRANSLATED(PCW));
+ return m_direct->read_raw_byte(translated(PCW));
}
@@ -2436,7 +2431,7 @@ void h6280_device::execute_run()
if (!(P & _fI))
{
m_irq_pending--;
- CHECK_AND_TAKE_IRQ_LINES();
+ check_and_take_irq_lines();
}
}
else
@@ -2476,7 +2471,7 @@ void h6280_device::set_irq_line(int irqline, int state)
if (state != ASSERT_LINE)
return;
m_nmi_state = state;
- CHECK_IRQ_LINES();
+ check_irq_lines();
}
else if (irqline < 3)
{
@@ -2486,7 +2481,7 @@ void h6280_device::set_irq_line(int irqline, int state)
m_irq_state[irqline] = state;
- CHECK_IRQ_LINES();
+ check_irq_lines();
}
}
@@ -2530,7 +2525,7 @@ WRITE8_MEMBER( h6280_device::irq_status_w )
case 2: /* Write irq mask */
m_irq_mask = data & 0x7;
- CHECK_IRQ_LINES();
+ check_irq_lines();
break;
case 3: /* Timer irq ack */
@@ -2568,7 +2563,7 @@ WRITE8_MEMBER( h6280_device::timer_w )
bool h6280_device::memory_translate(address_spacenum spacenum, int intention, offs_t &address)
{
if (spacenum == AS_PROGRAM)
- address = TRANSLATED(address);
+ address = translated(address);
return TRUE;
}
diff --git a/src/emu/cpu/h6280/h6280.h b/src/emu/cpu/h6280/h6280.h
index c35cf94218a..c28c5d4bf2d 100644
--- a/src/emu/cpu/h6280/h6280.h
+++ b/src/emu/cpu/h6280/h6280.h
@@ -17,9 +17,6 @@
#include "emu.h"
-#pragma push_macro("BIT")
-#undef BIT
-
#define LAZY_FLAGS 0
/***************************************************************************
@@ -182,143 +179,143 @@ protected:
PROTOTYPES(op);
- UINT32 TRANSLATED(UINT16 addr);
- void H6280_CYCLES(int cyc);
- void SET_NZ(UINT8 n);
- void CLEAR_T();
- void DO_INTERRUPT(UINT16 vector);
- void CHECK_AND_TAKE_IRQ_LINES();
- void CHECK_IRQ_LINES();
- void CHECK_VDC_VCE_PENALTY(UINT16 addr);
- void BRA(bool cond);
- void EA_ZPG();
- void EA_TFLG();
- void EA_ZPX();
- void EA_ZPY();
- void EA_ABS();
- void EA_ABX();
- void EA_ABY();
- void EA_ZPI();
- void EA_IDX();
- void EA_IDY();
- void EA_IND();
- void EA_IAX();
- UINT8 RD_IMM();
- UINT8 RD_ZPG();
- UINT8 RD_ZPX();
- UINT8 RD_ZPY();
- UINT8 RD_ABS();
- UINT8 RD_ABX();
- UINT8 RD_ABY();
- UINT8 RD_ZPI();
- UINT8 RD_IDX();
- UINT8 RD_IDY();
- UINT8 RD_TFL();
- void WR_ZPG(UINT8 tmp);
- void WR_ZPX(UINT8 tmp);
- void WR_ZPY(UINT8 tmp);
- void WR_ABS(UINT8 tmp);
- void WR_ABX(UINT8 tmp);
- void WR_ABY(UINT8 tmp);
- void WR_ZPI(UINT8 tmp);
- void WR_IDX(UINT8 tmp);
- void WR_IDY(UINT8 tmp);
- void WB_EA(UINT8 tmp);
- void WB_EAZ(UINT8 tmp);
- void COMPOSE_P(UINT8 SET, UINT8 CLR);
- void TADC(UINT8 tmp);
- void ADC(UINT8 tmp);
- void TAND(UINT8 tmp);
- void AND(UINT8 tmp);
- UINT8 ASL(UINT8 tmp);
- void BBR(int bit, UINT8 tmp);
- void BBS(int bit, UINT8 tmp);
- void BCC();
- void BCS();
- void BEQ();
- void BIT(UINT8 tmp);
- void BMI();
- void BNE();
- void BPL();
- void BRK();
- void BSR();
- void BVC();
- void BVS();
- void CLA();
- void CLC();
- void CLD();
- void CLI();
- void CLV();
- void CLX();
- void CLY();
- void CMP(UINT8 tmp);
- void CPX(UINT8 tmp);
- void CPY(UINT8 tmp);
- UINT8 DEC(UINT8 tmp);
- void DEX();
- void DEY();
- void TEOR(UINT8 tmp);
- void EOR(UINT8 tmp);
- UINT8 INC(UINT8 tmp);
- void INX();
- void INY();
- void JMP();
- void JSR();
- void LDA(UINT8 tmp);
- void LDX(UINT8 tmp);
- void LDY(UINT8 tmp);
- UINT8 LSR(UINT8 tmp);
- void NOP();
- void TORA(UINT8 tmp);
- void ORA(UINT8 tmp);
- void PHA();
- void PHP();
- void PHX();
- void PHY();
- void PLA();
- void PLP();
- void PLX();
- void PLY();
- UINT8 RMB(int bit, UINT8 tmp);
- UINT8 ROL(UINT8 tmp);
- UINT8 ROR(UINT8 tmp);
- void RTI();
- void RTS();
- void SAX();
- void SAY();
- void TSBC(UINT8 tmp);
- void SBC(UINT8 tmp);
- void SEC();
- void SED();
- void SEI();
- void SET();
- UINT8 SMB(int bit, UINT8 tmp);
- void ST0(UINT8 tmp);
- void ST1(UINT8 tmp);
- void ST2(UINT8 tmp);
- UINT8 STA();
- UINT8 STX();
- UINT8 STY();
- UINT8 STZ();
- void SXY();
- void TAI();
- void TAM(UINT8 tmp);
- void TAX();
- void TAY();
- void TDD();
- void TIA();
- void TII();
- void TIN();
- void TMA(UINT8 tmp);
- UINT8 TRB(UINT8 tmp);
- UINT8 TSB(UINT8 tmp);
- void TSX();
- void TST(UINT8 imm, UINT8 tmp);
- void TXA();
- void TXS();
- void TYA();
- void CSH();
- void CSL();
+ UINT32 translated(UINT16 addr);
+ void h6280_cycles(int cyc);
+ void set_nz(UINT8 n);
+ void clear_t();
+ void do_interrupt(UINT16 vector);
+ void check_and_take_irq_lines();
+ void check_irq_lines();
+ void check_vdc_vce_penalty(UINT16 addr);
+ void bra(bool cond);
+ void ea_zpg();
+ void ea_tflg();
+ void ea_zpx();
+ void ea_zpy();
+ void ea_abs();
+ void ea_abx();
+ void ea_aby();
+ void ea_zpi();
+ void ea_idx();
+ void ea_idy();
+ void ea_ind();
+ void ea_iax();
+ UINT8 rd_imm();
+ UINT8 rd_zpg();
+ UINT8 rd_zpx();
+ UINT8 rd_zpy();
+ UINT8 rd_abs();
+ UINT8 rd_abx();
+ UINT8 rd_aby();
+ UINT8 rd_zpi();
+ UINT8 rd_idx();
+ UINT8 rd_idy();
+ UINT8 rd_tfl();
+ void wr_zpg(UINT8 tmp);
+ void wr_zpx(UINT8 tmp);
+ void wr_zpy(UINT8 tmp);
+ void wr_abs(UINT8 tmp);
+ void wr_abx(UINT8 tmp);
+ void wr_aby(UINT8 tmp);
+ void wr_zpi(UINT8 tmp);
+ void wr_idx(UINT8 tmp);
+ void wr_idy(UINT8 tmp);
+ void wb_ea(UINT8 tmp);
+ void wb_eaz(UINT8 tmp);
+ void compose_p(UINT8 set, UINT8 clr);
+ void tadc(UINT8 tmp);
+ void adc(UINT8 tmp);
+ void tand(UINT8 tmp);
+ void and_a(UINT8 tmp);
+ UINT8 asl(UINT8 tmp);
+ void bbr(int bit, UINT8 tmp);
+ void bbs(int bit, UINT8 tmp);
+ void bcc();
+ void bcs();
+ void beq();
+ void bit(UINT8 tmp);
+ void bmi();
+ void bne();
+ void bpl();
+ void brk();
+ void bsr();
+ void bvc();
+ void bvs();
+ void cla();
+ void clc();
+ void cld();
+ void cli();
+ void clv();
+ void clx();
+ void cly();
+ void cmp(UINT8 tmp);
+ void cpx(UINT8 tmp);
+ void cpy(UINT8 tmp);
+ UINT8 dec(UINT8 tmp);
+ void dex();
+ void dey();
+ void teor(UINT8 tmp);
+ void eor(UINT8 tmp);
+ UINT8 inc(UINT8 tmp);
+ void inx();
+ void iny();
+ void jmp();
+ void jsr();
+ void lda(UINT8 tmp);
+ void ldx(UINT8 tmp);
+ void ldy(UINT8 tmp);
+ UINT8 lsr(UINT8 tmp);
+ void nop();
+ void tora(UINT8 tmp);
+ void ora(UINT8 tmp);
+ void pha();
+ void php();
+ void phx();
+ void phy();
+ void pla();
+ void plp();
+ void plx();
+ void ply();
+ UINT8 rmb(int bit, UINT8 tmp);
+ UINT8 rol(UINT8 tmp);
+ UINT8 ror(UINT8 tmp);
+ void rti();
+ void rts();
+ void sax();
+ void say();
+ void tsbc(UINT8 tmp);
+ void sbc(UINT8 tmp);
+ void sec();
+ void sed();
+ void sei();
+ void set();
+ UINT8 smb(int bit, UINT8 tmp);
+ void st0(UINT8 tmp);
+ void st1(UINT8 tmp);
+ void st2(UINT8 tmp);
+ UINT8 sta();
+ UINT8 stx();
+ UINT8 sty();
+ UINT8 stz();
+ void sxy();
+ void tai();
+ void tam(UINT8 tmp);
+ void tax();
+ void tay();
+ void tdd();
+ void tia();
+ void tii();
+ void tin();
+ void tma(UINT8 tmp);
+ UINT8 trb(UINT8 tmp);
+ UINT8 tsb(UINT8 tmp);
+ void tsx();
+ void tst(UINT8 imm, UINT8 tmp);
+ void txa();
+ void txs();
+ void tya();
+ void csh();
+ void csl();
enum
{
@@ -375,6 +372,4 @@ protected:
extern const device_type H6280;
-#pragma pop_macro("BIT")
-
#endif /* __H6280_H__ */