Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 08:18:59 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

MC6800 LSR/ROR/ASR instructions set overflow flag to N XOR C (MT #6624)

Browse Source
This commit is contained in:
AJR 2017-07-14 14:13:33 -04:00
parent ba64f47578
commit 1dc8a90131
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/devices/cpu/m6800/6800ops.hxx
View File

@ -59,8 +59,10 @@ OP_HANDLER( nop )
OP_HANDLER( lsrd ) OP_HANDLER( lsrd )
{ {
uint16_t t; uint16_t t;
CLR_NZC; t = D; CC|=(t&0x0001); CLR_NZVC; t = D; CC|=(t&0x0001);
t>>=1; SET_Z16(t); D=t; t>>=1; SET_Z16(t);
if (NXORC) SEV;
D=t;
} }
/* $05 ASLD inherent ?**** */ /* $05 ASLD inherent ?**** */
@ -497,8 +499,9 @@ OP_HANDLER( coma )
/* $44 LSRA inherent -0*-* */ /* $44 LSRA inherent -0*-* */
OP_HANDLER( lsra ) OP_HANDLER( lsra )
{ {
CLR_NZC; CC|=(A&0x01); CLR_NZVC; CC|=(A&0x01);
A>>=1; SET_Z8(A); A>>=1; SET_Z8(A);
if (NXORC) SEV;
} }
/* $45 ILLEGAL */ /* $45 ILLEGAL */
@ -508,17 +511,19 @@ OP_HANDLER( rora )
{ {
uint8_t r; uint8_t r;
r=(CC&0x01)<<7; r=(CC&0x01)<<7;
CLR_NZC; CC|=(A&0x01); CLR_NZVC; CC|=(A&0x01);
r |= A>>1; SET_NZ8(r); r |= A>>1; SET_NZ8(r);
if (NXORC) SEV;
A=r; A=r;
} }
/* $47 ASRA inherent ?**-* */ /* $47 ASRA inherent ?**-* */
OP_HANDLER( asra ) OP_HANDLER( asra )
{ {
CLR_NZC; CC|=(A&0x01); CLR_NZVC; CC|=(A&0x01);
A>>=1; A|=((A&0x40)<<1); A>>=1; A|=((A&0x40)<<1);
SET_NZ8(A); SET_NZ8(A);
if (NXORC) SEV;
} }
/* $48 ASLA inherent ?**** */ /* $48 ASLA inherent ?**** */
@ -593,8 +598,9 @@ OP_HANDLER( comb )
/* $54 LSRB inherent -0*-* */ /* $54 LSRB inherent -0*-* */
OP_HANDLER( lsrb ) OP_HANDLER( lsrb )
{ {
CLR_NZC; CC|=(B&0x01); CLR_NZVC; CC|=(B&0x01);
B>>=1; SET_Z8(B); B>>=1; SET_Z8(B);
if (NXORC) SEV;
} }
/* $55 ILLEGAL */ /* $55 ILLEGAL */
@ -604,17 +610,19 @@ OP_HANDLER( rorb )
{ {
uint8_t r; uint8_t r;
r=(CC&0x01)<<7; r=(CC&0x01)<<7;
CLR_NZC; CC|=(B&0x01); CLR_NZVC; CC|=(B&0x01);
r |= B>>1; SET_NZ8(r); r |= B>>1; SET_NZ8(r);
if (NXORC) SEV;
B=r; B=r;
} }
/* $57 ASRB inherent ?**-* */ /* $57 ASRB inherent ?**-* */
OP_HANDLER( asrb ) OP_HANDLER( asrb )
{ {
CLR_NZC; CC|=(B&0x01); CLR_NZVC; CC|=(B&0x01);
B>>=1; B|=((B&0x40)<<1); B>>=1; B|=((B&0x40)<<1);
SET_NZ8(B); SET_NZ8(B);
if (NXORC) SEV;
} }
/* $58 ASLB inherent ?**** */ /* $58 ASLB inherent ?**** */
@ -710,8 +718,9 @@ OP_HANDLER( com_ix )
OP_HANDLER( lsr_ix ) OP_HANDLER( lsr_ix )
{ {
uint8_t t; uint8_t t;
IDXBYTE(t); CLR_NZC; CC|=(t&0x01); IDXBYTE(t); CLR_NZVC; CC|=(t&0x01);
t>>=1; SET_Z8(t); t>>=1; SET_Z8(t);
if (NXORC) SEV;
WM(EAD,t); WM(EAD,t);
} }
@ -731,8 +740,9 @@ OP_HANDLER( ror_ix )
{ {
uint8_t t,r; uint8_t t,r;
IDXBYTE(t); r=(CC&0x01)<<7; IDXBYTE(t); r=(CC&0x01)<<7;
CLR_NZC; CC|=(t&0x01); CLR_NZVC; CC|=(t&0x01);
r |= t>>1; SET_NZ8(r); r |= t>>1; SET_NZ8(r);
if (NXORC) SEV;
WM(EAD,r); WM(EAD,r);
} }
@ -740,9 +750,10 @@ OP_HANDLER( ror_ix )
OP_HANDLER( asr_ix ) OP_HANDLER( asr_ix )
{ {
uint8_t t; uint8_t t;
IDXBYTE(t); CLR_NZC; CC|=(t&0x01); IDXBYTE(t); CLR_NZVC; CC|=(t&0x01);
t>>=1; t|=((t&0x40)<<1); t>>=1; t|=((t&0x40)<<1);
SET_NZ8(t); SET_NZ8(t);
if (NXORC) SEV;
WM(EAD,t); WM(EAD,t);
} }
@ -857,10 +868,11 @@ OP_HANDLER( lsr_ex )
{ {
uint8_t t; uint8_t t;
EXTBYTE(t); EXTBYTE(t);
CLR_NZC; CLR_NZVC;
CC|=(t&0x01); CC|=(t&0x01);
t>>=1; t>>=1;
SET_Z8(t); SET_Z8(t);
if (NXORC) SEV;
WM(EAD,t); WM(EAD,t);
} }
@ -880,8 +892,9 @@ OP_HANDLER( ror_ex )
{ {
uint8_t t,r; uint8_t t,r;
EXTBYTE(t); r=(CC&0x01)<<7; EXTBYTE(t); r=(CC&0x01)<<7;
CLR_NZC; CC|=(t&0x01); CLR_NZVC; CC|=(t&0x01);
r |= t>>1; SET_NZ8(r); r |= t>>1; SET_NZ8(r);
if (NXORC) SEV;
WM(EAD,r); WM(EAD,r);
} }
@ -889,9 +902,10 @@ OP_HANDLER( ror_ex )
OP_HANDLER( asr_ex ) OP_HANDLER( asr_ex )
{ {
uint8_t t; uint8_t t;
EXTBYTE(t); CLR_NZC; CC|=(t&0x01); EXTBYTE(t); CLR_NZVC; CC|=(t&0x01);
t>>=1; t|=((t&0x40)<<1); t>>=1; t|=((t&0x40)<<1);
SET_NZ8(t); SET_NZ8(t);
if (NXORC) SEV;
WM(EAD,t); WM(EAD,t);
} }

2
src/devices/cpu/m6800/m6800.cpp
View File

@ -169,7 +169,6 @@ TODO:
#define CLR_HNZC CC&=0xd2 #define CLR_HNZC CC&=0xd2
#define CLR_NZVC CC&=0xf0 #define CLR_NZVC CC&=0xf0
#define CLR_Z CC&=0xfb #define CLR_Z CC&=0xfb
#define CLR_NZC CC&=0xf2
#define CLR_ZC CC&=0xfa #define CLR_ZC CC&=0xfa
#define CLR_C CC&=0xfe #define CLR_C CC&=0xfe
@ -274,6 +273,7 @@ const uint8_t m6800_cpu_device::flags8d[256]= /* decrement */
/* Macros for branch instructions */ /* Macros for branch instructions */
#define BRANCH(f) {IMMBYTE(t);if(f){PC+=SIGNED(t);}} #define BRANCH(f) {IMMBYTE(t);if(f){PC+=SIGNED(t);}}
#define NXORV ((CC&0x08)^((CC&0x02)<<2)) #define NXORV ((CC&0x08)^((CC&0x02)<<2))
#define NXORC ((CC&0x08)^((CC&0x01)<<3))
/* Note: don't use 0 cycles here for invalid opcodes so that we don't */ /* Note: don't use 0 cycles here for invalid opcodes so that we don't */
/* hang in an infinite loop if we hit one */ /* hang in an infinite loop if we hit one */